Mercurial > hg

comparison tests/test-obsolete.t @ 33667:03039ff3082b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolution: rename unstable to orphan Rename unstable to orphan in all external user-facing output. Only update user-facing output for the moment, variables names, templates keyword and potentially configuration would be done in later series. The renaming is done according to https://www.mercurial-scm.org/wiki/CEDVocabulary. Differential Revision: https://phab.mercurial-scm.org/D214
author Boris Feld <boris.feld@octobus.net>
date Tue, 01 Aug 2017 17:53:48 +0200
parents b11e8c67fb0f
children 9c27a2891b75
comparison
equal deleted inserted replaced
33666:6f4bc9688ca9 33667:03039ff3082b
518 $ hg debugobsolete | grep `getid original_d` 518 $ hg debugobsolete | grep `getid original_d`
519 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 519 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
520 $ hg log -r 'obsolete()' 520 $ hg log -r 'obsolete()'
521 4:94b33453f93b (draft *obsolete*) [ ] add original_d 521 4:94b33453f93b (draft *obsolete*) [ ] add original_d
522 $ hg summary 522 $ hg summary
523 parent: 5:cda648ca50f5 tip (unstable) 523 parent: 5:cda648ca50f5 tip (orphan)
524 add original_e 524 add original_e
525 branch: default 525 branch: default
526 commit: (clean) 526 commit: (clean)
527 update: 1 new changesets, 2 branch heads (merge) 527 update: 1 new changesets, 2 branch heads (merge)
528 phases: 3 draft 528 phases: 3 draft
529 unstable: 1 changesets 529 orphan: 1 changesets
530 $ hg log -G -r '::unstable()' 530 $ hg log -G -r '::unstable()'
531 @ 5:cda648ca50f5 (draft unstable) [tip ] add original_e 531 @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e
532 | 532 |
533 x 4:94b33453f93b (draft *obsolete*) [ ] add original_d 533 x 4:94b33453f93b (draft *obsolete*) [ ] add original_d
534 | 534 |
535 o 3:6f9641995072 (draft) [ ] add n3w_3_c 535 o 3:6f9641995072 (draft) [ ] add n3w_3_c
536 | 536 |
550 refuse to push unstable changeset 550 refuse to push unstable changeset
551 551
552 $ hg push ../tmpc/ 552 $ hg push ../tmpc/
553 pushing to ../tmpc/ 553 pushing to ../tmpc/
554 searching for changes 554 searching for changes
555 abort: push includes unstable changeset: cda648ca50f5! 555 abort: push includes orphan changeset: cda648ca50f5!
556 [255] 556 [255]
557 557
558 Test that extinct changeset are properly detected 558 Test that extinct changeset are properly detected
559 559
560 $ hg log -r 'extinct()' 560 $ hg log -r 'extinct()'
568 0:1f0dee641bb7 (public) [ ] add a 568 0:1f0dee641bb7 (public) [ ] add a
569 1:7c3bad9141dc (public) [ ] add b 569 1:7c3bad9141dc (public) [ ] add b
570 2:245bde4270cd (public) [ ] add original_c 570 2:245bde4270cd (public) [ ] add original_c
571 3:6f9641995072 (draft) [ ] add n3w_3_c 571 3:6f9641995072 (draft) [ ] add n3w_3_c
572 4:94b33453f93b (draft *obsolete*) [ ] add original_d 572 4:94b33453f93b (draft *obsolete*) [ ] add original_d
573 5:cda648ca50f5 (draft unstable) [tip ] add original_e 573 5:cda648ca50f5 (draft orphan) [tip ] add original_e
574 $ hg push ../tmpf -f # -f because be push unstable too 574 $ hg push ../tmpf -f # -f because be push unstable too
575 pushing to ../tmpf 575 pushing to ../tmpf
576 searching for changes 576 searching for changes
577 adding changesets 577 adding changesets
578 adding manifests 578 adding manifests
589 [1] 589 [1]
590 590
591 Do not warn about new head when the new head is a successors of a remote one 591 Do not warn about new head when the new head is a successors of a remote one
592 592
593 $ hg log -G 593 $ hg log -G
594 @ 5:cda648ca50f5 (draft unstable) [tip ] add original_e 594 @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e
595 | 595 |
596 x 4:94b33453f93b (draft *obsolete*) [ ] add original_d 596 x 4:94b33453f93b (draft *obsolete*) [ ] add original_d
597 | 597 |
598 o 3:6f9641995072 (draft) [ ] add n3w_3_c 598 o 3:6f9641995072 (draft) [ ] add n3w_3_c
599 | 599 |
912 $ hg debugobsolete `getid original_c` `getid babar` 912 $ hg debugobsolete `getid original_c` `getid babar`
913 $ hg log --config ui.logtemplate= -r 'bumped() and unstable()' 913 $ hg log --config ui.logtemplate= -r 'bumped() and unstable()'
914 changeset: 7:50c51b361e60 914 changeset: 7:50c51b361e60
915 user: test 915 user: test
916 date: Thu Jan 01 00:00:00 1970 +0000 916 date: Thu Jan 01 00:00:00 1970 +0000
917 trouble: unstable, bumped 917 instability: orphan, bumped
918 summary: add babar 918 summary: add babar
919 919
920 920
921 test the "obsolete" templatekw 921 test the "obsolete" templatekw
922 922
924 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e 924 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e
925 925
926 test the "troubles" templatekw 926 test the "troubles" templatekw
927 927
928 $ hg log -r 'bumped() and unstable()' 928 $ hg log -r 'bumped() and unstable()'
929 7:50c51b361e60 (draft unstable bumped) [ ] add babar 929 7:50c51b361e60 (draft orphan bumped) [ ] add babar
930 930
931 test the default cmdline template 931 test the default cmdline template
932 932
933 $ hg log -T default -r 'bumped()' 933 $ hg log -T default -r 'bumped()'
934 changeset: 7:50c51b361e60 934 changeset: 7:50c51b361e60
935 user: test 935 user: test
936 date: Thu Jan 01 00:00:00 1970 +0000 936 date: Thu Jan 01 00:00:00 1970 +0000
937 trouble: unstable, bumped 937 trouble: orphan, bumped
938 summary: add babar 938 summary: add babar
939 939
940 $ hg log -T default -r 'obsolete()' 940 $ hg log -T default -r 'obsolete()'
941 changeset: 6:3de5eca88c00 941 changeset: 6:3de5eca88c00
942 parent: 3:6f9641995072 942 parent: 3:6f9641995072
948 test summary output 948 test summary output
949 949
950 $ hg up -r 'bumped() and unstable()' 950 $ hg up -r 'bumped() and unstable()'
951 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 951 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
952 $ hg summary 952 $ hg summary
953 parent: 7:50c51b361e60 (unstable, bumped) 953 parent: 7:50c51b361e60 (orphan, bumped)
954 add babar 954 add babar
955 branch: default 955 branch: default
956 commit: (clean) 956 commit: (clean)
957 update: 2 new changesets (update) 957 update: 2 new changesets (update)
958 phases: 4 draft 958 phases: 4 draft
959 unstable: 2 changesets 959 orphan: 2 changesets
960 bumped: 1 changesets 960 bumped: 1 changesets
961 $ hg up -r 'obsolete()' 961 $ hg up -r 'obsolete()'
962 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 962 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
963 $ hg summary 963 $ hg summary
964 parent: 6:3de5eca88c00 (obsolete) 964 parent: 6:3de5eca88c00 (obsolete)
965 add obsolete_e 965 add obsolete_e
966 branch: default 966 branch: default
967 commit: (clean) 967 commit: (clean)
968 update: 3 new changesets (update) 968 update: 3 new changesets (update)
969 phases: 4 draft 969 phases: 4 draft
970 unstable: 2 changesets 970 orphan: 2 changesets
971 bumped: 1 changesets 971 bumped: 1 changesets
972 972
973 Test incoming/outcoming with changesets obsoleted remotely, known locally 973 Test incoming/outcoming with changesets obsoleted remotely, known locally
974 =============================================================================== 974 ===============================================================================
975 975