Improve bzr register's heuristics to determine upstream repo. Closes: #672843

diff --git a/debian/changelog b/debian/changelog
index e311dc6886bdcf89bca8f7a18efa4842d7fb3e81..7632104259b4c3cf901ac76574ceb092f237cf5a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mr (1.12) UNRELEASED; urgency=low
     when there were no changes to pull. Closes: #661870 
   * Add vcsh to Suggests.
   * Recognize a repo with a .git file as a git repo.
     when there were no changes to pull. Closes: #661870 
   * Add vcsh to Suggests.
   * Recognize a repo with a .git file as a git repo.

+  * Improve bzr register's heuristics to determine upstream repo.
+    Closes: #672843

 
  -- Joey Hess <joeyh@debian.org>  Fri, 02 Mar 2012 00:33:08 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Fri, 02 Mar 2012 00:33:08 -0400
 

diff --git a/mr b/mr
index 6fc5d576cb1582a224e5c60eab2402ca597d2566..556366ca4db806f10365ce5d65df812df7e78fa6 100755 (executable)
--- a/mr
+++ b/mr
@@ -1983,7 +1983,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="`LC_ALL=C bzr info . | egrep -i 'checkout of branch|parent branch' | awk '{print $NF}'`"
+       url="`LC_ALL=C bzr info . | egrep -i 'checkout of branch|parent branch' | awk '{print $NF}' | head -n 1`"

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