Mercurial > public > mercurial-scm > hg

comparison mercurial/state.py @ 45215:a253ded5b03d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 5322e738be0f
children d4a28b76fa54
comparison
equal deleted inserted replaced
45213:d5ccc059fbcd 45215:a253ded5b03d
162 def hint(self): 162 def hint(self):
163 """returns the hint message corresponding to an interrupted 163 """returns the hint message corresponding to an interrupted
164 operation 164 operation
165 """ 165 """
166 if not self._cmdhint: 166 if not self._cmdhint:
167 return _(b"use 'hg %s --continue' or 'hg %s --abort'") % ( 167 if not self._stopflag:
168 self._opname, 168 return _(b"use 'hg %s --continue' or 'hg %s --abort'") % (
169 self._opname, 169 self._opname,
170 ) 170 self._opname,
171 )
172 else:
173 return _(b"use 'hg %s --continue', 'hg %s --abort', "
174 b"or 'hg %s --stop'") % (
175 self._opname,
176 self._opname,
177 self._opname,
178 )
179
171 return self._cmdhint 180 return self._cmdhint
172 181
173 def msg(self): 182 def msg(self):
174 """returns the status message corresponding to the command""" 183 """returns the status message corresponding to the command"""
175 if not self._cmdmsg: 184 if not self._cmdmsg: