Mercurial > hg

diff mercurial/commands.py @ 15585:a348739da8f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
addchangegroup: remove the lock argument on the addchangegroup methods This argument is no longer require. post lock release code is now handled with dedicated post release callback code in lock itself.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Mon, 28 Nov 2011 01:32:13 +0100
parents 5a7733563c2e
children ec8a49c46d7e
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Nov 28 01:18:15 2011 +0100
+++ b/mercurial/commands.py	Mon Nov 28 01:32:13 2011 +0100
@@ -5575,8 +5575,7 @@
         for fname in fnames:
             f = url.open(ui, fname)
             gen = changegroup.readbundle(f, fname)
-            modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname,
-                                           lock=lock)
+            modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
         bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
     finally:
         lock.release()