Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 26368:0224d22ef5d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 25 Sep 2015 23:10:47 -0500
parents a672cc61ab1d f31ddc9bfa5f
children 4c4b3c37776c
comparison
equal deleted inserted replaced
26366:a672cc61ab1d 26368:0224d22ef5d8
6386 if isinstance(gen, bundle2.unbundle20): 6386 if isinstance(gen, bundle2.unbundle20):
6387 tr = repo.transaction('unbundle') 6387 tr = repo.transaction('unbundle')
6388 try: 6388 try:
6389 op = bundle2.processbundle(repo, gen, lambda: tr) 6389 op = bundle2.processbundle(repo, gen, lambda: tr)
6390 tr.close() 6390 tr.close()
6391 except error.UnsupportedPartError as exc:
6392 raise util.Abort(_('%s: unknown bundle feature, %s')
6393 % (fname, exc),
6394 hint=_("see https://mercurial.selenic.com/"
6395 "wiki/BundleFeature for more "
6396 "information"))
6391 finally: 6397 finally:
6392 if tr: 6398 if tr:
6393 tr.release() 6399 tr.release()
6394 changes = [r.get('result', 0) 6400 changes = [r.get('result', 0)
6395 for r in op.records['changegroup']] 6401 for r in op.records['changegroup']]