--- 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)