Show More
@@ -4941,7 +4941,7 b' def summary(ui, repo, **opts):' | |||
|
4941 | 4941 | numtrouble = len(repo.revs(trouble + "()")) |
|
4942 | 4942 | # We write all the possibilities to ease translation |
|
4943 | 4943 | troublemsg = { |
|
4944 |
"unstable": _(" |
|
|
4944 | "unstable": _("orphan: %d changesets"), | |
|
4945 | 4945 | "divergent": _("divergent: %d changesets"), |
|
4946 | 4946 | "bumped": _("bumped: %d changesets"), |
|
4947 | 4947 | } |
@@ -229,13 +229,13 b' class basectx(object):' | |||
|
229 | 229 | """return the list of troubles affecting this changesets. |
|
230 | 230 | |
|
231 | 231 | Troubles are returned as strings. possible values are: |
|
232 |
- |
|
|
232 | - orphan, | |
|
233 | 233 | - bumped, |
|
234 | 234 | - divergent. |
|
235 | 235 | """ |
|
236 | 236 | troubles = [] |
|
237 | 237 | if self.unstable(): |
|
238 |
troubles.append(' |
|
|
238 | troubles.append('orphan') | |
|
239 | 239 | if self.bumped(): |
|
240 | 240 | troubles.append('bumped') |
|
241 | 241 | if self.divergent(): |
@@ -677,7 +677,7 b' def _pushcheckoutgoing(pushop):' | |||
|
677 | 677 | if unfi.obsstore: |
|
678 | 678 | # this message are here for 80 char limit reason |
|
679 | 679 | mso = _("push includes obsolete changeset: %s!") |
|
680 |
mst = {" |
|
|
680 | mst = {"orphan": _("push includes orphan changeset: %s!"), | |
|
681 | 681 | "bumped": _("push includes bumped changeset: %s!"), |
|
682 | 682 | "divergent": _("push includes divergent changeset: %s!")} |
|
683 | 683 | # If we are to push if there is at least one |
@@ -610,7 +610,7 b' Test that rewriting leaving instability ' | |||
|
610 | 610 | parent: 11:3334b7925910 |
|
611 | 611 | user: test |
|
612 | 612 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
613 |
instability: |
|
|
613 | instability: orphan | |
|
614 | 614 | summary: babar |
|
615 | 615 | |
|
616 | 616 |
@@ -1099,7 +1099,7 b' Diverge one of the splitted commit' | |||
|
1099 | 1099 | | o changeset: 7:ba2ed02b0c9a |
|
1100 | 1100 | | | user: test |
|
1101 | 1101 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1102 |
| | instability: |
|
|
1102 | | | instability: orphan, divergent | |
|
1103 | 1103 | | | summary: Add A,B,C |
|
1104 | 1104 | | | |
|
1105 | 1105 | | x changeset: 6:4a004186e638 |
@@ -520,15 +520,15 b' detect outgoing obsolete and unstable' | |||
|
520 | 520 | $ hg log -r 'obsolete()' |
|
521 | 521 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d |
|
522 | 522 | $ hg summary |
|
523 |
parent: 5:cda648ca50f5 tip ( |
|
|
523 | parent: 5:cda648ca50f5 tip (orphan) | |
|
524 | 524 | add original_e |
|
525 | 525 | branch: default |
|
526 | 526 | commit: (clean) |
|
527 | 527 | update: 1 new changesets, 2 branch heads (merge) |
|
528 | 528 | phases: 3 draft |
|
529 |
|
|
|
529 | orphan: 1 changesets | |
|
530 | 530 | $ hg log -G -r '::unstable()' |
|
531 |
@ 5:cda648ca50f5 (draft |
|
|
531 | @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e | |
|
532 | 532 | | |
|
533 | 533 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d |
|
534 | 534 | | |
@@ -552,7 +552,7 b' refuse to push unstable changeset' | |||
|
552 | 552 | $ hg push ../tmpc/ |
|
553 | 553 | pushing to ../tmpc/ |
|
554 | 554 | searching for changes |
|
555 |
abort: push includes |
|
|
555 | abort: push includes orphan changeset: cda648ca50f5! | |
|
556 | 556 | [255] |
|
557 | 557 | |
|
558 | 558 | Test that extinct changeset are properly detected |
@@ -570,7 +570,7 b" Don't try to push extinct changeset" | |||
|
570 | 570 | 2:245bde4270cd (public) [ ] add original_c |
|
571 | 571 | 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
572 | 572 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d |
|
573 |
5:cda648ca50f5 (draft |
|
|
573 | 5:cda648ca50f5 (draft orphan) [tip ] add original_e | |
|
574 | 574 | $ hg push ../tmpf -f # -f because be push unstable too |
|
575 | 575 | pushing to ../tmpf |
|
576 | 576 | searching for changes |
@@ -591,7 +591,7 b' no warning displayed' | |||
|
591 | 591 | Do not warn about new head when the new head is a successors of a remote one |
|
592 | 592 | |
|
593 | 593 | $ hg log -G |
|
594 |
@ 5:cda648ca50f5 (draft |
|
|
594 | @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e | |
|
595 | 595 | | |
|
596 | 596 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d |
|
597 | 597 | | |
@@ -914,7 +914,7 b' Several troubles on the same changeset (' | |||
|
914 | 914 | changeset: 7:50c51b361e60 |
|
915 | 915 | user: test |
|
916 | 916 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
917 | trouble: unstable, bumped | |
|
917 | instability: orphan, bumped | |
|
918 | 918 | summary: add babar |
|
919 | 919 | |
|
920 | 920 | |
@@ -926,7 +926,7 b' test the "obsolete" templatekw' | |||
|
926 | 926 | test the "troubles" templatekw |
|
927 | 927 | |
|
928 | 928 | $ hg log -r 'bumped() and unstable()' |
|
929 |
7:50c51b361e60 (draft |
|
|
929 | 7:50c51b361e60 (draft orphan bumped) [ ] add babar | |
|
930 | 930 | |
|
931 | 931 | test the default cmdline template |
|
932 | 932 | |
@@ -934,7 +934,7 b' test the default cmdline template' | |||
|
934 | 934 | changeset: 7:50c51b361e60 |
|
935 | 935 | user: test |
|
936 | 936 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
937 |
trouble: |
|
|
937 | trouble: orphan, bumped | |
|
938 | 938 | summary: add babar |
|
939 | 939 | |
|
940 | 940 | $ hg log -T default -r 'obsolete()' |
@@ -950,13 +950,13 b' test summary output' | |||
|
950 | 950 | $ hg up -r 'bumped() and unstable()' |
|
951 | 951 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
952 | 952 | $ hg summary |
|
953 |
parent: 7:50c51b361e60 ( |
|
|
953 | parent: 7:50c51b361e60 (orphan, bumped) | |
|
954 | 954 | add babar |
|
955 | 955 | branch: default |
|
956 | 956 | commit: (clean) |
|
957 | 957 | update: 2 new changesets (update) |
|
958 | 958 | phases: 4 draft |
|
959 |
|
|
|
959 | orphan: 2 changesets | |
|
960 | 960 | bumped: 1 changesets |
|
961 | 961 | $ hg up -r 'obsolete()' |
|
962 | 962 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -967,7 +967,7 b' test summary output' | |||
|
967 | 967 | commit: (clean) |
|
968 | 968 | update: 3 new changesets (update) |
|
969 | 969 | phases: 4 draft |
|
970 |
|
|
|
970 | orphan: 2 changesets | |
|
971 | 971 | bumped: 1 changesets |
|
972 | 972 | |
|
973 | 973 | Test incoming/outcoming with changesets obsoleted remotely, known locally |
@@ -793,13 +793,13 b' If a rebase is going to create divergenc' | |||
|
793 | 793 | o 0:4a2df7238c3b A |
|
794 | 794 | |
|
795 | 795 | $ hg summary |
|
796 |
parent: 15:73568ab6879d tip ( |
|
|
796 | parent: 15:73568ab6879d tip (orphan) | |
|
797 | 797 | bar foo |
|
798 | 798 | branch: default |
|
799 | 799 | commit: (clean) |
|
800 | 800 | update: 2 new changesets, 3 branch heads (merge) |
|
801 | 801 | phases: 8 draft |
|
802 |
|
|
|
802 | orphan: 1 changesets | |
|
803 | 803 | $ hg rebase -s 10 -d 12 |
|
804 | 804 | abort: this rebase will cause divergences from: 121d9e3bc4c6 |
|
805 | 805 | (to force the rebase please set experimental.allowdivergence=True) |
General Comments 0
You need to be logged in to leave comments.
Login now