* Update bzr registration code to work with current version of bzr,

  using bzr info to get the url. Closes: #463867

diff --git a/debian/changelog b/debian/changelog
index 92586f5813740369ecd24fb9375c4b7b333c0192..250b33c1053e039c9222e818b986b6e202f13500 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mr (0.22) UNRELEASED; urgency=low
+
+  * Update bzr registration code to work with current version of bzr,
+    using bzr info to get the url. Closes: #463867
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 03 Feb 2008 17:04:30 -0500
+

 mr (0.21) unstable; urgency=low
 
   * Add a git-svn file, which can be included to add support for git-svn
 mr (0.21) unstable; urgency=low
 
   * Add a git-svn file, which can be included to add support for git-svn

diff --git a/mr b/mr
index 33bde352a4098411c6a3f4a59ac9edb887d8144a..87618a22809a33ef03024528d19aa0ceb6c585be 100755 (executable)
--- a/mr
+++ b/mr
@@ -1243,7 +1243,7 @@ git_register =
        echo "Registering git url: $url in $MR_CONFIG"
        mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone '$url' '$MR_REPO'"
 bzr_register =
        echo "Registering git url: $url in $MR_CONFIG"
        mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone '$url' '$MR_REPO'"
 bzr_register =

-       url=`cat .bzr/branch/parent`
+       url="`LC_ALL=C bzr info . | egrep -i 'checkout of branch|parent branch' | awk '{print $NF}'`"

        if [ -z "$url" ]; then
                error "cannot determine bzr url"
        fi
        if [ -z "$url" ]; then
                error "cannot determine bzr url"
        fi