Show More
@@ -5991,6 +5991,15 b' def summary(ui, repo, **opts):' | |||||
5991 | ui.write(_(' (empty repository)')) |
|
5991 | ui.write(_(' (empty repository)')) | |
5992 | else: |
|
5992 | else: | |
5993 | ui.write(_(' (no revision checked out)')) |
|
5993 | ui.write(_(' (no revision checked out)')) | |
|
5994 | if p.troubled(): | |||
|
5995 | ui.write(' (') | |||
|
5996 | troubles = p.troubles() | |||
|
5997 | for idx, trouble in enumerate(troubles, 1): | |||
|
5998 | ui.write(trouble, | |||
|
5999 | label='trouble.%s' % trouble) | |||
|
6000 | if idx < len(troubles): | |||
|
6001 | ui.write(', ') | |||
|
6002 | ui.write(')') | |||
5994 | ui.write('\n') |
|
6003 | ui.write('\n') | |
5995 | if p.description(): |
|
6004 | if p.description(): | |
5996 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', |
|
6005 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', |
@@ -242,7 +242,7 b' Fixing "bumped" situation' | |||||
242 | We need to create a clone of 5 and add a special marker with a flag |
|
242 | We need to create a clone of 5 and add a special marker with a flag | |
243 |
|
243 | |||
244 | $ hg summary |
|
244 | $ hg summary | |
245 | parent: 5:5601fb93a350 tip |
|
245 | parent: 5:5601fb93a350 tip (bumped) | |
246 | add new_3_c |
|
246 | add new_3_c | |
247 | branch: default |
|
247 | branch: default | |
248 | commit: (clean) |
|
248 | commit: (clean) | |
@@ -477,7 +477,7 b' detect outgoing obsolete and unstable' | |||||
477 | $ hg log -r 'obsolete()' |
|
477 | $ hg log -r 'obsolete()' | |
478 | 4:94b33453f93b (draft) [ ] add original_d |
|
478 | 4:94b33453f93b (draft) [ ] add original_d | |
479 | $ hg summary |
|
479 | $ hg summary | |
480 | parent: 5:cda648ca50f5 tip |
|
480 | parent: 5:cda648ca50f5 tip (unstable) | |
481 | add original_e |
|
481 | add original_e | |
482 | branch: default |
|
482 | branch: default | |
483 | commit: (clean) |
|
483 | commit: (clean) | |
@@ -825,6 +825,20 b' test the default cmdline template' | |||||
825 | summary: add babar |
|
825 | summary: add babar | |
826 |
|
826 | |||
827 |
|
827 | |||
|
828 | test summary output | |||
|
829 | ||||
|
830 | $ hg up -r 'bumped() and unstable()' | |||
|
831 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
832 | $ hg summary | |||
|
833 | parent: 7:50c51b361e60 (unstable, bumped) | |||
|
834 | add babar | |||
|
835 | branch: default | |||
|
836 | commit: 3 unknown (clean) | |||
|
837 | update: 2 new changesets (update) | |||
|
838 | phases: 4 draft | |||
|
839 | unstable: 2 changesets | |||
|
840 | bumped: 1 changesets | |||
|
841 | ||||
828 | Test incoming/outcoming with changesets obsoleted remotely, known locally |
|
842 | Test incoming/outcoming with changesets obsoleted remotely, known locally | |
829 | =============================================================================== |
|
843 | =============================================================================== | |
830 |
|
844 |
@@ -761,7 +761,7 b' If a rebase is going to create divergenc' | |||||
761 | o 0:4a2df7238c3b A |
|
761 | o 0:4a2df7238c3b A | |
762 |
|
762 | |||
763 | $ hg summary |
|
763 | $ hg summary | |
764 | parent: 15:73568ab6879d tip |
|
764 | parent: 15:73568ab6879d tip (unstable) | |
765 | bar foo |
|
765 | bar foo | |
766 | branch: default |
|
766 | branch: default | |
767 | commit: (clean) |
|
767 | commit: (clean) |
General Comments 0
You need to be logged in to leave comments.
Login now