From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1JRuT2-0004I1-TP for garchives@archives.gentoo.org; Wed, 20 Feb 2008 19:18:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59A2CE029E; Wed, 20 Feb 2008 19:18:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 01D8DE029E for ; Wed, 20 Feb 2008 19:18:56 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 96FE6660AC for ; Wed, 20 Feb 2008 19:18:55 +0000 (UTC) Received: from cardoe by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1JRuT0-0001gJ-AV for gentoo-commits@lists.gentoo.org; Wed, 20 Feb 2008 19:18:54 +0000 From: "Doug Klima (cardoe)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, cardoe@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: subversion.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: subversion.eclass X-VCS-Directories: eclass X-VCS-Committer: cardoe X-VCS-Committer-Name: Doug Klima Content-Type: text/plain; charset=utf8 Message-Id: Sender: Doug Klima Date: Wed, 20 Feb 2008 19:18:54 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 2243777c-b741-4bb7-8aae-da4f2e54f196 X-Archives-Hash: 42fce36963bc37d6e64ecbaa33eb3106 cardoe 08/02/20 19:18:54 Modified: subversion.eclass Log: add ESVN_SWITCH_CMD and use svn switch as necessary Revision Changes Path 1.48 eclass/subversion.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/subversion.= eclass?rev=3D1.48&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/subversion.= eclass?rev=3D1.48&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/subversion.= eclass?r1=3D1.47&r2=3D1.48 Index: subversion.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- subversion.eclass 20 Feb 2008 17:55:27 -0000 1.47 +++ subversion.eclass 20 Feb 2008 19:18:53 -0000 1.48 @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.47 2008/= 02/20 17:55:27 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.48 2008/= 02/20 19:18:53 cardoe Exp $ =20 # @ECLASS: subversion.eclass # @MAINTAINER: @@ -42,6 +42,11 @@ # subversion update command ESVN_UPDATE_CMD=3D"svn update" =20 +# @ECLASS-VARIABLE: ESVN_SWITCH_CMD +# @DESCRIPTION: +# subversion switch command +ESVN_SWITCH_CMD=3D"svn switch" + # @ECLASS-VARIABLE: ESVN_OPTIONS # @DESCRIPTION: # the options passed to checkout or update. If you want a specific revis= ion see @@ -194,17 +199,24 @@ subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occu= rred while accessing working copy." =20 if [[ ${ESVN_WC_URL} !=3D $(subversion__get_repository_uri "${repo_uri= }") ]]; then - die "${ESVN}: ESVN_REPO_URI (or specified URI) and working copy's URL= are not matched." - fi + einfo "suversion switch start -->" + einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}" + einfo " new repository: ${repo_uri}${revision:+@}${revision}" =20 - # update working copy - einfo "subversion update start -->" - einfo " repository: ${repo_uri}${revision:+@}${revision}" + debug-print "${FUNCNAME}: ${ESVN_SWITCH_CMD} ${options} ${repo_uri}" =20 - debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}" + cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" + ${ESVN_SWITCH_CMD} ${options} ${repo_uri} || die "${ESVN}: can't upda= te from ${repo_uri}" + else + # update working copy + einfo "subversion update start -->" + einfo " repository: ${repo_uri}${revision:+@}${revision}" =20 - cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" - ${ESVN_UPDATE_CMD} ${options} || die "${ESVN}: can't update from ${rep= o_uri}." + debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}" + + cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" + ${ESVN_UPDATE_CMD} ${options} || die "${ESVN}: can't update from ${re= po_uri}." + fi =20 fi =20 --=20 gentoo-commits@lists.gentoo.org mailing list