From owner-svn-ports-head@FreeBSD.ORG Thu Jan 9 08:04:33 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 84EF29D0; Thu, 9 Jan 2014 08:04:33 +0000 (UTC) Received: from cpanel09.rubas.ch (cpanel09.rubas.ch [195.182.222.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 389811820; Thu, 9 Jan 2014 08:04:32 +0000 (UTC) Received: from 232-194.199-178.cust.bluewin.ch ([178.199.194.232]:58374 helo=gahrfit.gahr.ch) by cpanel09.rubas.ch with esmtpsa (UNKNOWN:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.80.1) (envelope-from ) id 1W1AbM-002kT8-PO; Thu, 09 Jan 2014 09:04:29 +0100 Date: Thu, 9 Jan 2014 09:04:25 +0100 From: Pietro Cerutti To: Lars Engels Subject: Re: svn commit: r339185 - head/Tools/scripts Message-ID: <20140109080425.GI8627@gahrfit.gahr.ch> References: <201401082243.s08MhLsI004002@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="yzvKDKJiLNESc64M" Content-Disposition: inline In-Reply-To: <201401082243.s08MhLsI004002@svn.freebsd.org> X-PGP-Key: fp="DA6D E106 A5B8 54B8 5DD8 6D49 ADD0 D38E A192 089E"; id="0xA192089E"; get=; get=; User-Agent: Mutt/1.5.22 (2013-10-16) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel09.rubas.ch X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - FreeBSD.org X-Get-Message-Sender-Via: cpanel09.rubas.ch: authenticated_id: gahr@gahr.ch Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: gahr@FreeBSD.org List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jan 2014 08:04:33 -0000 --yzvKDKJiLNESc64M Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2014-Jan-08, 22:43, Lars Engels wrote: > Author: lme > Date: Wed Jan 8 22:43:21 2014 > New Revision: 339185 > URL: http://svnweb.freebsd.org/changeset/ports/339185 >=20 > Log: > - Allow a leading "r" in the svn revision > - Use a variable for the Subversion server > - Consistently use ${} around variables > - Bail out if neither svn(1) nor svnlite(1) are installed > =20 > Approved by: bapt >=20 > Modified: > head/Tools/scripts/mfh (contents, props changed) >=20 > Modified: head/Tools/scripts/mfh > =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=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/Tools/scripts/mfh Wed Jan 8 22:34:40 2014 (r339184) > +++ head/Tools/scripts/mfh Wed Jan 8 22:43:21 2014 (r339185) > @@ -53,35 +53,47 @@ ask() { > =20 > [ $# -ne 2 ] && err "Takes 2 arguments: " > branch=3D$1 > -rev=3D$2 > -case $rev in > +rev=3D${2##r} # remove a leading "r" > +case ${rev} in > ''|*[!0-9]*) err "revision should be a number" ;; > esac > =20 > +svnserver=3D"svn.FreeBSD.org" > + > +if [ -n "$(type svn 2>/dev/null)" ]; then > + svn=3Dsvn > +elif [ -n "$(type svnlite 2>/dev/null)" ]; then > + svn=3Dsvnlite > +else > + err "svn(1) and svnlite(1) not found. please install devel/subversion" > +fi > + > + > dir=3D$(mktemp -d /tmp/merge.XXX) > -cd $dir > -svn co --depth=3Dempty svn+ssh://svn.FreeBSD.org/ports/branches/${branch} > +cd ${dir} > +${svn} co --depth=3Dempty svn+ssh://${svnserver}/ports/branches/${branch} > filelist=3D"" > -for f in $(svn diff --summarize -c $rev svn://svn.FreeBSD.org/ports/head= ); do > +# svn:// is faster than svn+ssh://. Use it wherever it's possible. > +for f in $(${svn} diff --summarize -c ${rev} svn://${svnserver}/ports/he= ad); do Would you mind switching to svn+ssh everywhere? The thing is, if you're going to merge, you'll be using svn+ssh anyway, and it might be the case that plain svn is not available because of some stupid firewall rules - which is exactly my case and the reason for my asking. Thanks, --=20 Pietro Cerutti The FreeBSD Project gahr@FreeBSD.org PGP Public Key: http://gahr.ch/pgp --yzvKDKJiLNESc64M Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQJ8BAEBCgBmBQJSzlgFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQTZERTEwNkE1Qjg1NEI4NUREODZENDlB REQwRDM4RUExOTIwODlFAAoJEK3Q046hkgieuzgQAJHtjqb3DgzqpNkQd6aMLviU gtKLyK89qzgsvh9amuPTuLBx1TWKH+c5IHrCHA8mrg7t52hgWwCSSwrxhg12SzV3 crcoIXmL65qNCMaLHqVVINyYjPCuYh0hx/0j1OEMZ0Ret0T1HiLgUorUnTn/Ak6d bxNIhyEc9XKaqM0UPKylHlaQwozOSOZjK31eyS9xDIA/YjFp2SCl5wc+czj1RRKd /QN1VHXOt2DlLGeB+IYJF/ONLYuLsqiNyGFhHi8V2uf6+/bOtqglVNSoyuKo6Duc zlJBXIkTuzPBlfwxEp9J3/9luDgMPbgPNh+nfJwM4M520tbw85DHIzoqyCt3bH3T vHNfoTZmgVDmgvxad4WsPwipFIesMr3KBPn6snBnCgLbP1WlMVUUI9Lw8zbOdI6U YEUOXiAig8/guPOPgiT9HXO0kiyXzNMOxnflyUQa1h98tVX3nsbITRcK7BT3YAuj mR8wUPdKjY29lonXXv9rKCYC9JtZlD59Nv3mKyGH7g5FNEMTaD6lNtarXfqiTH/s BVz8DhgMGjnmqlZPxLqJb0fSj9cuQ0z9VhMCSKhSHI5/JB2APnnF3tN5aLrrLFwl oQRmPFQ8frSu59GTpv268HPT6nhhr85/O5n8uu8QugcRYigCK0fvrqNEu2/yb+ja lU9/s/5ai71d7YN5oYAa =mbDI -----END PGP SIGNATURE----- --yzvKDKJiLNESc64M--