Submitter | Katsunori FUJIWARA |
---|---|
Date | March 8, 2014, 4:07 p.m. |
Message ID | <d83efbf778355d4a3e12.1394294829@juju> |
Download | mbox | patch |
Permalink | /patch/3892/ |
State | Accepted |
Commit | 5b58714e97edbbd1e09f7717cf6564e0191d8f57 |
Headers | show |
Comments
Patch
diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py --- a/mercurial/changegroup.py +++ b/mercurial/changegroup.py @@ -212,7 +212,7 @@ return d return readexactly(self._fh, n) -def readbundle(fh, fname): +def readbundle(fh, fname, vfs=None): header = readexactly(fh, 6) if not fname: @@ -220,6 +220,8 @@ if not header.startswith('HG') and header.startswith('\0'): fh = headerlessfixup(fh, header) header = "HG10UN" + elif vfs: + fname = vfs.join(fname) magic, version, alg = header[0:2], header[2:4], header[4:6]