Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 9619:c4a6ce16708a
summary: restore briefer commit status
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 20 Oct 2009 11:58:09 -0500 |
parents | d75a309a24b1 |
children | a7ef354da662 |
comparison
equal
deleted
inserted
replaced
9618:d75a309a24b1 | 9619:c4a6ce16708a |
---|---|
2905 ui.status(_('branch: %s\n') % branch) | 2905 ui.status(_('branch: %s\n') % branch) |
2906 | 2906 |
2907 st = list(repo.status(unknown=True))[:7] | 2907 st = list(repo.status(unknown=True))[:7] |
2908 ms = merge_.mergestate(repo) | 2908 ms = merge_.mergestate(repo) |
2909 st.append([f for f in ms if f == 'u']) | 2909 st.append([f for f in ms if f == 'u']) |
2910 labels = [_('%d modified files'), _('%d added files'), | 2910 labels = [_('%d modified'), _('%d added'), _('%d removed'), |
2911 _('%d removed files'), _('%d deleted files'), | 2911 _('%d deleted'), _('%d unknown'), _('%d ignored'), |
2912 _('%d unknown files'), _('%d ignored files'), | 2912 _('%d unresolved')] |
2913 _('%d unresolved files')] | |
2914 t = [] | 2913 t = [] |
2915 for s,l in zip(st, labels): | 2914 for s,l in zip(st, labels): |
2916 if s: | 2915 if s: |
2917 t.append(l % len(s)) | 2916 t.append(l % len(s)) |
2918 | 2917 |