Show More
@@ -514,6 +514,14 b' def shownode(repo, ctx, templ, **args):' | |||||
514 | """ |
|
514 | """ | |
515 | return ctx.hex() |
|
515 | return ctx.hex() | |
516 |
|
516 | |||
|
517 | @templatekeyword('obsolete') | |||
|
518 | def showobsolete(repo, ctx, templ, **args): | |||
|
519 | """String. Whether the changeset is obsolete. | |||
|
520 | """ | |||
|
521 | if ctx.obsolete(): | |||
|
522 | return 'obsolete' | |||
|
523 | return '' | |||
|
524 | ||||
517 | @templatekeyword('p1rev') |
|
525 | @templatekeyword('p1rev') | |
518 | def showp1rev(repo, ctx, templ, **args): |
|
526 | def showp1rev(repo, ctx, templ, **args): | |
519 | """Integer. The repository-local revision number of the changeset's |
|
527 | """Integer. The repository-local revision number of the changeset's |
@@ -3,7 +3,7 b'' | |||||
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}{if(troubles, ' {troubles}')}) [{tags} {bookmarks}] {desc|firstline}\n" |
|
6 | > logtemplate="{rev}:{node|short} ({phase}{if(obsolete, ' *{obsolete}*')}{if(troubles, ' {troubles}')}) [{tags} {bookmarks}] {desc|firstline}\n" | |
7 | > EOF |
|
7 | > EOF | |
8 | $ mkcommit() { |
|
8 | $ mkcommit() { | |
9 | > echo "$1" > "$1" |
|
9 | > echo "$1" > "$1" | |
@@ -155,9 +155,9 b' check that heads does not report them' | |||||
155 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
155 | 5:5601fb93a350 (draft) [tip ] add new_3_c | |
156 | $ hg heads --hidden |
|
156 | $ hg heads --hidden | |
157 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
157 | 5:5601fb93a350 (draft) [tip ] add new_3_c | |
158 | 4:ca819180edb9 (draft) [ ] add new_2_c |
|
158 | 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c | |
159 | 3:cdbce2fbb163 (draft) [ ] add new_c |
|
159 | 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c | |
160 | 2:245bde4270cd (draft) [ ] add original_c |
|
160 | 2:245bde4270cd (draft *obsolete*) [ ] add original_c | |
161 |
|
161 | |||
162 |
|
162 | |||
163 | check that summary does not report them |
|
163 | check that summary does not report them | |
@@ -392,11 +392,11 b' clone support' | |||||
392 | $ hg -R clone-dest log -G --hidden |
|
392 | $ hg -R clone-dest log -G --hidden | |
393 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
393 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | |
394 | | |
|
394 | | | |
395 | | x 5:5601fb93a350 (draft) [ ] add new_3_c |
|
395 | | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c | |
396 | |/ |
|
396 | |/ | |
397 | | x 4:ca819180edb9 (draft) [ ] add new_2_c |
|
397 | | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c | |
398 | |/ |
|
398 | |/ | |
399 | | x 3:cdbce2fbb163 (draft) [ ] add new_c |
|
399 | | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c | |
400 | |/ |
|
400 | |/ | |
401 | | o 2:245bde4270cd (public) [ ] add original_c |
|
401 | | o 2:245bde4270cd (public) [ ] add original_c | |
402 | |/ |
|
402 | |/ | |
@@ -475,7 +475,7 b' detect outgoing obsolete and unstable' | |||||
475 | $ hg debugobsolete | grep `getid original_d` |
|
475 | $ hg debugobsolete | grep `getid original_d` | |
476 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
476 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
477 | $ hg log -r 'obsolete()' |
|
477 | $ hg log -r 'obsolete()' | |
478 | 4:94b33453f93b (draft) [ ] add original_d |
|
478 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d | |
479 | $ hg summary |
|
479 | $ hg summary | |
480 | parent: 5:cda648ca50f5 tip (unstable) |
|
480 | parent: 5:cda648ca50f5 tip (unstable) | |
481 | add original_e |
|
481 | add original_e | |
@@ -487,7 +487,7 b' detect outgoing obsolete and unstable' | |||||
487 | $ hg log -G -r '::unstable()' |
|
487 | $ hg log -G -r '::unstable()' | |
488 | @ 5:cda648ca50f5 (draft unstable) [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 *obsolete*) [ ] 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 | | | |
@@ -526,7 +526,7 b" Don't try to push extinct changeset" | |||||
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 *obsolete*) [ ] add original_d | |
530 | 5:cda648ca50f5 (draft unstable) [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 | |
@@ -550,7 +550,7 b' Do not warn about new head when the new ' | |||||
550 | $ hg log -G |
|
550 | $ hg log -G | |
551 | @ 5:cda648ca50f5 (draft unstable) [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 *obsolete*) [ ] 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 | | | |
@@ -588,9 +588,9 b' Reminder of the repo situation' | |||||
588 | $ hg log --hidden --graph |
|
588 | $ hg log --hidden --graph | |
589 | @ 6:3de5eca88c00 (draft) [tip ] add obsolete_e |
|
589 | @ 6:3de5eca88c00 (draft) [tip ] add obsolete_e | |
590 | | |
|
590 | | | |
591 | | x 5:cda648ca50f5 (draft) [ ] add original_e |
|
591 | | x 5:cda648ca50f5 (draft *obsolete*) [ ] add original_e | |
592 | | | |
|
592 | | | | |
593 | | x 4:94b33453f93b (draft) [ ] add original_d |
|
593 | | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d | |
594 | |/ |
|
594 | |/ | |
595 | o 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
595 | o 3:6f9641995072 (draft) [ ] add n3w_3_c | |
596 | | |
|
596 | | | |
@@ -811,6 +811,11 b' Several troubles on the same changeset (' | |||||
811 | summary: add babar |
|
811 | summary: add babar | |
812 |
|
812 | |||
813 |
|
813 | |||
|
814 | test the "obsolete" templatekw | |||
|
815 | ||||
|
816 | $ hg log -r 'obsolete()' | |||
|
817 | 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e | |||
|
818 | ||||
814 | test the "troubles" templatekw |
|
819 | test the "troubles" templatekw | |
815 |
|
820 | |||
816 | $ hg log -r 'bumped() and unstable()' |
|
821 | $ hg log -r 'bumped() and unstable()' | |
@@ -927,7 +932,7 b' Test that a local tag blocks a changeset' | |||||
927 | $ hg log -G |
|
932 | $ hg log -G | |
928 | @ 3:323a9c3ddd91 (draft) [tip ] A |
|
933 | @ 3:323a9c3ddd91 (draft) [tip ] A | |
929 | | |
|
934 | | | |
930 | | x 1:29f0c6921ddd (draft) [visible ] A |
|
935 | | x 1:29f0c6921ddd (draft *obsolete*) [visible ] A | |
931 | |/ |
|
936 | |/ | |
932 | o 0:d20a80d4def3 (draft) [ ] base |
|
937 | o 0:d20a80d4def3 (draft) [ ] base | |
933 |
|
938 | |||
@@ -980,9 +985,9 b' Test bundle overlay onto hidden revision' | |||||
980 | $ hg log -G --hidden |
|
985 | $ hg log -G --hidden | |
981 | @ 3:b7d587542d40 (draft) [tip ] B+ |
|
986 | @ 3:b7d587542d40 (draft) [tip ] B+ | |
982 | | |
|
987 | | | |
983 | | x 2:eb95e9297e18 (draft) [ ] temporary amend commit for 44526ebb0f98 |
|
988 | | x 2:eb95e9297e18 (draft *obsolete*) [ ] temporary amend commit for 44526ebb0f98 | |
984 | | | |
|
989 | | | | |
985 | | x 1:44526ebb0f98 (draft) [ ] B |
|
990 | | x 1:44526ebb0f98 (draft *obsolete*) [ ] B | |
986 | |/ |
|
991 | |/ | |
987 | o 0:4b34ecfb0d56 (draft) [ ] A |
|
992 | o 0:4b34ecfb0d56 (draft) [ ] A | |
988 |
|
993 | |||
@@ -1122,7 +1127,7 b' bookmarks change' | |||||
1122 | $ hg commit --amend -m "message" |
|
1127 | $ hg commit --amend -m "message" | |
1123 | $ hg book bookb -r 13bedc178fce --hidden |
|
1128 | $ hg book bookb -r 13bedc178fce --hidden | |
1124 | $ hg log -r 13bedc178fce |
|
1129 | $ hg log -r 13bedc178fce | |
1125 | 5:13bedc178fce (draft) [ bookb] add b |
|
1130 | 5:13bedc178fce (draft *obsolete*) [ bookb] add b | |
1126 | $ hg book -d bookb |
|
1131 | $ hg book -d bookb | |
1127 | $ hg log -r 13bedc178fce |
|
1132 | $ hg log -r 13bedc178fce | |
1128 | abort: hidden revision '13bedc178fce'! |
|
1133 | abort: hidden revision '13bedc178fce'! | |
@@ -1162,9 +1167,9 b' Test ability to pull changeset with loca' | |||||
1162 | $ hg log -G --hidden |
|
1167 | $ hg log -G --hidden | |
1163 | @ 4:b0551702f918 (draft) [tip ] 2 |
|
1168 | @ 4:b0551702f918 (draft) [tip ] 2 | |
1164 | | |
|
1169 | | | |
1165 | | x 3:f27abbcc1f77 (draft) [ ] temporary amend commit for e008cf283490 |
|
1170 | | x 3:f27abbcc1f77 (draft *obsolete*) [ ] temporary amend commit for e008cf283490 | |
1166 | | | |
|
1171 | | | | |
1167 | | x 2:e008cf283490 (draft) [ ] 2 |
|
1172 | | x 2:e008cf283490 (draft *obsolete*) [ ] 2 | |
1168 | |/ |
|
1173 | |/ | |
1169 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1174 | o 1:e016b03fd86f (draft) [ ] 1 | |
1170 | | |
|
1175 | | |
General Comments 0
You need to be logged in to leave comments.
Login now