##// END OF EJS Templates
summary: add troubles list to the output of hg summary...
Laurent Charignon -
r27385:20e7de62 default
parent child Browse files
Show More
@@ -6493,6 +6493,18 def summary(ui, repo, **opts):
6493 if draft or secret:
6493 if draft or secret:
6494 ui.status(_('phases: %s\n') % ', '.join(t))
6494 ui.status(_('phases: %s\n') % ', '.join(t))
6495
6495
6496 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6497 for trouble in ("unstable", "divergent", "bumped"):
6498 numtrouble = len(repo.revs(trouble + "()"))
6499 # We write all the possibilities to ease translation
6500 troublemsg = {
6501 "unstable": _("unstable: %d changeset"),
6502 "divergent": _("divergent: %d changeset"),
6503 "bumped": _("bumped: %d changeset"),
6504 }
6505 if numtrouble > 0:
6506 ui.status(troublemsg[trouble] % numtrouble + "\n")
6507
6496 cmdutil.summaryhooks(ui, repo)
6508 cmdutil.summaryhooks(ui, repo)
6497
6509
6498 if opts.get('remote'):
6510 if opts.get('remote'):
@@ -238,6 +238,14 And that we can't push bumped changeset
238 Fixing "bumped" situation
238 Fixing "bumped" situation
239 We need to create a clone of 5 and add a special marker with a flag
239 We need to create a clone of 5 and add a special marker with a flag
240
240
241 $ hg summary
242 parent: 5:5601fb93a350 tip
243 add new_3_c
244 branch: default
245 commit: (clean)
246 update: 1 new changesets, 2 branch heads (merge)
247 phases: 1 draft
248 bumped: 1 changeset
241 $ hg up '5^'
249 $ hg up '5^'
242 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
243 $ hg revert -ar 5
251 $ hg revert -ar 5
@@ -465,6 +473,14 detect outgoing obsolete and unstable
465 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
473 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
466 $ hg log -r 'obsolete()'
474 $ hg log -r 'obsolete()'
467 4:94b33453f93b (draft) [ ] add original_d
475 4:94b33453f93b (draft) [ ] add original_d
476 $ hg summary
477 parent: 5:cda648ca50f5 tip
478 add original_e
479 branch: default
480 commit: (clean)
481 update: 1 new changesets, 2 branch heads (merge)
482 phases: 3 draft
483 unstable: 1 changeset
468 $ hg log -G -r '::unstable()'
484 $ hg log -G -r '::unstable()'
469 @ 5:cda648ca50f5 (draft) [tip ] add original_e
485 @ 5:cda648ca50f5 (draft) [tip ] add original_e
470 |
486 |
General Comments 0
You need to be logged in to leave comments. Login now