diff --git a/mercurial/state.py b/mercurial/state.py index d5ccc059fbcd3e4af53a1556231113089dba7b0e_bWVyY3VyaWFsL3N0YXRlLnB5..a253ded5b03dcc083d8538c7e743e9ef44610bcc_bWVyY3VyaWFsL3N0YXRlLnB5 100644 --- a/mercurial/state.py +++ b/mercurial/state.py @@ -164,10 +164,19 @@ operation """ if not self._cmdhint: - return _(b"use 'hg %s --continue' or 'hg %s --abort'") % ( - self._opname, - self._opname, - ) + if not self._stopflag: + return _(b"use 'hg %s --continue' or 'hg %s --abort'") % ( + self._opname, + self._opname, + ) + else: + return _(b"use 'hg %s --continue', 'hg %s --abort', " + b"or 'hg %s --stop'") % ( + self._opname, + self._opname, + self._opname, + ) + return self._cmdhint def msg(self): diff --git a/tests/test-absorb-unfinished.t b/tests/test-absorb-unfinished.t index d5ccc059fbcd3e4af53a1556231113089dba7b0e_dGVzdHMvdGVzdC1hYnNvcmItdW5maW5pc2hlZC50..a253ded5b03dcc083d8538c7e743e9ef44610bcc_dGVzdHMvdGVzdC1hYnNvcmItdW5maW5pc2hlZC50 100644 --- a/tests/test-absorb-unfinished.t +++ b/tests/test-absorb-unfinished.t @@ -25,6 +25,6 @@ $ hg --config extensions.rebase= absorb abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] diff --git a/tests/test-fix.t b/tests/test-fix.t index d5ccc059fbcd3e4af53a1556231113089dba7b0e_dGVzdHMvdGVzdC1maXgudA==..a253ded5b03dcc083d8538c7e743e9ef44610bcc_dGVzdHMvdGVzdC1maXgudA== 100644 --- a/tests/test-fix.t +++ b/tests/test-fix.t @@ -878,7 +878,7 @@ $ hg --config extensions.rebase= fix -r . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ cd .. diff --git a/tests/test-rebase-abort.t b/tests/test-rebase-abort.t index d5ccc059fbcd3e4af53a1556231113089dba7b0e_dGVzdHMvdGVzdC1yZWJhc2UtYWJvcnQudA==..a253ded5b03dcc083d8538c7e743e9ef44610bcc_dGVzdHMvdGVzdC1yZWJhc2UtYWJvcnQudA== 100644 --- a/tests/test-rebase-abort.t +++ b/tests/test-rebase-abort.t @@ -327,7 +327,7 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ cat a @@ -397,7 +397,7 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ hg up . abort: rebase in progress @@ -401,7 +401,7 @@ [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ hg up -C . abort: rebase in progress @@ -405,8 +405,8 @@ [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ hg graft 3 abort: rebase in progress @@ -409,8 +409,8 @@ [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ hg abort diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t index d5ccc059fbcd3e4af53a1556231113089dba7b0e_dGVzdHMvdGVzdC1yZWJhc2UtaW5tZW1vcnkudA==..a253ded5b03dcc083d8538c7e743e9ef44610bcc_dGVzdHMvdGVzdC1yZWJhc2UtaW5tZW1vcnkudA== 100644 --- a/tests/test-rebase-inmemory.t +++ b/tests/test-rebase-inmemory.t @@ -901,7 +901,7 @@ [1] $ hg rebase -r 3 -d 1 -t:merge3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ hg resolve --list U foo diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t index d5ccc059fbcd3e4af53a1556231113089dba7b0e_dGVzdHMvdGVzdC1yZWJhc2Utb2Jzb2xldGUudA==..a253ded5b03dcc083d8538c7e743e9ef44610bcc_dGVzdHMvdGVzdC1yZWJhc2Utb2Jzb2xldGUudA== 100644 --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2055,7 +2055,7 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ hg rebase --stop --continue abort: cannot specify both --stop and --continue