From e8a3c7466e3764dde7350f332976b0fafed40d4c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 27 Sep 2011 17:46:26 -0400 Subject: [PATCH] bzr branch support * Use bzr branch, not deprecated bzr clone when registering bzr repositories. Closes: #643591 * Allow bzr branch|clone|get in untrusted mrconfig files. --- debian/changelog | 3 +++ mr | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5199ab4..47fe6a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ mr (1.05) unstable; urgency=low * Also allow order=N in an untrusted mrconfig file. * Support bzr checkouts, which are updated with "bzr update", and to which bzr automatically pushes commits. Closes: #643589 + * Use bzr branch, not deprecated bzr clone when registering bzr + repositories. Closes: #643591 + * Allow bzr branch|clone|get in untrusted mrconfig files. -- Joey Hess Tue, 27 Sep 2011 17:28:35 -0400 diff --git a/mr b/mr index 10a547f..f947633 100755 --- a/mr +++ b/mr @@ -1059,7 +1059,7 @@ sub is_trusted_checkout { is_trusted_repo($words[$c]) ); } - elsif (defined $words[$c] && $twords[$c] eq $words[$c]) { + elsif (defined $words[$c] && $words[$c]=~/^($twords[$c])$/) { $match=1; } else { @@ -1791,7 +1791,7 @@ bzr_register = error "cannot determine bzr url" fi echo "Registering bzr url: $url in $MR_CONFIG" - mr -c "$MR_CONFIG" config "`pwd`" checkout="bzr clone '$url' '$MR_REPO'" + mr -c "$MR_CONFIG" config "`pwd`" checkout="bzr branch '$url' '$MR_REPO'" cvs_register = repo=`cat CVS/Repository` root=`cat CVS/Root` @@ -1824,7 +1824,7 @@ fossil_register = svn_trusted_checkout = svn co $url $repo svn_alt_trusted_checkout = svn checkout $url $repo git_trusted_checkout = git clone $url $repo -bzr_trusted_checkout = bzr clone $url $repo +bzr_trusted_checkout = bzr clone|branch|get $url $repo # cvs: too hard hg_trusted_checkout = hg clone $url $repo darcs_trusted_checkout = darcs get $url $repo -- 2.39.2