Mercurial > public > mercurial-scm > hg

comparison mercurial/wireproto.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 42d0d4f63bf0
children ca6accdad79c
comparison
equal deleted inserted replaced
15584:9df9444e96ec 15585:a348739da8f0
572 # push can proceed 572 # push can proceed
573 fp.seek(0) 573 fp.seek(0)
574 gen = changegroupmod.readbundle(fp, None) 574 gen = changegroupmod.readbundle(fp, None)
575 575
576 try: 576 try:
577 r = repo.addchangegroup(gen, 'serve', proto._client(), 577 r = repo.addchangegroup(gen, 'serve', proto._client())
578 lock=lock)
579 except util.Abort, inst: 578 except util.Abort, inst:
580 sys.stderr.write("abort: %s\n" % inst) 579 sys.stderr.write("abort: %s\n" % inst)
581 finally: 580 finally:
582 lock.release() 581 lock.release()
583 return pushres(r) 582 return pushres(r)