Mercurial > public > mercurial-scm > hg-stable

comparison 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
comparison
equal deleted inserted replaced
15584:9df9444e96ec 15585:a348739da8f0
5573 wc = repo['.'] 5573 wc = repo['.']
5574 try: 5574 try:
5575 for fname in fnames: 5575 for fname in fnames:
5576 f = url.open(ui, fname) 5576 f = url.open(ui, fname)
5577 gen = changegroup.readbundle(f, fname) 5577 gen = changegroup.readbundle(f, fname)
5578 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname, 5578 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
5579 lock=lock)
5580 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch()) 5579 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5581 finally: 5580 finally:
5582 lock.release() 5581 lock.release()
5583 return postincoming(ui, repo, modheads, opts.get('update'), None) 5582 return postincoming(ui, repo, modheads, opts.get('update'), None)
5584 5583