bundlerepo: fix inconsistency of parsed and internal name (issue #821)

mercurial/bundlerepo.py

@@ -154,8 +154,10 b' class bundlerepository(localrepo.localre'
     def __init__(self, ui, path, bundlename):
         localrepo.localrepository.__init__(self, ui, path)
 
+        if path:
+            self._url = 'bundle:' + path + '+' + bundlename
+        else:
         self._url = 'bundle:' + bundlename
-        if path: self._url += '+' + path
 
         self.tempfile = None
         self.bundlefile = open(bundlename, "rb")

tests/test-bundle.out

@@ -129,7 +129,7 b' rolling back last transaction'
 ====== Log -R bundle:empty+full.hg
 8 7 6 5 4 3 2 1 0 
 ====== Pull full.hg into empty again (using -R; with hook)
-changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:full.hg+empty 
+changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:empty+full.hg 
 pulling from full.hg
 requesting all changes
 adding changesets