Mercurial > hg-stable
changeset 6129:3d666e8e6398
bundlerepo: fix inconsistency of parsed and internal name (issue #821)
| author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
|---|---|
| date | Sun, 10 Feb 2008 08:53:39 +0100 |
| parents | b3286a92f4bc |
| children | 516d8ffede7c 779f2309d67a |
| files | mercurial/bundlerepo.py tests/test-bundle.out |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bundlerepo.py Sun Feb 10 08:52:50 2008 +0100 +++ b/mercurial/bundlerepo.py Sun Feb 10 08:53:39 2008 +0100 @@ -154,8 +154,10 @@ def __init__(self, ui, path, bundlename): localrepo.localrepository.__init__(self, ui, path) - self._url = 'bundle:' + bundlename - if path: self._url += '+' + path + if path: + self._url = 'bundle:' + path + '+' + bundlename + else: + self._url = 'bundle:' + bundlename self.tempfile = None self.bundlefile = open(bundlename, "rb")
--- a/tests/test-bundle.out Sun Feb 10 08:52:50 2008 +0100 +++ b/tests/test-bundle.out Sun Feb 10 08:53:39 2008 +0100 @@ -129,7 +129,7 @@ ====== 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