diff mercurial/repair.py @ 21063:7ca4f2049d3b

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 ad5b61370514
children 4d9d490d7bbe
line wrap: on
line diff
--- a/mercurial/repair.py	Mon Apr 14 14:46:32 2014 -0400
+++ b/mercurial/repair.py	Mon Apr 14 15:33:50 2014 -0400
@@ -6,7 +6,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-from mercurial import changegroup
+from mercurial import changegroup, exchange
 from mercurial.node import short
 from mercurial.i18n import _
 import errno
@@ -147,7 +147,7 @@
         if saveheads or savebases:
             ui.note(_("adding branch\n"))
             f = vfs.open(chgrpfile, "rb")
-            gen = changegroup.readbundle(f, chgrpfile, vfs)
+            gen = exchange.readbundle(f, chgrpfile, vfs)
             if not repo.ui.verbose:
                 # silence internal shuffling chatter
                 repo.ui.pushbuffer()