Mercurial > hg
changeset 9455:176b7d42e6cc
Merge with main
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Thu, 17 Sep 2009 21:51:55 +0200 |
parents | dafadd7ff07e (diff) 61e30f257c15 (current diff) |
children | c564dbb2a6d5 |
files | |
diffstat | 1 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hg.py Wed Sep 16 16:01:37 2009 -0500 +++ b/mercurial/hg.py Thu Sep 17 21:51:55 2009 +0200 @@ -327,12 +327,8 @@ dir_cleanup.cleanup() def _showstats(repo, stats): - stats = ((stats[0], _("updated")), - (stats[1], _("merged")), - (stats[2], _("removed")), - (stats[3], _("unresolved"))) - note = ", ".join([_("%d files %s") % s for s in stats]) - repo.ui.status("%s\n" % note) + repo.ui.status(_("%d files updated, %d files merged, " + "%d files removed, %d files unresolved\n") % stats) def update(repo, node): """update the working directory to node, merging linear changes"""