Skip to content
Snippets Groups Projects
Commit d11e2343762b authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

repair: create transaction for bundle1 unbundling earlier

See earlier patch for motivation.
parent ac9867519103
No related branches found
No related tags found
No related merge requests found
......@@ -201,6 +201,7 @@
if not repo.ui.verbose:
# silence internal shuffling chatter
repo.ui.pushbuffer()
tmpbundleurl = 'bundle:' + vfs.join(tmpbundlefile)
if isinstance(gen, bundle2.unbundle20):
with repo.transaction('strip') as tr:
bundle2.applybundle(repo, gen, tr, source='strip',
......@@ -204,5 +205,5 @@
if isinstance(gen, bundle2.unbundle20):
with repo.transaction('strip') as tr:
bundle2.applybundle(repo, gen, tr, source='strip',
url='bundle:' + vfs.join(tmpbundlefile))
url=tmpbundleurl)
else:
......@@ -208,6 +209,7 @@
else:
gen.apply(repo, 'strip', 'bundle:' + vfs.join(tmpbundlefile),
True)
txnname = "strip\n%s" % util.hidepassword(tmpbundleurl)
with repo.transaction(txnname):
gen.apply(repo, 'strip', tmpbundleurl, True)
if not repo.ui.verbose:
repo.ui.popbuffer()
f.close()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment