[PATCH] unbundle: don't give addchangegroup ownership of the lock
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Mon Nov 28 07:52:47 CST 2011
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1322439427 -3600
# Branch stable
# Node ID e6fefdee80569d384636a5d5dd49a5caa402f968
# Parent e387e760b207383c961ed8accd35583791a33bb0
unbundle: don't give addchangegroup ownership of the lock.
addchangegroup call is in a loop and may happen multiple times.
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5545,8 +5545,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()
More information about the Mercurial-devel
mailing list