Mercurial > public > mercurial-scm > hg-stable

diff mercurial/changegroup.py @ 20978:5b58714e97ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changegroup: add "vfs" argument to "readbundle()" to pass relative filename
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sun, 09 Mar 2014 01:03:28 +0900
parents c20f4898631e
children 1e28ec9744bf
line wrap: on
line diff
--- a/mercurial/changegroup.py	Sun Mar 09 01:03:28 2014 +0900
+++ b/mercurial/changegroup.py	Sun Mar 09 01:03:28 2014 +0900
@@ -214,7 +214,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:
@@ -222,6 +222,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]