# HG changeset patch
# User Kyle Lippincott <spectral@google.com>
# Date 1595536305 25200
# Node ID a253ded5b03dcc083d8538c7e743e9ef44610bcc
# Parent  d5ccc059fbcd3e4af53a1556231113089dba7b0e
morestatus: mention --stop even if not using --verbose

Differential Revision: https://phab.mercurial-scm.org/D8811

diff -r d5ccc059fbcd -r a253ded5b03d mercurial/state.py
--- 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):
diff -r d5ccc059fbcd -r a253ded5b03d tests/test-absorb-unfinished.t
--- 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]
 
diff -r d5ccc059fbcd -r a253ded5b03d tests/test-fix.t
--- 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 ..
diff -r d5ccc059fbcd -r a253ded5b03d tests/test-rebase-abort.t
--- 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
diff -r d5ccc059fbcd -r a253ded5b03d tests/test-rebase-inmemory.t
--- 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
diff -r d5ccc059fbcd -r a253ded5b03d tests/test-rebase-obsolete.t
--- 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