Mercurial > hg
diff hgext/histedit.py @ 33043: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 | b82615afde65 |
| children | 4192694b4844 |
line wrap: on
line diff
--- a/hgext/histedit.py Thu Jun 22 21:27:57 2017 -0700 +++ b/hgext/histedit.py Thu Jun 22 15:00:19 2017 -0700 @@ -1198,14 +1198,8 @@ f = hg.openpath(ui, backupfile) gen = exchange.readbundle(ui, f, backupfile) with repo.transaction('histedit.abort') as tr: - if not isinstance(gen, bundle2.unbundle20): - bundle2.applybundle1(repo, gen, tr, - source='histedit', - url='bundle:' + backupfile) - else: - bundle2.applybundle(repo, gen, tr, - source='histedit', - url='bundle:' + backupfile) + bundle2.applybundle(repo, gen, tr, source='histedit', + url='bundle:' + backupfile) os.remove(backupfile)