Mercurial > public > mercurial-scm > hg

diff mercurial/localrepo.py @ 13455:053c042118bc stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rollback, i18n: avoid parameterized message
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Mon, 21 Feb 2011 20:58:54 -0300
parents 931a72e00efa
children 8ac1260941c0
line wrap: on
line diff
--- a/mercurial/localrepo.py	Mon Feb 21 23:27:45 2011 +0100
+++ b/mercurial/localrepo.py	Mon Feb 21 20:58:54 2011 -0300
@@ -742,9 +742,13 @@
                 self.invalidate()
                 self.dirstate.invalidate()
                 self.destroyed()
-                self.ui.status(_("working directory now based on "
-                                 "revision %s\n") % (
-                    _(' and ').join(str(p.rev()) for p in self.parents())))
+                parents = tuple([p.rev() for p in self.parents()])
+                if len(parents) > 1:
+                    self.ui.status(_("working directory now based on "
+                                     "revisions %d and %d\n") % parents)
+                else:
+                    self.ui.status(_("working directory now based on "
+                                     "revision %d\n") % parents)
             else:
                 self.ui.warn(_("no rollback information available\n"))
                 return 1