Mercurial > public > mercurial-scm > hg

comparison mercurial/state.py @ 45244:d4a28b76fa54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: fix bad formatting of state.py from D8811 `test-check-format.t` was failing for me. Do I just have the wrong version? Differential Revision: https://phab.mercurial-scm.org/D8841
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 28 Jul 2020 11:11:14 -0700
parents a253ded5b03d
children 89a2afe31e82
comparison
equal deleted inserted replaced
45243:ad7006830106 45244:d4a28b76fa54
168 return _(b"use 'hg %s --continue' or 'hg %s --abort'") % ( 168 return _(b"use 'hg %s --continue' or 'hg %s --abort'") % (
169 self._opname, 169 self._opname,
170 self._opname, 170 self._opname,
171 ) 171 )
172 else: 172 else:
173 return _(b"use 'hg %s --continue', 'hg %s --abort', " 173 return _(
174 b"or 'hg %s --stop'") % ( 174 b"use 'hg %s --continue', 'hg %s --abort', "
175 self._opname, 175 b"or 'hg %s --stop'"
176 self._opname, 176 ) % (self._opname, self._opname, self._opname,)
177 self._opname,
178 )
179 177
180 return self._cmdhint 178 return self._cmdhint
181 179
182 def msg(self): 180 def msg(self):
183 """returns the status message corresponding to the command""" 181 """returns the status message corresponding to the command"""