Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 9608:d097bc2d1945

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: clarify output for the commit summary It is not clear what is meant with '2 modified, 3 unknown'. We clarify this by writing '2 modified files, 3 unknown files' instead.
author David Soria Parra <dsp@php.net>
date Mon, 19 Oct 2009 07:14:44 +0200
parents 8e0e0d854b60
children fafd653134d0
comparison
equal deleted inserted replaced
9607:8e0e0d854b60 9608:d097bc2d1945
2899 ui.status(_('branch: %s\n') % branch) 2899 ui.status(_('branch: %s\n') % branch)
2900 2900
2901 st = list(repo.status(unknown=True))[:7] 2901 st = list(repo.status(unknown=True))[:7]
2902 ms = merge_.mergestate(repo) 2902 ms = merge_.mergestate(repo)
2903 st.append([f for f in ms if f == 'u']) 2903 st.append([f for f in ms if f == 'u'])
2904 labels = [_('%d modified'), _('%d added'), _('%d removed'), 2904 labels = [_('%d modified files'), _('%d added files'),
2905 _('%d deleted'), _('%d unknown'), _('%d ignored'), 2905 _('%d removed files'), _('%d deleted files'),
2906 _('%d unresolved')] 2906 _('%d unknown files'), _('%d ignored files'),
2907 _('%d unresolved files')]
2907 t = [] 2908 t = []
2908 for s,l in zip(st, labels): 2909 for s,l in zip(st, labels):
2909 if s: 2910 if s:
2910 t.append(l % len(s)) 2911 t.append(l % len(s))
2911 2912