Mercurial > hg
diff tests/test-histedit-arguments.t @ 45840:527ce85c2e60
errors: introduce StateError and use it from commands and cmdutil
This very similar to an earlier patch (which was for `InputError`).
In this patch, I also updated the transplant extension only because
`test-transplant.t` would otherwise have needed a `#if continueflag`.
Differential Revision: https://phab.mercurial-scm.org/D9310
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 12 Oct 2020 12:44:18 -0700 |
parents | 21733e8c924f |
children | c7abdbc8fd47 |
line wrap: on
line diff
--- a/tests/test-histedit-arguments.t Thu Oct 22 13:31:34 2020 -0700 +++ b/tests/test-histedit-arguments.t Mon Oct 12 12:44:18 2020 -0700 @@ -55,11 +55,11 @@ $ hg histedit --continue abort: no histedit in progress - [255] + [20] $ hg abort abort: no histedit in progress (abortflag !) abort: no operation in progress (abortcommand !) - [255] + [20] Run a dummy edit to make sure we get tip^^ correctly via revsingle. -------------------------------------------------------------------- @@ -156,7 +156,7 @@ $ hg graft --continue abort: no graft in progress (continue: hg histedit --continue) - [255] + [20] $ mv .hg/histedit-state .hg/histedit-state.back $ hg update --quiet --clean 2 @@ -505,7 +505,7 @@ $ hg commit --amend -m 'reject this fold' abort: histedit in progress (use 'hg histedit --continue' or 'hg histedit --abort') - [255] + [20] With markers enabled, histedit does not get confused, and amend should not be blocked by the ongoing histedit.