diff -r b9bc47211cf5 -r db5560c07a28 hgext/histedit.py --- a/hgext/histedit.py Sun Jun 23 23:11:35 2019 +0530 +++ b/hgext/histedit.py Fri Jun 28 00:35:52 2019 +0530 @@ -1919,6 +1919,14 @@ finally: state.clear() +def hgaborthistedit(ui, repo): + state = histeditstate(repo) + nobackup = not ui.configbool('rewrite', 'backup-bundle') + with repo.wlock() as wlock, repo.lock() as lock: + state.wlock = wlock + state.lock = lock + _aborthistedit(ui, repo, state, nobackup=nobackup) + def _edithisteditplan(ui, repo, state, rules): state.read() if not rules: @@ -2314,5 +2322,5 @@ def extsetup(ui): cmdutil.summaryhooks.add('histedit', summaryhook) statemod.addunfinished('histedit', fname='histedit-state', allowcommit=True, - continueflag=True) + continueflag=True, abortfunc=hgaborthistedit)