diff mercurial/commands.py @ 9617:fafd653134d0

Merge with crew
author Matt Mackall <mpm@selenic.com>
date Mon, 19 Oct 2009 23:53:25 -0500
parents 69f8ac71ded1 d097bc2d1945
children d75a309a24b1
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Oct 19 00:36:52 2009 -0500
+++ b/mercurial/commands.py	Mon Oct 19 23:53:25 2009 -0500
@@ -2901,11 +2901,14 @@
     st = list(repo.status(unknown=True))[:7]
     ms = merge_.mergestate(repo)
     st.append([f for f in ms if f == 'u'])
-    labels = _('modified added removed deleted unknown ignored unresolved')
+    labels = [_('%d modified files'), _('%d added files'),
+              _('%d removed files'), _('%d deleted files'),
+              _('%d unknown files'), _('%d ignored files'),
+              _('%d unresolved files')]
     t = []
-    for i,l in enumerate(labels.split()):
-        if st[i]:
-            t.append('%d %s' % (len(st[i]), l))
+    for s,l in zip(st, labels):
+        if s:
+            t.append(l % len(s))
 
     t = ', '.join(t)