Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 26874:853154f27525

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unbundle: gratuitous fix white spacing "issue" We were missing one space on this block.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sat, 07 Nov 2015 16:03:09 -0500
parents 39dbf495880b
children 5f88e092f82c
comparison
equal deleted inserted replaced
26871:1cbf144fd8a1 26874:853154f27525
6576 op = bundle2.applybundle(repo, gen, tr, source='unbundle', 6576 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6577 url='bundle:' + fname) 6577 url='bundle:' + fname)
6578 tr.close() 6578 tr.close()
6579 except error.BundleUnknownFeatureError as exc: 6579 except error.BundleUnknownFeatureError as exc:
6580 raise error.Abort(_('%s: unknown bundle feature, %s') 6580 raise error.Abort(_('%s: unknown bundle feature, %s')
6581 % (fname, exc), 6581 % (fname, exc),
6582 hint=_("see https://mercurial-scm.org/" 6582 hint=_("see https://mercurial-scm.org/"
6583 "wiki/BundleFeature for more " 6583 "wiki/BundleFeature for more "
6584 "information")) 6584 "information"))
6585 finally: 6585 finally:
6586 if tr: 6586 if tr:
6587 tr.release() 6587 tr.release()
6588 changes = [r.get('return', 0) 6588 changes = [r.get('return', 0)
6589 for r in op.records['changegroup']] 6589 for r in op.records['changegroup']]