Show More
@@ -567,3 +567,18 b' def successorssets(repo, initialnode, cl' | |||||
567 | final.reverse() # put small successors set first |
|
567 | final.reverse() # put small successors set first | |
568 | cache[current] = final |
|
568 | cache[current] = final | |
569 | return cache[initialnode] |
|
569 | return cache[initialnode] | |
|
570 | ||||
|
571 | def successorsandmarkers(repo, ctx): | |||
|
572 | """compute the raw data needed for computing obsfate | |||
|
573 | Returns a list of dict, one dict per successors set | |||
|
574 | """ | |||
|
575 | if not ctx.obsolete(): | |||
|
576 | return None | |||
|
577 | ||||
|
578 | ssets = successorssets(repo, ctx.node(), closest=True) | |||
|
579 | ||||
|
580 | values = [] | |||
|
581 | for sset in ssets: | |||
|
582 | values.append({'successors': sset, 'markers': sset.markers}) | |||
|
583 | ||||
|
584 | return values |
@@ -674,6 +674,48 b' def showsuccessorssets(repo, ctx, **args' | |||||
674 | return _hybrid(gen(data), data, lambda x: {'successorset': x}, |
|
674 | return _hybrid(gen(data), data, lambda x: {'successorset': x}, | |
675 | lambda d: d["successorset"]) |
|
675 | lambda d: d["successorset"]) | |
676 |
|
676 | |||
|
677 | @templatekeyword("succsandmarkers") | |||
|
678 | def showsuccsandmarkers(repo, ctx, **args): | |||
|
679 | """Returns a list of dict for each final successor of ctx. | |||
|
680 | ||||
|
681 | The dict contains successors node id in "successors" keys and the list of | |||
|
682 | obs-markers from ctx to the set of successors in "markers" | |||
|
683 | ||||
|
684 | (EXPERIMENTAL) | |||
|
685 | """ | |||
|
686 | ||||
|
687 | values = obsutil.successorsandmarkers(repo, ctx) | |||
|
688 | ||||
|
689 | if values is None: | |||
|
690 | values = [] | |||
|
691 | ||||
|
692 | # Format successors and markers to avoid exposing binary to templates | |||
|
693 | data = [] | |||
|
694 | for i in values: | |||
|
695 | # Format successors | |||
|
696 | successors = i['successors'] | |||
|
697 | ||||
|
698 | successors = [hex(n) for n in successors] | |||
|
699 | successors = _hybrid(None, successors, | |||
|
700 | lambda x: {'ctx': repo[x], 'revcache': {}}, | |||
|
701 | lambda d: _formatrevnode(d['ctx'])) | |||
|
702 | ||||
|
703 | # Format markers | |||
|
704 | finalmarkers = [] | |||
|
705 | for m in i['markers']: | |||
|
706 | hexprec = hex(m[0]) | |||
|
707 | hexsucs = tuple(hex(n) for n in m[1]) | |||
|
708 | hexparents = None | |||
|
709 | if m[5] is not None: | |||
|
710 | hexparents = tuple(hex(n) for n in m[5]) | |||
|
711 | newmarker = (hexprec, hexsucs) + m[2:5] + (hexparents,) + m[6:] | |||
|
712 | finalmarkers.append(newmarker) | |||
|
713 | ||||
|
714 | data.append({'successors': successors, 'markers': finalmarkers}) | |||
|
715 | ||||
|
716 | f = _showlist('succsandmarkers', data, args) | |||
|
717 | return _hybrid(f, data, lambda x: x, lambda d: d) | |||
|
718 | ||||
677 | @templatekeyword('p1rev') |
|
719 | @templatekeyword('p1rev') | |
678 | def showp1rev(repo, ctx, templ, **args): |
|
720 | def showp1rev(repo, ctx, templ, **args): | |
679 | """Integer. The repository-local revision number of the changeset's |
|
721 | """Integer. The repository-local revision number of the changeset's |
@@ -11,6 +11,9 b' Global setup' | |||||
11 | > publish=False |
|
11 | > publish=False | |
12 | > [experimental] |
|
12 | > [experimental] | |
13 | > stabilization=all |
|
13 | > stabilization=all | |
|
14 | > [templates] | |||
|
15 | > obsfatesuccessors = " as {join(successors, ", ")}" | |||
|
16 | > obsfate = "rewritten{obsfatesuccessors}; " | |||
14 | > [alias] |
|
17 | > [alias] | |
15 | > tlog = log -G -T '{node|short}\ |
|
18 | > tlog = log -G -T '{node|short}\ | |
16 | > {if(predecessors, "\n Predecessors: {predecessors}")}\ |
|
19 | > {if(predecessors, "\n Predecessors: {predecessors}")}\ | |
@@ -20,6 +23,8 b' Global setup' | |||||
20 | > {if(successorssets, "\n Successors: {successorssets}")}\ |
|
23 | > {if(successorssets, "\n Successors: {successorssets}")}\ | |
21 | > {if(successorssets, "\n multi-line: {join(successorssets, "\n multi-line: ")}")}\ |
|
24 | > {if(successorssets, "\n multi-line: {join(successorssets, "\n multi-line: ")}")}\ | |
22 | > {if(successorssets, "\n json: {successorssets|json}")}\n' |
|
25 | > {if(successorssets, "\n json: {successorssets|json}")}\n' | |
|
26 | > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers % "{obsfate}"} \n" )}' | |||
|
27 | > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers|json}\n")}' | |||
23 | > EOF |
|
28 | > EOF | |
24 |
|
29 | |||
25 | Test templates on amended commit |
|
30 | Test templates on amended commit | |
@@ -33,8 +38,8 b' Test setup' | |||||
33 | $ mkcommit ROOT |
|
38 | $ mkcommit ROOT | |
34 | $ mkcommit A0 |
|
39 | $ mkcommit A0 | |
35 | $ echo 42 >> A0 |
|
40 | $ echo 42 >> A0 | |
36 | $ hg commit --amend -m "A1" |
|
41 | $ HGUSER=test1 hg commit --amend -m "A1" --config devel.default-date="1234567890 0" | |
37 | $ hg commit --amend -m "A2" |
|
42 | $ HGUSER=test2 hg commit --amend -m "A2" --config devel.default-date="987654321 0" | |
38 |
|
43 | |||
39 |
$ |
|
44 | $ hg log --hidden -G | |
40 | @ changeset: 4:d004c8f274b9 |
|
45 | @ changeset: 4:d004c8f274b9 | |
@@ -83,6 +88,27 b' Predecessors template should show curren' | |||||
83 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
|
88 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] | |
84 | o ea207398892e |
|
89 | o ea207398892e | |
85 |
|
90 | |||
|
91 | $ hg fatelog -q --traceback | |||
|
92 | o d004c8f274b9 | |||
|
93 | | | |||
|
94 | | @ 471f378eab4c | |||
|
95 | |/ Obsfate: rewritten as 4:d004c8f274b9; | |||
|
96 | o ea207398892e | |||
|
97 | ||||
|
98 | $ hg fatelog | |||
|
99 | o d004c8f274b9 | |||
|
100 | | | |||
|
101 | | @ 471f378eab4c | |||
|
102 | |/ Obsfate: rewritten as 4:d004c8f274b9; | |||
|
103 | o ea207398892e | |||
|
104 | ||||
|
105 | $ hg fatelog -v | |||
|
106 | o d004c8f274b9 | |||
|
107 | | | |||
|
108 | | @ 471f378eab4c | |||
|
109 | |/ Obsfate: rewritten as 4:d004c8f274b9; | |||
|
110 | o ea207398892e | |||
|
111 | ||||
86 | $ hg up 'desc(A1)' --hidden |
|
112 | $ hg up 'desc(A1)' --hidden | |
87 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
113 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
88 |
|
114 | |||
@@ -99,6 +125,13 b' Predecessors template should show curren' | |||||
99 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
|
125 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] | |
100 | o ea207398892e |
|
126 | o ea207398892e | |
101 |
|
127 | |||
|
128 | $ hg fatelog -v | |||
|
129 | o d004c8f274b9 | |||
|
130 | | | |||
|
131 | | @ a468dc9b3633 | |||
|
132 | |/ Obsfate: rewritten as 4:d004c8f274b9; | |||
|
133 | o ea207398892e | |||
|
134 | ||||
102 | Predecessors template should show all the predecessors as we force their display |
|
135 | Predecessors template should show all the predecessors as we force their display | |
103 | with --hidden |
|
136 | with --hidden | |
104 | $ hg tlog --hidden |
|
137 | $ hg tlog --hidden | |
@@ -123,6 +156,17 b' with --hidden' | |||||
123 | | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
|
156 | | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] | |
124 | o ea207398892e |
|
157 | o ea207398892e | |
125 |
|
158 | |||
|
159 | $ hg fatelog --hidden -q | |||
|
160 | o d004c8f274b9 | |||
|
161 | | | |||
|
162 | | @ a468dc9b3633 | |||
|
163 | |/ Obsfate: rewritten as 4:d004c8f274b9; | |||
|
164 | | x f137d23bb3e1 | |||
|
165 | | | | |||
|
166 | | x 471f378eab4c | |||
|
167 | |/ Obsfate: rewritten as 3:a468dc9b3633; | |||
|
168 | o ea207398892e | |||
|
169 | ||||
126 |
|
170 | |||
127 | Predecessors template shouldn't show anything as all obsolete commit are not |
|
171 | Predecessors template shouldn't show anything as all obsolete commit are not | |
128 | visible. |
|
172 | visible. | |
@@ -155,7 +199,35 b' visible.' | |||||
155 | | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
|
199 | | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] | |
156 | o ea207398892e |
|
200 | o ea207398892e | |
157 |
|
201 | |||
|
202 | $ hg fatelog -v | |||
|
203 | @ d004c8f274b9 | |||
|
204 | | | |||
|
205 | o ea207398892e | |||
|
206 | ||||
158 |
|
207 | |||
|
208 | $ hg fatelog -v --hidden | |||
|
209 | @ d004c8f274b9 | |||
|
210 | | | |||
|
211 | | x a468dc9b3633 | |||
|
212 | |/ Obsfate: rewritten as 4:d004c8f274b9; | |||
|
213 | | x f137d23bb3e1 | |||
|
214 | | | | |||
|
215 | | x 471f378eab4c | |||
|
216 | |/ Obsfate: rewritten as 3:a468dc9b3633; | |||
|
217 | o ea207398892e | |||
|
218 | ||||
|
219 | ||||
|
220 | $ hg fatelogjson --hidden | |||
|
221 | @ d004c8f274b9 | |||
|
222 | | | |||
|
223 | | x a468dc9b3633 | |||
|
224 | |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}] | |||
|
225 | | x f137d23bb3e1 | |||
|
226 | | | | |||
|
227 | | x 471f378eab4c | |||
|
228 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["user", "test1"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}] | |||
|
229 | o ea207398892e | |||
|
230 | ||||
159 | Test templates with splitted commit |
|
231 | Test templates with splitted commit | |
160 | =================================== |
|
232 | =================================== | |
161 |
|
233 | |||
@@ -239,6 +311,16 b' Predecessors template should show curren' | |||||
239 | | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] |
|
311 | | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] | |
240 | o ea207398892e |
|
312 | o ea207398892e | |
241 |
|
313 | |||
|
314 | ||||
|
315 | $ hg fatelog | |||
|
316 | o f257fde29c7a | |||
|
317 | | | |||
|
318 | o 337fec4d2edc | |||
|
319 | | | |||
|
320 | | @ 471597cad322 | |||
|
321 | |/ Obsfate: rewritten as 2:337fec4d2edc, 3:f257fde29c7a; | |||
|
322 | o ea207398892e | |||
|
323 | ||||
242 | $ hg up f257fde29c7a |
|
324 | $ hg up f257fde29c7a | |
243 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
325 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
244 |
|
326 | |||
@@ -270,6 +352,25 b' with --hidden' | |||||
270 | | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] |
|
352 | | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] | |
271 | o ea207398892e |
|
353 | o ea207398892e | |
272 |
|
354 | |||
|
355 | ||||
|
356 | $ hg fatelog --hidden | |||
|
357 | @ f257fde29c7a | |||
|
358 | | | |||
|
359 | o 337fec4d2edc | |||
|
360 | | | |||
|
361 | | x 471597cad322 | |||
|
362 | |/ Obsfate: rewritten as 2:337fec4d2edc, 3:f257fde29c7a; | |||
|
363 | o ea207398892e | |||
|
364 | ||||
|
365 | $ hg fatelogjson --hidden | |||
|
366 | @ f257fde29c7a | |||
|
367 | | | |||
|
368 | o 337fec4d2edc | |||
|
369 | | | |||
|
370 | | x 471597cad322 | |||
|
371 | |/ Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}] | |||
|
372 | o ea207398892e | |||
|
373 | ||||
273 | Test templates with folded commit |
|
374 | Test templates with folded commit | |
274 | ================================= |
|
375 | ================================= | |
275 |
|
376 | |||
@@ -354,6 +455,14 b' Predecessors template should show curren' | |||||
354 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
455 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
355 | o ea207398892e |
|
456 | o ea207398892e | |
356 |
|
457 | |||
|
458 | ||||
|
459 | $ hg fatelog | |||
|
460 | o eb5a0daa2192 | |||
|
461 | | | |||
|
462 | | @ 471f378eab4c | |||
|
463 | |/ Obsfate: rewritten as 3:eb5a0daa2192; | |||
|
464 | o ea207398892e | |||
|
465 | ||||
357 | $ hg up 'desc(B0)' --hidden |
|
466 | $ hg up 'desc(B0)' --hidden | |
358 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
467 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
359 |
|
468 | |||
@@ -375,6 +484,16 b' displayed' | |||||
375 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
484 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
376 | o ea207398892e |
|
485 | o ea207398892e | |
377 |
|
486 | |||
|
487 | ||||
|
488 | $ hg fatelog | |||
|
489 | o eb5a0daa2192 | |||
|
490 | | | |||
|
491 | | @ 0dec01379d3b | |||
|
492 | | | Obsfate: rewritten as 3:eb5a0daa2192; | |||
|
493 | | x 471f378eab4c | |||
|
494 | |/ Obsfate: rewritten as 3:eb5a0daa2192; | |||
|
495 | o ea207398892e | |||
|
496 | ||||
378 | $ hg up 'desc(C0)' |
|
497 | $ hg up 'desc(C0)' | |
379 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
498 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
380 |
|
499 | |||
@@ -404,6 +523,26 b' with --hidden' | |||||
404 | o ea207398892e |
|
523 | o ea207398892e | |
405 |
|
524 | |||
406 |
|
525 | |||
|
526 | $ hg fatelog --hidden | |||
|
527 | @ eb5a0daa2192 | |||
|
528 | | | |||
|
529 | | x 0dec01379d3b | |||
|
530 | | | Obsfate: rewritten as 3:eb5a0daa2192; | |||
|
531 | | x 471f378eab4c | |||
|
532 | |/ Obsfate: rewritten as 3:eb5a0daa2192; | |||
|
533 | o ea207398892e | |||
|
534 | ||||
|
535 | ||||
|
536 | $ hg fatelogjson --hidden | |||
|
537 | @ eb5a0daa2192 | |||
|
538 | | | |||
|
539 | | x 0dec01379d3b | |||
|
540 | | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] | |||
|
541 | | x 471f378eab4c | |||
|
542 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] | |||
|
543 | o ea207398892e | |||
|
544 | ||||
|
545 | ||||
407 | Test templates with divergence |
|
546 | Test templates with divergence | |
408 | ============================== |
|
547 | ============================== | |
409 |
|
548 | |||
@@ -521,6 +660,15 b' Predecessors template should show curren' | |||||
521 | | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
|
660 | | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] | |
522 | o ea207398892e |
|
661 | o ea207398892e | |
523 |
|
662 | |||
|
663 | $ hg fatelog | |||
|
664 | o 019fadeab383 | |||
|
665 | | | |||
|
666 | | o fdf9bde5129a | |||
|
667 | |/ | |||
|
668 | | @ 471f378eab4c | |||
|
669 | |/ Obsfate: rewritten as 2:fdf9bde5129a; rewritten as 4:019fadeab383; | |||
|
670 | o ea207398892e | |||
|
671 | ||||
524 | $ hg up 'desc(A1)' |
|
672 | $ hg up 'desc(A1)' | |
525 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
673 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
526 |
|
674 | |||
@@ -533,6 +681,14 b' the log' | |||||
533 | |/ |
|
681 | |/ | |
534 | o ea207398892e |
|
682 | o ea207398892e | |
535 |
|
683 | |||
|
684 | ||||
|
685 | $ hg fatelog | |||
|
686 | o 019fadeab383 | |||
|
687 | | | |||
|
688 | | @ fdf9bde5129a | |||
|
689 | |/ | |||
|
690 | o ea207398892e | |||
|
691 | ||||
536 | Predecessors template should the predecessors as we force their display with |
|
692 | Predecessors template should the predecessors as we force their display with | |
537 | --hidden |
|
693 | --hidden | |
538 | $ hg tlog --hidden |
|
694 | $ hg tlog --hidden | |
@@ -562,6 +718,30 b' Predecessors template should the predece' | |||||
562 | o ea207398892e |
|
718 | o ea207398892e | |
563 |
|
719 | |||
564 |
|
720 | |||
|
721 | $ hg fatelog --hidden | |||
|
722 | o 019fadeab383 | |||
|
723 | | | |||
|
724 | | x 65b757b745b9 | |||
|
725 | |/ Obsfate: rewritten as 4:019fadeab383; | |||
|
726 | | @ fdf9bde5129a | |||
|
727 | |/ | |||
|
728 | | x 471f378eab4c | |||
|
729 | |/ Obsfate: rewritten as 2:fdf9bde5129a; rewritten as 3:65b757b745b9; | |||
|
730 | o ea207398892e | |||
|
731 | ||||
|
732 | ||||
|
733 | $ hg fatelogjson --hidden | |||
|
734 | o 019fadeab383 | |||
|
735 | | | |||
|
736 | | x 65b757b745b9 | |||
|
737 | |/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}] | |||
|
738 | | @ fdf9bde5129a | |||
|
739 | |/ | |||
|
740 | | x 471f378eab4c | |||
|
741 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"]}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"]}] | |||
|
742 | o ea207398892e | |||
|
743 | ||||
|
744 | ||||
565 | Test templates with amended + folded commit |
|
745 | Test templates with amended + folded commit | |
566 | =========================================== |
|
746 | =========================================== | |
567 |
|
747 | |||
@@ -659,6 +839,14 b' Predecessors template should show curren' | |||||
659 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
839 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
660 | o ea207398892e |
|
840 | o ea207398892e | |
661 |
|
841 | |||
|
842 | ||||
|
843 | $ hg fatelog | |||
|
844 | o eb5a0daa2192 | |||
|
845 | | | |||
|
846 | | @ 471f378eab4c | |||
|
847 | |/ Obsfate: rewritten as 4:eb5a0daa2192; | |||
|
848 | o ea207398892e | |||
|
849 | ||||
662 | $ hg up 'desc(B0)' --hidden |
|
850 | $ hg up 'desc(B0)' --hidden | |
663 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
851 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
664 |
|
852 | |||
@@ -679,6 +867,16 b' Predecessors template should both predec' | |||||
679 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
867 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
680 | o ea207398892e |
|
868 | o ea207398892e | |
681 |
|
869 | |||
|
870 | ||||
|
871 | $ hg fatelog | |||
|
872 | o eb5a0daa2192 | |||
|
873 | | | |||
|
874 | | @ 0dec01379d3b | |||
|
875 | | | Obsfate: rewritten as 4:eb5a0daa2192; | |||
|
876 | | x 471f378eab4c | |||
|
877 | |/ Obsfate: rewritten as 4:eb5a0daa2192; | |||
|
878 | o ea207398892e | |||
|
879 | ||||
682 | $ hg up 'desc(B1)' --hidden |
|
880 | $ hg up 'desc(B1)' --hidden | |
683 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
881 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
684 |
|
882 | |||
@@ -699,6 +897,16 b' Predecessors template should both predec' | |||||
699 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
897 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
700 | o ea207398892e |
|
898 | o ea207398892e | |
701 |
|
899 | |||
|
900 | ||||
|
901 | $ hg fatelog | |||
|
902 | o eb5a0daa2192 | |||
|
903 | | | |||
|
904 | | @ b7ea6d14e664 | |||
|
905 | | | Obsfate: rewritten as 4:eb5a0daa2192; | |||
|
906 | | x 471f378eab4c | |||
|
907 | |/ Obsfate: rewritten as 4:eb5a0daa2192; | |||
|
908 | o ea207398892e | |||
|
909 | ||||
702 | $ hg up 'desc(C0)' |
|
910 | $ hg up 'desc(C0)' | |
703 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
911 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
704 |
|
912 | |||
@@ -708,6 +916,12 b' Predecessors template should show no pre' | |||||
708 | | |
|
916 | | | |
709 | o ea207398892e |
|
917 | o ea207398892e | |
710 |
|
918 | |||
|
919 | ||||
|
920 | $ hg fatelog | |||
|
921 | @ eb5a0daa2192 | |||
|
922 | | | |||
|
923 | o ea207398892e | |||
|
924 | ||||
711 | Predecessors template should show all predecessors as we force their display |
|
925 | Predecessors template should show all predecessors as we force their display | |
712 | with --hidden |
|
926 | with --hidden | |
713 | $ hg tlog --hidden |
|
927 | $ hg tlog --hidden | |
@@ -735,6 +949,30 b' with --hidden' | |||||
735 | o ea207398892e |
|
949 | o ea207398892e | |
736 |
|
950 | |||
737 |
|
951 | |||
|
952 | $ hg fatelog --hidden | |||
|
953 | @ eb5a0daa2192 | |||
|
954 | | | |||
|
955 | | x b7ea6d14e664 | |||
|
956 | | | Obsfate: rewritten as 4:eb5a0daa2192; | |||
|
957 | | | x 0dec01379d3b | |||
|
958 | | |/ Obsfate: rewritten as 3:b7ea6d14e664; | |||
|
959 | | x 471f378eab4c | |||
|
960 | |/ Obsfate: rewritten as 4:eb5a0daa2192; | |||
|
961 | o ea207398892e | |||
|
962 | ||||
|
963 | ||||
|
964 | $ hg fatelogjson --hidden | |||
|
965 | @ eb5a0daa2192 | |||
|
966 | | | |||
|
967 | | x b7ea6d14e664 | |||
|
968 | | | Obsfate: [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] | |||
|
969 | | | x 0dec01379d3b | |||
|
970 | | |/ Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"]}] | |||
|
971 | | x 471f378eab4c | |||
|
972 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] | |||
|
973 | o ea207398892e | |||
|
974 | ||||
|
975 | ||||
738 | Test template with pushed and pulled obs markers |
|
976 | Test template with pushed and pulled obs markers | |
739 | ================================================ |
|
977 | ================================================ | |
740 |
|
978 | |||
@@ -838,6 +1076,14 b' Predecessors template should show curren' | |||||
838 | | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] |
|
1076 | | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] | |
839 | o ea207398892e |
|
1077 | o ea207398892e | |
840 |
|
1078 | |||
|
1079 | ||||
|
1080 | $ hg fatelog | |||
|
1081 | o 7a230b46bf61 | |||
|
1082 | | | |||
|
1083 | | @ 471f378eab4c | |||
|
1084 | |/ Obsfate: rewritten as 2:7a230b46bf61; | |||
|
1085 | o ea207398892e | |||
|
1086 | ||||
841 | $ hg up 'desc(A2)' |
|
1087 | $ hg up 'desc(A2)' | |
842 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1088 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
843 |
|
1089 | |||
@@ -847,6 +1093,12 b' Predecessors template should show no pre' | |||||
847 | | |
|
1093 | | | |
848 | o ea207398892e |
|
1094 | o ea207398892e | |
849 |
|
1095 | |||
|
1096 | ||||
|
1097 | $ hg fatelog | |||
|
1098 | @ 7a230b46bf61 | |||
|
1099 | | | |||
|
1100 | o ea207398892e | |||
|
1101 | ||||
850 | Predecessors template should show all predecessors as we force their display |
|
1102 | Predecessors template should show all predecessors as we force their display | |
851 | with --hidden |
|
1103 | with --hidden | |
852 | $ hg tlog --hidden |
|
1104 | $ hg tlog --hidden | |
@@ -862,6 +1114,14 b' with --hidden' | |||||
862 | o ea207398892e |
|
1114 | o ea207398892e | |
863 |
|
1115 | |||
864 |
|
1116 | |||
|
1117 | $ hg fatelog --hidden | |||
|
1118 | @ 7a230b46bf61 | |||
|
1119 | | | |||
|
1120 | | x 471f378eab4c | |||
|
1121 | |/ Obsfate: rewritten as 2:7a230b46bf61; | |||
|
1122 | o ea207398892e | |||
|
1123 | ||||
|
1124 | ||||
865 | Test template with obsmarkers cycle |
|
1125 | Test template with obsmarkers cycle | |
866 | =================================== |
|
1126 | =================================== | |
867 |
|
1127 | |||
@@ -895,6 +1155,12 b' Check templates' | |||||
895 | o ea207398892e |
|
1155 | o ea207398892e | |
896 |
|
1156 | |||
897 |
|
1157 | |||
|
1158 | $ hg fatelog | |||
|
1159 | @ f897c6137566 | |||
|
1160 | | | |||
|
1161 | o ea207398892e | |||
|
1162 | ||||
|
1163 | ||||
898 | $ hg up -r "desc(B0)" --hidden |
|
1164 | $ hg up -r "desc(B0)" --hidden | |
899 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1165 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
900 | $ hg tlog |
|
1166 | $ hg tlog | |
@@ -923,6 +1189,16 b' Check templates' | |||||
923 | o ea207398892e |
|
1189 | o ea207398892e | |
924 |
|
1190 | |||
925 |
|
1191 | |||
|
1192 | $ hg fatelog | |||
|
1193 | o f897c6137566 | |||
|
1194 | | | |||
|
1195 | | @ 0dec01379d3b | |||
|
1196 | | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c; | |||
|
1197 | | x 471f378eab4c | |||
|
1198 | |/ Obsfate: rewritten as 2:0dec01379d3b; | |||
|
1199 | o ea207398892e | |||
|
1200 | ||||
|
1201 | ||||
926 | $ hg up -r "desc(A0)" --hidden |
|
1202 | $ hg up -r "desc(A0)" --hidden | |
927 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1203 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
928 | $ hg tlog |
|
1204 | $ hg tlog | |
@@ -936,6 +1212,14 b' Check templates' | |||||
936 | o ea207398892e |
|
1212 | o ea207398892e | |
937 |
|
1213 | |||
938 |
|
1214 | |||
|
1215 | $ hg fatelog | |||
|
1216 | o f897c6137566 | |||
|
1217 | | | |||
|
1218 | | @ 471f378eab4c | |||
|
1219 | |/ | |||
|
1220 | o ea207398892e | |||
|
1221 | ||||
|
1222 | ||||
939 | $ hg up -r "desc(ROOT)" --hidden |
|
1223 | $ hg up -r "desc(ROOT)" --hidden | |
940 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1224 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
941 | $ hg tlog |
|
1225 | $ hg tlog | |
@@ -944,6 +1228,12 b' Check templates' | |||||
944 | @ ea207398892e |
|
1228 | @ ea207398892e | |
945 |
|
1229 | |||
946 |
|
1230 | |||
|
1231 | $ hg fatelog | |||
|
1232 | o f897c6137566 | |||
|
1233 | | | |||
|
1234 | @ ea207398892e | |||
|
1235 | ||||
|
1236 | ||||
947 | $ hg tlog --hidden |
|
1237 | $ hg tlog --hidden | |
948 | o f897c6137566 |
|
1238 | o f897c6137566 | |
949 | | Predecessors: 2:0dec01379d3b |
|
1239 | | Predecessors: 2:0dec01379d3b | |
@@ -1153,6 +1443,21 b' Check templates' | |||||
1153 | | |
|
1443 | | | |
1154 | o ea207398892e |
|
1444 | o ea207398892e | |
1155 |
|
1445 | |||
|
1446 | $ hg fatelog | |||
|
1447 | @ 0b997eb7ceee | |||
|
1448 | | | |||
|
1449 | | o b18bc8331526 | |||
|
1450 | |/ | |||
|
1451 | | o ba2ed02b0c9a | |||
|
1452 | | | | |||
|
1453 | | x 4a004186e638 | |||
|
1454 | |/ Obsfate: rewritten as 8:b18bc8331526; rewritten as 9:0b997eb7ceee; | |||
|
1455 | o dd800401bd8c | |||
|
1456 | | | |||
|
1457 | o f897c6137566 | |||
|
1458 | | | |||
|
1459 | o ea207398892e | |||
|
1460 | ||||
1156 | $ hg tlog --hidden |
|
1461 | $ hg tlog --hidden | |
1157 | @ 0b997eb7ceee |
|
1462 | @ 0b997eb7ceee | |
1158 | | Predecessors: 6:4a004186e638 |
|
1463 | | Predecessors: 6:4a004186e638 | |
@@ -1211,6 +1516,48 b' Check templates' | |||||
1211 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
|
1516 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] | |
1212 | o ea207398892e |
|
1517 | o ea207398892e | |
1213 |
|
1518 | |||
|
1519 | $ hg fatelog --hidden | |||
|
1520 | @ 0b997eb7ceee | |||
|
1521 | | | |||
|
1522 | | o b18bc8331526 | |||
|
1523 | |/ | |||
|
1524 | | o ba2ed02b0c9a | |||
|
1525 | | | | |||
|
1526 | | x 4a004186e638 | |||
|
1527 | |/ Obsfate: rewritten as 8:b18bc8331526; rewritten as 9:0b997eb7ceee; | |||
|
1528 | o dd800401bd8c | |||
|
1529 | | | |||
|
1530 | | x 9bd10a0775e4 | |||
|
1531 | |/ Obsfate: rewritten as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a; | |||
|
1532 | o f897c6137566 | |||
|
1533 | | | |||
|
1534 | | x 0dec01379d3b | |||
|
1535 | | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c; | |||
|
1536 | | x 471f378eab4c | |||
|
1537 | |/ Obsfate: rewritten as 2:0dec01379d3b; | |||
|
1538 | o ea207398892e | |||
|
1539 | ||||
|
1540 | $ hg fatelogjson --hidden | |||
|
1541 | @ 0b997eb7ceee | |||
|
1542 | | | |||
|
1543 | | o b18bc8331526 | |||
|
1544 | |/ | |||
|
1545 | | o ba2ed02b0c9a | |||
|
1546 | | | | |||
|
1547 | | x 4a004186e638 | |||
|
1548 | |/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}] | |||
|
1549 | o dd800401bd8c | |||
|
1550 | | | |||
|
1551 | | x 9bd10a0775e4 | |||
|
1552 | |/ Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}] | |||
|
1553 | o f897c6137566 | |||
|
1554 | | | |||
|
1555 | | x 0dec01379d3b | |||
|
1556 | | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["f897c6137566320b081514b4c7227ecc3d384b39"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["f897c6137566320b081514b4c7227ecc3d384b39"]}, {"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["471f378eab4c5e25f6c77f785b27c936efb22874"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["471f378eab4c5e25f6c77f785b27c936efb22874"]}] | |||
|
1557 | | x 471f378eab4c | |||
|
1558 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}] | |||
|
1559 | o ea207398892e | |||
|
1560 | ||||
1214 | $ hg up --hidden 4 |
|
1561 | $ hg up --hidden 4 | |
1215 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1562 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1216 | $ hg rebase -r 7 -d 8 --config extensions.rebase= |
|
1563 | $ hg rebase -r 7 -d 8 --config extensions.rebase= | |
@@ -1245,6 +1592,22 b' Check templates' | |||||
1245 | | |
|
1592 | | | |
1246 | o ea207398892e |
|
1593 | o ea207398892e | |
1247 |
|
1594 | |||
|
1595 | ||||
|
1596 | $ hg fatelog | |||
|
1597 | o eceed8f98ffc | |||
|
1598 | | | |||
|
1599 | | o 0b997eb7ceee | |||
|
1600 | | | | |||
|
1601 | o | b18bc8331526 | |||
|
1602 | |/ | |||
|
1603 | o dd800401bd8c | |||
|
1604 | | | |||
|
1605 | | @ 9bd10a0775e4 | |||
|
1606 | |/ Obsfate: rewritten as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; rewritten as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc; | |||
|
1607 | o f897c6137566 | |||
|
1608 | | | |||
|
1609 | o ea207398892e | |||
|
1610 | ||||
1248 | Test templates with pruned commits |
|
1611 | Test templates with pruned commits | |
1249 | ================================== |
|
1612 | ================================== | |
1250 |
|
1613 | |||
@@ -1268,3 +1631,13 b' Check output' | |||||
1268 | | |
|
1631 | | | |
1269 | o ea207398892e |
|
1632 | o ea207398892e | |
1270 |
|
1633 | |||
|
1634 | $ hg fatelog | |||
|
1635 | @ 471f378eab4c | |||
|
1636 | | | |||
|
1637 | o ea207398892e | |||
|
1638 | ||||
|
1639 | $ hg fatelog -v | |||
|
1640 | @ 471f378eab4c | |||
|
1641 | | | |||
|
1642 | o ea207398892e | |||
|
1643 |
General Comments 0
You need to be logged in to leave comments.
Login now