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.

diff --git a/debian/changelog b/debian/changelog
index 5199ab4640db3c18cfaccf9b628b30295b789ed3..47fe6a12f0248f858f186fcf78abc82291220821 100644 (file)
--- 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 <joeyh@debian.org>  Tue, 27 Sep 2011 17:28:35 -0400
 

diff --git a/mr b/mr
index 10a547f1ec979ff508a74b175e2d07a09b14a1bd..f947633b8b5e2a9285a31853c423a0b2c932a99e 100755 (executable)
--- 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