repair: create transaction for bundle1 unbundling earlier
See earlier patch for motivation.
--- a/mercurial/repair.py Thu Jun 15 22:18:21 2017 -0700
+++ b/mercurial/repair.py Thu Jun 15 23:09:14 2017 -0700
@@ -201,13 +201,15 @@
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',
- url='bundle:' + vfs.join(tmpbundlefile))
+ url=tmpbundleurl)
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()