diff --git a/mercurial/repair.py b/mercurial/repair.py index ac986751910396de9818cf981b35f131a5ab1634_bWVyY3VyaWFsL3JlcGFpci5weQ==..d11e2343762b38cab60fa8d71da44eab764eea7a_bWVyY3VyaWFsL3JlcGFpci5weQ== 100644 --- a/mercurial/repair.py +++ b/mercurial/repair.py @@ -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()