Mercurial > public > mercurial-scm > hg-stable

diff mercurial/exchange.py @ 21063:7ca4f2049d3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: move `readbundle` into the `exchange` module The `readbundle` function is going to understand the bundle2 header. We move the function to a more suitable place before making any other changes.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 14 Apr 2014 15:33:50 -0400
parents e7c0a65a5c9c
children 4d9d490d7bbe
line wrap: on
line diff
--- a/mercurial/exchange.py	Mon Apr 14 14:46:32 2014 -0400
+++ b/mercurial/exchange.py	Mon Apr 14 15:33:50 2014 -0400
@@ -11,6 +11,25 @@
 import util, scmutil, changegroup, base85
 import discovery, phases, obsolete, bookmarks, bundle2
 
+def readbundle(fh, fname, vfs=None):
+    header = changegroup.readexactly(fh, 6)
+
+    if not fname:
+        fname = "stream"
+        if not header.startswith('HG') and header.startswith('\0'):
+            fh = changegroup.headerlessfixup(fh, header)
+            header = "HG10UN"
+    elif vfs:
+        fname = vfs.join(fname)
+
+    magic, version, alg = header[0:2], header[2:4], header[4:6]
+
+    if magic != 'HG':
+        raise util.Abort(_('%s: not a Mercurial bundle') % fname)
+    if version != '10':
+        raise util.Abort(_('%s: unknown bundle version %s') % (fname, version))
+    return changegroup.unbundle10(fh, alg)
+
 
 class pushoperation(object):
     """A object that represent a single push operation