Mercurial > hg
comparison tests/test-obsolete.t @ 30712:5dde81de1e6d
templatekw: add a "troubles" template keyword
The "troubles" template keyword returns a list of evolution troubles.
It is EXPERIMENTAL, as anything else related to changeset evolution.
Test it in test-obsolete.t which has troubled changesets.
author | Denis Laxalde <denis.laxalde@logilab.fr> |
---|---|
date | Fri, 06 Jan 2017 13:50:16 +0100 |
parents | c03627d87d9d |
children | 6d0b1a69f98c |
comparison
equal
deleted
inserted
replaced
30711:c03627d87d9d | 30712:5dde81de1e6d |
---|---|
1 $ cat >> $HGRCPATH << EOF | 1 $ cat >> $HGRCPATH << EOF |
2 > [phases] | 2 > [phases] |
3 > # public changeset are not obsolete | 3 > # public changeset are not obsolete |
4 > publish=false | 4 > publish=false |
5 > [ui] | 5 > [ui] |
6 > logtemplate="{rev}:{node|short} ({phase}) [{tags} {bookmarks}] {desc|firstline}\n" | 6 > logtemplate="{rev}:{node|short} ({phase}{if(troubles, ' {troubles}')}) [{tags} {bookmarks}] {desc|firstline}\n" |
7 > EOF | 7 > EOF |
8 $ mkcommit() { | 8 $ mkcommit() { |
9 > echo "$1" > "$1" | 9 > echo "$1" > "$1" |
10 > hg add "$1" | 10 > hg add "$1" |
11 > hg ci -m "add $1" | 11 > hg ci -m "add $1" |
201 | 201 |
202 Check that public changeset are not accounted as obsolete: | 202 Check that public changeset are not accounted as obsolete: |
203 | 203 |
204 $ hg --hidden phase --public 2 | 204 $ hg --hidden phase --public 2 |
205 $ hg log -G | 205 $ hg log -G |
206 @ 5:5601fb93a350 (draft) [tip ] add new_3_c | 206 @ 5:5601fb93a350 (draft bumped) [tip ] add new_3_c |
207 | | 207 | |
208 | o 2:245bde4270cd (public) [ ] add original_c | 208 | o 2:245bde4270cd (public) [ ] add original_c |
209 |/ | 209 |/ |
210 o 1:7c3bad9141dc (public) [ ] add b | 210 o 1:7c3bad9141dc (public) [ ] add b |
211 | | 211 | |
218 If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also | 218 If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also |
219 note that the bumped changeset (5:5601fb93a350) is not a direct successor of | 219 note that the bumped changeset (5:5601fb93a350) is not a direct successor of |
220 the public changeset | 220 the public changeset |
221 | 221 |
222 $ hg log --hidden -r 'bumped()' | 222 $ hg log --hidden -r 'bumped()' |
223 5:5601fb93a350 (draft) [tip ] add new_3_c | 223 5:5601fb93a350 (draft bumped) [tip ] add new_3_c |
224 | 224 |
225 And that we can't push bumped changeset | 225 And that we can't push bumped changeset |
226 | 226 |
227 $ hg push ../tmpa -r 0 --force #(make repo related) | 227 $ hg push ../tmpa -r 0 --force #(make repo related) |
228 pushing to ../tmpa | 228 pushing to ../tmpa |
483 commit: (clean) | 483 commit: (clean) |
484 update: 1 new changesets, 2 branch heads (merge) | 484 update: 1 new changesets, 2 branch heads (merge) |
485 phases: 3 draft | 485 phases: 3 draft |
486 unstable: 1 changesets | 486 unstable: 1 changesets |
487 $ hg log -G -r '::unstable()' | 487 $ hg log -G -r '::unstable()' |
488 @ 5:cda648ca50f5 (draft) [tip ] add original_e | 488 @ 5:cda648ca50f5 (draft unstable) [tip ] add original_e |
489 | | 489 | |
490 x 4:94b33453f93b (draft) [ ] add original_d | 490 x 4:94b33453f93b (draft) [ ] add original_d |
491 | | 491 | |
492 o 3:6f9641995072 (draft) [ ] add n3w_3_c | 492 o 3:6f9641995072 (draft) [ ] add n3w_3_c |
493 | | 493 | |
525 0:1f0dee641bb7 (public) [ ] add a | 525 0:1f0dee641bb7 (public) [ ] add a |
526 1:7c3bad9141dc (public) [ ] add b | 526 1:7c3bad9141dc (public) [ ] add b |
527 2:245bde4270cd (public) [ ] add original_c | 527 2:245bde4270cd (public) [ ] add original_c |
528 3:6f9641995072 (draft) [ ] add n3w_3_c | 528 3:6f9641995072 (draft) [ ] add n3w_3_c |
529 4:94b33453f93b (draft) [ ] add original_d | 529 4:94b33453f93b (draft) [ ] add original_d |
530 5:cda648ca50f5 (draft) [tip ] add original_e | 530 5:cda648ca50f5 (draft unstable) [tip ] add original_e |
531 $ hg push ../tmpf -f # -f because be push unstable too | 531 $ hg push ../tmpf -f # -f because be push unstable too |
532 pushing to ../tmpf | 532 pushing to ../tmpf |
533 searching for changes | 533 searching for changes |
534 adding changesets | 534 adding changesets |
535 adding manifests | 535 adding manifests |
546 [1] | 546 [1] |
547 | 547 |
548 Do not warn about new head when the new head is a successors of a remote one | 548 Do not warn about new head when the new head is a successors of a remote one |
549 | 549 |
550 $ hg log -G | 550 $ hg log -G |
551 @ 5:cda648ca50f5 (draft) [tip ] add original_e | 551 @ 5:cda648ca50f5 (draft unstable) [tip ] add original_e |
552 | | 552 | |
553 x 4:94b33453f93b (draft) [ ] add original_d | 553 x 4:94b33453f93b (draft) [ ] add original_d |
554 | | 554 | |
555 o 3:6f9641995072 (draft) [ ] add n3w_3_c | 555 o 3:6f9641995072 (draft) [ ] add n3w_3_c |
556 | | 556 | |
808 date: Thu Jan 01 00:00:00 1970 +0000 | 808 date: Thu Jan 01 00:00:00 1970 +0000 |
809 trouble: unstable, bumped | 809 trouble: unstable, bumped |
810 summary: add babar | 810 summary: add babar |
811 | 811 |
812 | 812 |
813 test the "troubles" templatekw | |
814 | |
815 $ hg log -r 'bumped() and unstable()' | |
816 7:50c51b361e60 (draft unstable bumped) [ ] add babar | |
817 | |
813 Test incoming/outcoming with changesets obsoleted remotely, known locally | 818 Test incoming/outcoming with changesets obsoleted remotely, known locally |
814 =============================================================================== | 819 =============================================================================== |
815 | 820 |
816 This test issue 3805 | 821 This test issue 3805 |
817 | 822 |