--- a/hgext/histedit.py Wed Jul 12 13:17:49 2017 -0700
+++ b/hgext/histedit.py Wed Jul 12 13:57:03 2017 -0700
@@ -1122,7 +1122,7 @@
# and reopen a transaction. For example, if the action executes an
# external process it may choose to commit the transaction first.
tr = repo.transaction('histedit')
- try:
+ with util.acceptintervention(tr):
while state.actions:
state.write(tr=tr)
actobj = state.actions[0]
@@ -1136,17 +1136,6 @@
state.replacements.extend(replacement_)
state.actions.pop(0)
- if tr is not None:
- tr.close()
- except error.InterventionRequired:
- if tr is not None:
- tr.close()
- raise
- except Exception:
- if tr is not None:
- tr.abort()
- raise
-
state.write()
ui.progress(_("editing"), None)