Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 21947:b081decd9062 stable
resolve: add parenthesis around "no more unresolved files" message
This message may be confused with an error message. Adding parenthesis around it
will make it more recognisable as an informative message.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Sat, 26 Jul 2014 03:32:49 +0200 |
| parents | 0483ff40e326 |
| children | ad56fc55cbc3 |
comparison
equal
deleted
inserted
replaced
| 21946:868e2cea3ea0 | 21947:b081decd9062 |
|---|---|
| 5060 | 5060 |
| 5061 # Nudge users into finishing an unfinished operation. We don't print | 5061 # Nudge users into finishing an unfinished operation. We don't print |
| 5062 # this with the list/show operation because we want list/show to remain | 5062 # this with the list/show operation because we want list/show to remain |
| 5063 # machine readable. | 5063 # machine readable. |
| 5064 if not list(ms.unresolved()) and not show: | 5064 if not list(ms.unresolved()) and not show: |
| 5065 ui.status(_('no more unresolved files\n')) | 5065 ui.status(_('(no more unresolved files)\n')) |
| 5066 | 5066 |
| 5067 return ret | 5067 return ret |
| 5068 | 5068 |
| 5069 @command('revert', | 5069 @command('revert', |
| 5070 [('a', 'all', None, _('revert all changes when no arguments given')), | 5070 [('a', 'all', None, _('revert all changes when no arguments given')), |