Mercurial > public > mercurial-scm > hg
diff tests/test-histedit-arguments.t @ 42584:db5560c07a28
abort: added support for histedit
This patch adds the support for `histedit` in `hg abort` plan.
As seperate `hgaborthistedit()` function is created to handle
independent calls for abortion of `histedit`. This function is
then registered as `abortfunc` for state detection API.
hg abort in case of `histedit` also supports ` history-editing-backup`
config option.
Results are shown as tests.
Differential Revision: https://phab.mercurial-scm.org/D6582
author | Taapas Agrawal <taapas2897@gmail.com> |
---|---|
date | Fri, 28 Jun 2019 00:35:52 +0530 |
parents | 15d2afa31e57 |
children | 21733e8c924f |
line wrap: on
line diff
--- a/tests/test-histedit-arguments.t Sun Jun 23 23:11:35 2019 +0530 +++ b/tests/test-histedit-arguments.t Fri Jun 28 00:35:52 2019 +0530 @@ -1,3 +1,12 @@ +#testcases abortcommand abortflag + +#if abortflag + $ cat >> $HGRCPATH <<EOF + > [alias] + > abort = histedit --abort + > EOF +#endif + Test argument handling and various data parsing ================================================== @@ -47,8 +56,9 @@ $ hg histedit --continue abort: no histedit in progress [255] - $ hg histedit --abort - abort: no histedit in progress + $ hg abort + abort: no histedit in progress (abortflag !) + abort: no operation in progress (abortcommand !) [255] Run a dummy edit to make sure we get tip^^ correctly via revsingle. @@ -358,7 +368,7 @@ Corrupt histedit state file $ sed 's/8fda0c726bf2/123456789012/' .hg/histedit-state > ../corrupt-histedit $ mv ../corrupt-histedit .hg/histedit-state - $ hg histedit --abort + $ hg abort warning: encountered an exception during histedit --abort; the repository may not have been completely cleaned up abort: $TESTTMP/foo/.hg/strip-backup/*-histedit.hg: $ENOENT$ (glob) (windows !) abort: $ENOENT$: '$TESTTMP/foo/.hg/strip-backup/*-histedit.hg' (glob) (no-windows !)