Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 9617:fafd653134d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Matt Mackall <mpm@selenic.com>
date Mon, 19 Oct 2009 23:53:25 -0500
parents 69f8ac71ded1 d097bc2d1945
children d75a309a24b1
comparison
equal deleted inserted replaced
9606:69f8ac71ded1 9617:fafd653134d0
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 = _('modified added removed deleted unknown ignored unresolved') 2904 labels = [_('%d modified files'), _('%d added files'),
2905 _('%d removed files'), _('%d deleted files'),
2906 _('%d unknown files'), _('%d ignored files'),
2907 _('%d unresolved files')]
2905 t = [] 2908 t = []
2906 for i,l in enumerate(labels.split()): 2909 for s,l in zip(st, labels):
2907 if st[i]: 2910 if s:
2908 t.append('%d %s' % (len(st[i]), l)) 2911 t.append(l % len(s))
2909 2912
2910 t = ', '.join(t) 2913 t = ', '.join(t)
2911 2914
2912 if len(parents) > 1: 2915 if len(parents) > 1:
2913 t += _(' (merge)') 2916 t += _(' (merge)')