facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity

unbundle: create transaction for bundle1 unbundling earlier

Browse Source 
See earlier patch for motivation.
This commit is contained in:
Martin von Zweigbergk 2017-06-15 22:18:21 -07:00
parent 350d0dfe2e
commit e57ebfa7c2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mercurial/commands.py
View File

@ -5321,12 +5321,13 @@ def unbundle(ui, repo, fname1, *fnames, **opts):
_('packed bundles cannot be applied with '
'"hg unbundle"'),
hint=_('use "hg debugapplystreamclonebundle"'))
url = 'bundle:' + fname
if isinstance(gen, bundle2.unbundle20):
with repo.transaction('unbundle') as tr:
try:
op = bundle2.applybundle(repo, gen, tr,
source='unbundle',
url='bundle:' + fname)
url=url)
except error.BundleUnknownFeatureError as exc:
raise error.Abort(
_('%s: unknown bundle feature, %s') % (fname, exc),
@ -5337,7 +5338,9 @@ def unbundle(ui, repo, fname1, *fnames, **opts):
for r in op.records['changegroup']]
modheads = changegroup.combineresults(changes)
else:
modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
txnname = 'unbundle\n%s' % util.hidepassword(url)
with repo.transaction(txnname):
modheads = gen.apply(repo, 'unbundle', url)
return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)