Show More
@@ -4943,7 +4943,7 b' def summary(ui, repo, **opts):' | |||||
4943 | troublemsg = { |
|
4943 | troublemsg = { | |
4944 | "unstable": _("orphan: %d changesets"), |
|
4944 | "unstable": _("orphan: %d changesets"), | |
4945 | "divergent": _("content-divergent: %d changesets"), |
|
4945 | "divergent": _("content-divergent: %d changesets"), | |
4946 |
"bumped": _(" |
|
4946 | "bumped": _("phase-divergent: %d changesets"), | |
4947 | } |
|
4947 | } | |
4948 | if numtrouble > 0: |
|
4948 | if numtrouble > 0: | |
4949 | ui.status(troublemsg[trouble] % numtrouble + "\n") |
|
4949 | ui.status(troublemsg[trouble] % numtrouble + "\n") |
@@ -230,14 +230,14 b' class basectx(object):' | |||||
230 |
|
230 | |||
231 | Troubles are returned as strings. possible values are: |
|
231 | Troubles are returned as strings. possible values are: | |
232 | - orphan, |
|
232 | - orphan, | |
233 |
- |
|
233 | - phase-divergent, | |
234 | - content-divergent. |
|
234 | - content-divergent. | |
235 | """ |
|
235 | """ | |
236 | troubles = [] |
|
236 | troubles = [] | |
237 | if self.unstable(): |
|
237 | if self.unstable(): | |
238 | troubles.append('orphan') |
|
238 | troubles.append('orphan') | |
239 | if self.bumped(): |
|
239 | if self.bumped(): | |
240 |
troubles.append(' |
|
240 | troubles.append('phase-divergent') | |
241 | if self.divergent(): |
|
241 | if self.divergent(): | |
242 | troubles.append('content-divergent') |
|
242 | troubles.append('content-divergent') | |
243 | return troubles |
|
243 | return troubles |
@@ -677,9 +677,10 b' def _pushcheckoutgoing(pushop):' | |||||
677 | if unfi.obsstore: |
|
677 | if unfi.obsstore: | |
678 | # this message are here for 80 char limit reason |
|
678 | # this message are here for 80 char limit reason | |
679 | mso = _("push includes obsolete changeset: %s!") |
|
679 | mso = _("push includes obsolete changeset: %s!") | |
|
680 | mspd = _("push includes phase-divergent changeset: %s!") | |||
680 | mscd = _("push includes content-divergent changeset: %s!") |
|
681 | mscd = _("push includes content-divergent changeset: %s!") | |
681 | mst = {"orphan": _("push includes orphan changeset: %s!"), |
|
682 | mst = {"orphan": _("push includes orphan changeset: %s!"), | |
682 | "bumped": _("push includes bumped changeset: %s!"), |
|
683 | "phase-divergent": mspd, | |
683 | "content-divergent": mscd} |
|
684 | "content-divergent": mscd} | |
684 | # If we are to push if there is at least one |
|
685 | # If we are to push if there is at least one | |
685 | # obsolete or unstable changeset in missing, at |
|
686 | # obsolete or unstable changeset in missing, at |
@@ -207,7 +207,7 b' Check that public changeset are not acco' | |||||
207 |
|
207 | |||
208 | $ hg --hidden phase --public 2 |
|
208 | $ hg --hidden phase --public 2 | |
209 | $ hg log -G |
|
209 | $ hg log -G | |
210 |
@ 5:5601fb93a350 (draft |
|
210 | @ 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c | |
211 | | |
|
211 | | | |
212 | | o 2:245bde4270cd (public) [ ] add original_c |
|
212 | | o 2:245bde4270cd (public) [ ] add original_c | |
213 | |/ |
|
213 | |/ | |
@@ -224,7 +224,7 b' note that the bumped changeset (5:5601fb' | |||||
224 | the public changeset |
|
224 | the public changeset | |
225 |
|
225 | |||
226 | $ hg log --hidden -r 'bumped()' |
|
226 | $ hg log --hidden -r 'bumped()' | |
227 |
5:5601fb93a350 (draft |
|
227 | 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c | |
228 |
|
228 | |||
229 | And that we can't push bumped changeset |
|
229 | And that we can't push bumped changeset | |
230 |
|
230 | |||
@@ -239,20 +239,20 b" And that we can't push bumped changeset" | |||||
239 | $ hg push ../tmpa |
|
239 | $ hg push ../tmpa | |
240 | pushing to ../tmpa |
|
240 | pushing to ../tmpa | |
241 | searching for changes |
|
241 | searching for changes | |
242 |
abort: push includes |
|
242 | abort: push includes phase-divergent changeset: 5601fb93a350! | |
243 | [255] |
|
243 | [255] | |
244 |
|
244 | |||
245 | Fixing "bumped" situation |
|
245 | Fixing "bumped" situation | |
246 | We need to create a clone of 5 and add a special marker with a flag |
|
246 | We need to create a clone of 5 and add a special marker with a flag | |
247 |
|
247 | |||
248 | $ hg summary |
|
248 | $ hg summary | |
249 |
parent: 5:5601fb93a350 tip ( |
|
249 | parent: 5:5601fb93a350 tip (phase-divergent) | |
250 | add new_3_c |
|
250 | add new_3_c | |
251 | branch: default |
|
251 | branch: default | |
252 | commit: (clean) |
|
252 | commit: (clean) | |
253 | update: 1 new changesets, 2 branch heads (merge) |
|
253 | update: 1 new changesets, 2 branch heads (merge) | |
254 | phases: 1 draft |
|
254 | phases: 1 draft | |
255 |
|
|
255 | phase-divergent: 1 changesets | |
256 | $ hg up '5^' |
|
256 | $ hg up '5^' | |
257 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
257 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
258 | $ hg revert -ar 5 |
|
258 | $ hg revert -ar 5 | |
@@ -914,7 +914,7 b' Several troubles on the same changeset (' | |||||
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 |
instability: orphan, |
|
917 | instability: orphan, phase-divergent | |
918 | summary: add babar |
|
918 | summary: add babar | |
919 |
|
919 | |||
920 |
|
920 | |||
@@ -926,7 +926,7 b' test the "obsolete" templatekw' | |||||
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 orphan |
|
929 | 7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar | |
930 |
|
930 | |||
931 | test the default cmdline template |
|
931 | test the default cmdline template | |
932 |
|
932 | |||
@@ -934,7 +934,7 b' test the default cmdline template' | |||||
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: orphan, |
|
937 | trouble: orphan, phase-divergent | |
938 | summary: add babar |
|
938 | summary: add babar | |
939 |
|
939 | |||
940 | $ hg log -T default -r 'obsolete()' |
|
940 | $ hg log -T default -r 'obsolete()' | |
@@ -950,14 +950,14 b' test summary output' | |||||
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 (orphan, |
|
953 | parent: 7:50c51b361e60 (orphan, phase-divergent) | |
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 | orphan: 2 changesets |
|
959 | orphan: 2 changesets | |
960 |
|
|
960 | phase-divergent: 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 | |
@@ -968,7 +968,7 b' test summary output' | |||||
968 | update: 3 new changesets (update) |
|
968 | update: 3 new changesets (update) | |
969 | phases: 4 draft |
|
969 | phases: 4 draft | |
970 | orphan: 2 changesets |
|
970 | orphan: 2 changesets | |
971 |
|
|
971 | phase-divergent: 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 | =============================================================================== |
General Comments 0
You need to be logged in to leave comments.
Login now