equal
deleted
inserted
replaced
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: |