Show More
@@ -4992,13 +4992,13 b' def summary(ui, repo, **opts):' | |||
|
4992 | 4992 | ui.status(_('phases: %s\n') % ', '.join(t)) |
|
4993 | 4993 | |
|
4994 | 4994 | if obsolete.isenabled(repo, obsolete.createmarkersopt): |
|
4995 |
for trouble in ("orphan", "contentdivergent", " |
|
|
4995 | for trouble in ("orphan", "contentdivergent", "phasedivergent"): | |
|
4996 | 4996 | numtrouble = len(repo.revs(trouble + "()")) |
|
4997 | 4997 | # We write all the possibilities to ease translation |
|
4998 | 4998 | troublemsg = { |
|
4999 | 4999 | "orphan": _("orphan: %d changesets"), |
|
5000 | 5000 | "contentdivergent": _("content-divergent: %d changesets"), |
|
5001 |
" |
|
|
5001 | "phasedivergent": _("phase-divergent: %d changesets"), | |
|
5002 | 5002 | } |
|
5003 | 5003 | if numtrouble > 0: |
|
5004 | 5004 | ui.status(troublemsg[trouble] % numtrouble + "\n") |
@@ -459,12 +459,20 b' def branch(repo, subset, x):' | |||
|
459 | 459 | |
|
460 | 460 | @predicate('bumped()', safe=True) |
|
461 | 461 | def bumped(repo, subset, x): |
|
462 | msg = ("'bumped()' is deprecated, " | |
|
463 | "use 'phasedivergent()'") | |
|
464 | repo.ui.deprecwarn(msg, '4.4') | |
|
465 | ||
|
466 | return phasedivergent(repo, subset, x) | |
|
467 | ||
|
468 | @predicate('phasedivergent()', safe=True) | |
|
469 | def phasedivergent(repo, subset, x): | |
|
462 | 470 | """Mutable changesets marked as successors of public changesets. |
|
463 | 471 | |
|
464 |
Only non-public and non-obsolete changesets can be ` |
|
|
472 | Only non-public and non-obsolete changesets can be `phasedivergent`. | |
|
465 | 473 | """ |
|
466 |
# i18n: " |
|
|
467 |
getargs(x, 0, 0, _(" |
|
|
474 | # i18n: "phasedivergent" is a keyword | |
|
475 | getargs(x, 0, 0, _("phasedivergent takes no arguments")) | |
|
468 | 476 | bumped = obsmod.getrevs(repo, 'bumped') |
|
469 | 477 | return subset & bumped |
|
470 | 478 |
@@ -223,7 +223,7 b" If we didn't filtered obsolete changeset" | |||
|
223 | 223 | note that the bumped changeset (5:5601fb93a350) is not a direct successor of |
|
224 | 224 | the public changeset |
|
225 | 225 | |
|
226 |
$ hg log --hidden -r ' |
|
|
226 | $ hg log --hidden -r 'phasedivergent()' | |
|
227 | 227 | 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c |
|
228 | 228 | |
|
229 | 229 | And that we can't push bumped changeset |
@@ -261,7 +261,7 b' We need to create a clone of 5 and add a' | |||
|
261 | 261 | created new head |
|
262 | 262 | $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` |
|
263 | 263 | obsoleted 1 changesets |
|
264 |
$ hg log -r ' |
|
|
264 | $ hg log -r 'phasedivergent()' | |
|
265 | 265 | $ hg log -G |
|
266 | 266 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
267 | 267 | | |
@@ -910,7 +910,7 b' Several troubles on the same changeset (' | |||
|
910 | 910 | $ hg debugobsolete `getid obsolete_e` |
|
911 | 911 | obsoleted 1 changesets |
|
912 | 912 | $ hg debugobsolete `getid original_c` `getid babar` |
|
913 |
$ hg log --config ui.logtemplate= -r ' |
|
|
913 | $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()' | |
|
914 | 914 | changeset: 7:50c51b361e60 |
|
915 | 915 | user: test |
|
916 | 916 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -925,12 +925,12 b' test the "obsolete" templatekw' | |||
|
925 | 925 | |
|
926 | 926 | test the "troubles" templatekw |
|
927 | 927 | |
|
928 |
$ hg log -r ' |
|
|
928 | $ hg log -r 'phasedivergent() and orphan()' | |
|
929 | 929 | 7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar |
|
930 | 930 | |
|
931 | 931 | test the default cmdline template |
|
932 | 932 | |
|
933 |
$ hg log -T default -r ' |
|
|
933 | $ hg log -T default -r 'phasedivergent()' | |
|
934 | 934 | changeset: 7:50c51b361e60 |
|
935 | 935 | user: test |
|
936 | 936 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -947,7 +947,7 b' test the default cmdline template' | |||
|
947 | 947 | |
|
948 | 948 | test summary output |
|
949 | 949 | |
|
950 |
$ hg up -r ' |
|
|
950 | $ hg up -r 'phasedivergent() and orphan()' | |
|
951 | 951 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
952 | 952 | $ hg summary |
|
953 | 953 | parent: 7:50c51b361e60 (orphan, phase-divergent) |
General Comments 0
You need to be logged in to leave comments.
Login now