Mercurial > hg-stable
changeset 30715:7b526670f540
summary: add evolution "troubles" information to summary output
Extend the "parent: " lines in summary with the list of evolution "troubles"
in parentheses, when the parent is troubled.
| author | Denis Laxalde <denis.laxalde@logilab.fr> |
|---|---|
| date | Fri, 06 Jan 2017 14:35:22 +0100 |
| parents | 8d46eaaa589c |
| children | 3de9df6ee5bf |
| files | mercurial/commands.py tests/test-obsolete.t tests/test-rebase-obsolete.t |
| diffstat | 3 files changed, 26 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Fri Jan 06 14:34:34 2017 +0100 +++ b/mercurial/commands.py Fri Jan 06 14:35:22 2017 +0100 @@ -5991,6 +5991,15 @@ ui.write(_(' (empty repository)')) else: ui.write(_(' (no revision checked out)')) + if p.troubled(): + ui.write(' (') + troubles = p.troubles() + for idx, trouble in enumerate(troubles, 1): + ui.write(trouble, + label='trouble.%s' % trouble) + if idx < len(troubles): + ui.write(', ') + ui.write(')') ui.write('\n') if p.description(): ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
--- a/tests/test-obsolete.t Fri Jan 06 14:34:34 2017 +0100 +++ b/tests/test-obsolete.t Fri Jan 06 14:35:22 2017 +0100 @@ -242,7 +242,7 @@ We need to create a clone of 5 and add a special marker with a flag $ hg summary - parent: 5:5601fb93a350 tip + parent: 5:5601fb93a350 tip (bumped) add new_3_c branch: default commit: (clean) @@ -477,7 +477,7 @@ $ hg log -r 'obsolete()' 4:94b33453f93b (draft) [ ] add original_d $ hg summary - parent: 5:cda648ca50f5 tip + parent: 5:cda648ca50f5 tip (unstable) add original_e branch: default commit: (clean) @@ -825,6 +825,20 @@ summary: add babar +test summary output + + $ hg up -r 'bumped() and unstable()' + 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ hg summary + parent: 7:50c51b361e60 (unstable, bumped) + add babar + branch: default + commit: 3 unknown (clean) + update: 2 new changesets (update) + phases: 4 draft + unstable: 2 changesets + bumped: 1 changesets + Test incoming/outcoming with changesets obsoleted remotely, known locally ===============================================================================