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