Show More
@@ -4992,12 +4992,12 b' def summary(ui, repo, **opts):' | |||||
4992 | ui.status(_('phases: %s\n') % ', '.join(t)) |
|
4992 | ui.status(_('phases: %s\n') % ', '.join(t)) | |
4993 |
|
4993 | |||
4994 | if obsolete.isenabled(repo, obsolete.createmarkersopt): |
|
4994 | if obsolete.isenabled(repo, obsolete.createmarkersopt): | |
4995 | for trouble in ("orphan", "divergent", "bumped"): |
|
4995 | for trouble in ("orphan", "contentdivergent", "bumped"): | |
4996 | numtrouble = len(repo.revs(trouble + "()")) |
|
4996 | numtrouble = len(repo.revs(trouble + "()")) | |
4997 | # We write all the possibilities to ease translation |
|
4997 | # We write all the possibilities to ease translation | |
4998 | troublemsg = { |
|
4998 | troublemsg = { | |
4999 | "orphan": _("orphan: %d changesets"), |
|
4999 | "orphan": _("orphan: %d changesets"), | |
5000 | "divergent": _("content-divergent: %d changesets"), |
|
5000 | "contentdivergent": _("content-divergent: %d changesets"), | |
5001 | "bumped": _("phase-divergent: %d changesets"), |
|
5001 | "bumped": _("phase-divergent: %d changesets"), | |
5002 | } |
|
5002 | } | |
5003 | if numtrouble > 0: |
|
5003 | if numtrouble > 0: |
@@ -711,11 +711,19 b' def destination(repo, subset, x):' | |||||
711 |
|
711 | |||
712 | @predicate('divergent()', safe=True) |
|
712 | @predicate('divergent()', safe=True) | |
713 | def divergent(repo, subset, x): |
|
713 | def divergent(repo, subset, x): | |
|
714 | msg = ("'divergent()' is deprecated, " | |||
|
715 | "use 'contentdivergent()'") | |||
|
716 | repo.ui.deprecwarn(msg, '4.4') | |||
|
717 | ||||
|
718 | return contentdivergent(repo, subset, x) | |||
|
719 | ||||
|
720 | @predicate('contentdivergent()', safe=True) | |||
|
721 | def contentdivergent(repo, subset, x): | |||
714 | """ |
|
722 | """ | |
715 | Final successors of changesets with an alternative set of final successors. |
|
723 | Final successors of changesets with an alternative set of final successors. | |
716 | """ |
|
724 | """ | |
717 | # i18n: "divergent" is a keyword |
|
725 | # i18n: "contentdivergent" is a keyword | |
718 | getargs(x, 0, 0, _("divergent takes no arguments")) |
|
726 | getargs(x, 0, 0, _("contentdivergent takes no arguments")) | |
719 | divergent = obsmod.getrevs(repo, 'divergent') |
|
727 | divergent = obsmod.getrevs(repo, 'divergent') | |
720 | return subset & divergent |
|
728 | return subset & divergent | |
721 |
|
729 |
@@ -80,7 +80,7 b' A_1 have two direct and divergent succes' | |||||
80 | 82623d38b9ba |
|
80 | 82623d38b9ba | |
81 | 392fd25390da |
|
81 | 392fd25390da | |
82 | 392fd25390da |
|
82 | 392fd25390da | |
83 | $ hg log -r 'divergent()' |
|
83 | $ hg log -r 'contentdivergent()' | |
84 | 2:82623d38b9ba A_1 |
|
84 | 2:82623d38b9ba A_1 | |
85 | 3:392fd25390da A_2 |
|
85 | 3:392fd25390da A_2 | |
86 | $ hg debugsuccessorssets 'all()' --closest |
|
86 | $ hg debugsuccessorssets 'all()' --closest | |
@@ -147,7 +147,7 b' indirect divergence with known changeset' | |||||
147 | 01f36c5a8fda |
|
147 | 01f36c5a8fda | |
148 | 01f36c5a8fda |
|
148 | 01f36c5a8fda | |
149 | 01f36c5a8fda |
|
149 | 01f36c5a8fda | |
150 | $ hg log -r 'divergent()' |
|
150 | $ hg log -r 'contentdivergent()' | |
151 | 2:82623d38b9ba A_1 |
|
151 | 2:82623d38b9ba A_1 | |
152 | 4:01f36c5a8fda A_3 |
|
152 | 4:01f36c5a8fda A_3 | |
153 | $ hg debugsuccessorssets 'all()' --closest |
|
153 | $ hg debugsuccessorssets 'all()' --closest | |
@@ -199,7 +199,7 b' indirect divergence with known changeset' | |||||
199 | 82623d38b9ba |
|
199 | 82623d38b9ba | |
200 | 392fd25390da |
|
200 | 392fd25390da | |
201 | 392fd25390da |
|
201 | 392fd25390da | |
202 | $ hg log -r 'divergent()' |
|
202 | $ hg log -r 'contentdivergent()' | |
203 | 2:82623d38b9ba A_1 |
|
203 | 2:82623d38b9ba A_1 | |
204 | 3:392fd25390da A_2 |
|
204 | 3:392fd25390da A_2 | |
205 | $ hg debugsuccessorssets 'all()' --closest |
|
205 | $ hg debugsuccessorssets 'all()' --closest | |
@@ -278,7 +278,7 b' divergence that converge again is not di' | |||||
278 | 01f36c5a8fda |
|
278 | 01f36c5a8fda | |
279 | 01f36c5a8fda |
|
279 | 01f36c5a8fda | |
280 | 01f36c5a8fda |
|
280 | 01f36c5a8fda | |
281 | $ hg log -r 'divergent()' |
|
281 | $ hg log -r 'contentdivergent()' | |
282 | $ hg debugsuccessorssets 'all()' --closest |
|
282 | $ hg debugsuccessorssets 'all()' --closest | |
283 | d20a80d4def3 |
|
283 | d20a80d4def3 | |
284 | d20a80d4def3 |
|
284 | d20a80d4def3 | |
@@ -322,7 +322,7 b' split is not divergences' | |||||
322 | 82623d38b9ba |
|
322 | 82623d38b9ba | |
323 | 392fd25390da |
|
323 | 392fd25390da | |
324 | 392fd25390da |
|
324 | 392fd25390da | |
325 | $ hg log -r 'divergent()' |
|
325 | $ hg log -r 'contentdivergent()' | |
326 | $ hg debugsuccessorssets 'all()' --closest |
|
326 | $ hg debugsuccessorssets 'all()' --closest | |
327 | d20a80d4def3 |
|
327 | d20a80d4def3 | |
328 | d20a80d4def3 |
|
328 | d20a80d4def3 | |
@@ -410,7 +410,7 b' Even when subsequent rewriting happen' | |||||
410 | e442cfc57690 |
|
410 | e442cfc57690 | |
411 | e442cfc57690 |
|
411 | e442cfc57690 | |
412 | e442cfc57690 |
|
412 | e442cfc57690 | |
413 | $ hg log -r 'divergent()' |
|
413 | $ hg log -r 'contentdivergent()' | |
414 |
|
414 | |||
415 | Check more complex obsolescence graft (with divergence) |
|
415 | Check more complex obsolescence graft (with divergence) | |
416 |
|
416 | |||
@@ -515,7 +515,7 b' Check more complex obsolescence graft (w' | |||||
515 | 14608b260df8 |
|
515 | 14608b260df8 | |
516 | bed64f5d2f5a |
|
516 | bed64f5d2f5a | |
517 | bed64f5d2f5a |
|
517 | bed64f5d2f5a | |
518 | $ hg log -r 'divergent()' |
|
518 | $ hg log -r 'contentdivergent()' | |
519 | 4:01f36c5a8fda A_3 |
|
519 | 4:01f36c5a8fda A_3 | |
520 | 8:7ae126973a96 A_7 |
|
520 | 8:7ae126973a96 A_7 | |
521 | 9:14608b260df8 A_8 |
|
521 | 9:14608b260df8 A_8 | |
@@ -614,7 +614,7 b' fix the divergence' | |||||
614 | a139f71be9da |
|
614 | a139f71be9da | |
615 | a139f71be9da |
|
615 | a139f71be9da | |
616 | a139f71be9da |
|
616 | a139f71be9da | |
617 | $ hg log -r 'divergent()' |
|
617 | $ hg log -r 'contentdivergent()' | |
618 |
|
618 | |||
619 | $ cd .. |
|
619 | $ cd .. | |
620 |
|
620 |
@@ -215,7 +215,7 b' More complex case where part of the reba' | |||||
215 | 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob) |
|
215 | 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob) | |
216 | 8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 (*) {'user': 'test'} (glob) |
|
216 | 8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 (*) {'user': 'test'} (glob) | |
217 | 5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 (*) {'user': 'test'} (glob) |
|
217 | 5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 (*) {'user': 'test'} (glob) | |
218 | $ hg log --rev 'divergent()' |
|
218 | $ hg log --rev 'contentdivergent()' | |
219 | $ hg log -G |
|
219 | $ hg log -G | |
220 | o 13:98f6af4ee953 C |
|
220 | o 13:98f6af4ee953 C | |
221 | | |
|
221 | | |
@@ -4504,10 +4504,10 b' Test obsstore related revsets' | |||||
4504 | E |
|
4504 | E | |
4505 | G |
|
4505 | G | |
4506 |
|
4506 | |||
4507 | $ hg log -r 'successors(B+A)-divergent()' -T '{desc}\n' |
|
4507 | $ hg log -r 'successors(B+A)-contentdivergent()' -T '{desc}\n' | |
4508 | A |
|
4508 | A | |
4509 | Z |
|
4509 | Z | |
4510 | B |
|
4510 | B | |
4511 |
|
4511 | |||
4512 | $ hg log -r 'successors(B+A)-divergent()-obsolete()' -T '{desc}\n' |
|
4512 | $ hg log -r 'successors(B+A)-contentdivergent()-obsolete()' -T '{desc}\n' | |
4513 | Z |
|
4513 | Z |
General Comments 0
You need to be logged in to leave comments.
Login now