##// END OF EJS Templates
summary: print unstable, bumped and divergent as unconditionally plural...
Matt Harbison -
r27722:edd2615a default
parent child Browse files
Show More
@@ -6538,9 +6538,9 b' def summary(ui, repo, **opts):'
6538 numtrouble = len(repo.revs(trouble + "()"))
6538 numtrouble = len(repo.revs(trouble + "()"))
6539 # We write all the possibilities to ease translation
6539 # We write all the possibilities to ease translation
6540 troublemsg = {
6540 troublemsg = {
6541 "unstable": _("unstable: %d changeset"),
6541 "unstable": _("unstable: %d changesets"),
6542 "divergent": _("divergent: %d changeset"),
6542 "divergent": _("divergent: %d changesets"),
6543 "bumped": _("bumped: %d changeset"),
6543 "bumped": _("bumped: %d changesets"),
6544 }
6544 }
6545 if numtrouble > 0:
6545 if numtrouble > 0:
6546 ui.status(troublemsg[trouble] % numtrouble + "\n")
6546 ui.status(troublemsg[trouble] % numtrouble + "\n")
@@ -245,7 +245,7 b' We need to create a clone of 5 and add a'
245 commit: (clean)
245 commit: (clean)
246 update: 1 new changesets, 2 branch heads (merge)
246 update: 1 new changesets, 2 branch heads (merge)
247 phases: 1 draft
247 phases: 1 draft
248 bumped: 1 changeset
248 bumped: 1 changesets
249 $ hg up '5^'
249 $ hg up '5^'
250 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
250 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
251 $ hg revert -ar 5
251 $ hg revert -ar 5
@@ -480,7 +480,7 b' detect outgoing obsolete and unstable'
480 commit: (clean)
480 commit: (clean)
481 update: 1 new changesets, 2 branch heads (merge)
481 update: 1 new changesets, 2 branch heads (merge)
482 phases: 3 draft
482 phases: 3 draft
483 unstable: 1 changeset
483 unstable: 1 changesets
484 $ hg log -G -r '::unstable()'
484 $ hg log -G -r '::unstable()'
485 @ 5:cda648ca50f5 (draft) [tip ] add original_e
485 @ 5:cda648ca50f5 (draft) [tip ] add original_e
486 |
486 |
General Comments 0
You need to be logged in to leave comments. Login now