Mercurial > public > mercurial-scm > hg-stable
diff mercurial/repair.py @ 33055:18c2489ac96d
bundle: make applybundle() delegate v1 bundles to applybundle1()
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 22 Jun 2017 15:00:19 -0700 |
parents | dbc2ee17053e |
children | fcd1c483f5ea |
line wrap: on
line diff
--- a/mercurial/repair.py Thu Jun 22 21:27:57 2017 -0700 +++ b/mercurial/repair.py Thu Jun 22 15:00:19 2017 -0700 @@ -211,12 +211,8 @@ if not isinstance(gen, bundle2.unbundle20): txnname = "strip\n%s" % util.hidepassword(tmpbundleurl) with repo.transaction(txnname) as tr: - if isinstance(gen, bundle2.unbundle20): - bundle2.applybundle(repo, gen, tr, source='strip', - url=tmpbundleurl) - else: - bundle2.applybundle1(repo, gen, tr, 'strip', tmpbundleurl, - emptyok=True) + bundle2.applybundle(repo, gen, tr, source='strip', + url=tmpbundleurl, emptyok=True) if not repo.ui.verbose: repo.ui.popbuffer() f.close()