Mercurial > hg
changeset 45215:a253ded5b03d
morestatus: mention --stop even if not using --verbose
Differential Revision: https://phab.mercurial-scm.org/D8811
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Thu, 23 Jul 2020 13:31:45 -0700 |
| parents | d5ccc059fbcd |
| children | 357d8415aa27 |
| files | mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-rebase-abort.t tests/test-rebase-inmemory.t tests/test-rebase-obsolete.t |
| diffstat | 6 files changed, 22 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/state.py Fri Jul 24 11:24:59 2020 -0700 +++ b/mercurial/state.py Thu Jul 23 13:31:45 2020 -0700 @@ -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):
--- a/tests/test-absorb-unfinished.t Fri Jul 24 11:24:59 2020 -0700 +++ b/tests/test-absorb-unfinished.t Thu Jul 23 13:31:45 2020 -0700 @@ -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]
--- a/tests/test-fix.t Fri Jul 24 11:24:59 2020 -0700 +++ b/tests/test-fix.t Thu Jul 23 13:31:45 2020 -0700 @@ -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 ..
--- a/tests/test-rebase-abort.t Fri Jul 24 11:24:59 2020 -0700 +++ b/tests/test-rebase-abort.t Thu Jul 23 13:31:45 2020 -0700 @@ -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,20 +397,20 @@ $ 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 - (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 - (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 - (use 'hg rebase --continue' or 'hg rebase --abort') + (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') [255] $ hg abort
--- a/tests/test-rebase-inmemory.t Fri Jul 24 11:24:59 2020 -0700 +++ b/tests/test-rebase-inmemory.t Thu Jul 23 13:31:45 2020 -0700 @@ -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
--- a/tests/test-rebase-obsolete.t Fri Jul 24 11:24:59 2020 -0700 +++ b/tests/test-rebase-obsolete.t Thu Jul 23 13:31:45 2020 -0700 @@ -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