Mercurial > hg

diff mercurial/commands.py @ 21064:4d9d490d7bbe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: add a ui argument to readbundle The bundle2 unbundler needs a ui argument. We are now passing this information to `readbundle`.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 14 Apr 2014 15:45:30 -0400
parents 7ca4f2049d3b
children 50107a4b32e7
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Apr 14 15:33:50 2014 -0400
+++ b/mercurial/commands.py	Mon Apr 14 15:45:30 2014 -0400
@@ -1736,7 +1736,7 @@
     """lists the contents of a bundle"""
     f = hg.openpath(ui, bundlepath)
     try:
-        gen = exchange.readbundle(f, bundlepath)
+        gen = exchange.readbundle(ui, f, bundlepath)
         if all:
             ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
 
@@ -5807,7 +5807,7 @@
     try:
         for fname in fnames:
             f = hg.openpath(ui, fname)
-            gen = exchange.readbundle(f, fname)
+            gen = exchange.readbundle(ui, f, fname)
             modheads = changegroup.addchangegroup(repo, gen, 'unbundle',
                                                   'bundle:' + fname)
     finally: