Mercurial > evolve
changeset 6143:11a3ec836a65
fixup: replace the underscore in state file name with a dash
Lots of files inside .hg/ use `-` instead of `_`.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 22 Feb 2022 18:55:12 +0300 |
| parents | 94bf0768040a |
| children | de82085e7f03 |
| files | hgext3rd/evolve/__init__.py hgext3rd/evolve/cmdrewrite.py |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py Tue Feb 22 09:24:11 2022 +0300 +++ b/hgext3rd/evolve/__init__.py Tue Feb 22 18:55:12 2022 +0300 @@ -1167,7 +1167,7 @@ abortfunc=cmdrewrite.hgabortpick) _fixup_msg = _(b'To continue: hg fixup --continue\n' b'To abort: hg fixup --abort\n') - statemod.addunfinished(b'fixup', fname=b'fixup_state', + statemod.addunfinished(b'fixup', fname=b'fixup-state', continueflag=True, statushint=_fixup_msg) else: # hg <= 5.0 (5f2f6912c9e6)
--- a/hgext3rd/evolve/cmdrewrite.py Tue Feb 22 09:24:11 2022 +0300 +++ b/hgext3rd/evolve/cmdrewrite.py Tue Feb 22 18:55:12 2022 +0300 @@ -1489,7 +1489,7 @@ if abortopt: raise error.Abort(_(b'cannot specify a revision with --abort')) # state file for --continue/--abort cases - fixup_state = state.cmdstate(repo, b'fixup_state') + fixup_state = state.cmdstate(repo, b'fixup-state') if contopt: if not fixup_state.exists(): raise error.Abort(_(b'no interrupted fixup to continue'))