Show More
@@ -570,7 +570,7 b' def showpredecessors(repo, ctx, **args):' | |||||
570 |
|
570 | |||
571 | return _hybrid(None, predecessors, |
|
571 | return _hybrid(None, predecessors, | |
572 | lambda x: {'ctx': repo[x], 'revcache': {}}, |
|
572 | lambda x: {'ctx': repo[x], 'revcache': {}}, | |
573 |
lambda d: |
|
573 | lambda d: _formatrevnode(d['ctx'])) | |
574 |
|
574 | |||
575 | @templatekeyword('p1rev') |
|
575 | @templatekeyword('p1rev') | |
576 | def showp1rev(repo, ctx, templ, **args): |
|
576 | def showp1rev(repo, ctx, templ, **args): |
@@ -70,8 +70,8 b' Check templates' | |||||
70 | Predecessors template should show current revision as it is the working copy |
|
70 | Predecessors template should show current revision as it is the working copy | |
71 | $ hg tlog |
|
71 | $ hg tlog | |
72 | o d004c8f274b9 |
|
72 | o d004c8f274b9 | |
73 | | Predecessors: 471f378eab4c |
|
73 | | Predecessors: 1:471f378eab4c | |
74 | | semi-colon: 471f378eab4c |
|
74 | | semi-colon: 1:471f378eab4c | |
75 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
75 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
76 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
76 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
77 | | @ 471f378eab4c |
|
77 | | @ 471f378eab4c | |
@@ -84,8 +84,8 b' Predecessors template should show curren' | |||||
84 | Predecessors template should show current revision as it is the working copy |
|
84 | Predecessors template should show current revision as it is the working copy | |
85 | $ hg tlog |
|
85 | $ hg tlog | |
86 | o d004c8f274b9 |
|
86 | o d004c8f274b9 | |
87 | | Predecessors: a468dc9b3633 |
|
87 | | Predecessors: 3:a468dc9b3633 | |
88 | | semi-colon: a468dc9b3633 |
|
88 | | semi-colon: 3:a468dc9b3633 | |
89 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
|
89 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] | |
90 | | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
|
90 | | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad | |
91 | | @ a468dc9b3633 |
|
91 | | @ a468dc9b3633 | |
@@ -96,13 +96,13 b' Predecessors template should show all th' | |||||
96 | with --hidden |
|
96 | with --hidden | |
97 | $ hg tlog --hidden |
|
97 | $ hg tlog --hidden | |
98 | o d004c8f274b9 |
|
98 | o d004c8f274b9 | |
99 | | Predecessors: a468dc9b3633 |
|
99 | | Predecessors: 3:a468dc9b3633 | |
100 | | semi-colon: a468dc9b3633 |
|
100 | | semi-colon: 3:a468dc9b3633 | |
101 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
|
101 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] | |
102 | | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
|
102 | | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad | |
103 | | @ a468dc9b3633 |
|
103 | | @ a468dc9b3633 | |
104 | |/ Predecessors: 471f378eab4c |
|
104 | |/ Predecessors: 1:471f378eab4c | |
105 | | semi-colon: 471f378eab4c |
|
105 | | semi-colon: 1:471f378eab4c | |
106 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
106 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
107 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
107 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
108 | | x f137d23bb3e1 |
|
108 | | x f137d23bb3e1 | |
@@ -123,13 +123,13 b' visible.' | |||||
123 |
|
123 | |||
124 | $ hg tlog --hidden |
|
124 | $ hg tlog --hidden | |
125 | @ d004c8f274b9 |
|
125 | @ d004c8f274b9 | |
126 | | Predecessors: a468dc9b3633 |
|
126 | | Predecessors: 3:a468dc9b3633 | |
127 | | semi-colon: a468dc9b3633 |
|
127 | | semi-colon: 3:a468dc9b3633 | |
128 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
|
128 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] | |
129 | | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
|
129 | | map: 3:a468dc9b36338b14fdb7825f55ce3df4e71517ad | |
130 | | x a468dc9b3633 |
|
130 | | x a468dc9b3633 | |
131 | |/ Predecessors: 471f378eab4c |
|
131 | |/ Predecessors: 1:471f378eab4c | |
132 | | semi-colon: 471f378eab4c |
|
132 | | semi-colon: 1:471f378eab4c | |
133 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
133 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
134 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
134 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
135 | | x f137d23bb3e1 |
|
135 | | x f137d23bb3e1 | |
@@ -206,13 +206,13 b' Check templates' | |||||
206 | Predecessors template should show current revision as it is the working copy |
|
206 | Predecessors template should show current revision as it is the working copy | |
207 | $ hg tlog |
|
207 | $ hg tlog | |
208 | o f257fde29c7a |
|
208 | o f257fde29c7a | |
209 | | Predecessors: 471597cad322 |
|
209 | | Predecessors: 1:471597cad322 | |
210 | | semi-colon: 471597cad322 |
|
210 | | semi-colon: 1:471597cad322 | |
211 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
|
211 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] | |
212 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
|
212 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 | |
213 | o 337fec4d2edc |
|
213 | o 337fec4d2edc | |
214 | | Predecessors: 471597cad322 |
|
214 | | Predecessors: 1:471597cad322 | |
215 | | semi-colon: 471597cad322 |
|
215 | | semi-colon: 1:471597cad322 | |
216 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
|
216 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] | |
217 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
|
217 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 | |
218 | | @ 471597cad322 |
|
218 | | @ 471597cad322 | |
@@ -235,13 +235,13 b' Predecessors template should show both p' | |||||
235 | with --hidden |
|
235 | with --hidden | |
236 | $ hg tlog --hidden |
|
236 | $ hg tlog --hidden | |
237 | @ f257fde29c7a |
|
237 | @ f257fde29c7a | |
238 | | Predecessors: 471597cad322 |
|
238 | | Predecessors: 1:471597cad322 | |
239 | | semi-colon: 471597cad322 |
|
239 | | semi-colon: 1:471597cad322 | |
240 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
|
240 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] | |
241 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
|
241 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 | |
242 | o 337fec4d2edc |
|
242 | o 337fec4d2edc | |
243 | | Predecessors: 471597cad322 |
|
243 | | Predecessors: 1:471597cad322 | |
244 | | semi-colon: 471597cad322 |
|
244 | | semi-colon: 1:471597cad322 | |
245 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
|
245 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] | |
246 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
|
246 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 | |
247 | | x 471597cad322 |
|
247 | | x 471597cad322 | |
@@ -320,8 +320,8 b' Check templates' | |||||
320 | Predecessors template should show current revision as it is the working copy |
|
320 | Predecessors template should show current revision as it is the working copy | |
321 | $ hg tlog |
|
321 | $ hg tlog | |
322 | o eb5a0daa2192 |
|
322 | o eb5a0daa2192 | |
323 | | Predecessors: 471f378eab4c |
|
323 | | Predecessors: 1:471f378eab4c | |
324 | | semi-colon: 471f378eab4c |
|
324 | | semi-colon: 1:471f378eab4c | |
325 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
325 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
326 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
326 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
327 | | @ 471f378eab4c |
|
327 | | @ 471f378eab4c | |
@@ -335,8 +335,8 b' Predecessors template should show both p' | |||||
335 | displayed |
|
335 | displayed | |
336 | $ hg tlog |
|
336 | $ hg tlog | |
337 | o eb5a0daa2192 |
|
337 | o eb5a0daa2192 | |
338 | | Predecessors: 0dec01379d3b 471f378eab4c |
|
338 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c | |
339 | | semi-colon: 0dec01379d3b; 471f378eab4c |
|
339 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c | |
340 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
340 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] | |
341 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
341 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
342 | | @ 0dec01379d3b |
|
342 | | @ 0dec01379d3b | |
@@ -359,8 +359,8 b' Predecessors template should show both p' | |||||
359 | with --hidden |
|
359 | with --hidden | |
360 | $ hg tlog --hidden |
|
360 | $ hg tlog --hidden | |
361 | @ eb5a0daa2192 |
|
361 | @ eb5a0daa2192 | |
362 | | Predecessors: 0dec01379d3b 471f378eab4c |
|
362 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c | |
363 | | semi-colon: 0dec01379d3b; 471f378eab4c |
|
363 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c | |
364 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
364 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] | |
365 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
365 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
366 | | x 0dec01379d3b |
|
366 | | x 0dec01379d3b | |
@@ -471,13 +471,13 b' Check templates' | |||||
471 | Predecessors template should show current revision as it is the working copy |
|
471 | Predecessors template should show current revision as it is the working copy | |
472 | $ hg tlog |
|
472 | $ hg tlog | |
473 | o 019fadeab383 |
|
473 | o 019fadeab383 | |
474 | | Predecessors: 471f378eab4c |
|
474 | | Predecessors: 1:471f378eab4c | |
475 | | semi-colon: 471f378eab4c |
|
475 | | semi-colon: 1:471f378eab4c | |
476 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
476 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
477 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
477 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
478 | | o fdf9bde5129a |
|
478 | | o fdf9bde5129a | |
479 | |/ Predecessors: 471f378eab4c |
|
479 | |/ Predecessors: 1:471f378eab4c | |
480 | | semi-colon: 471f378eab4c |
|
480 | | semi-colon: 1:471f378eab4c | |
481 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
481 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
482 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
482 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
483 | | @ 471f378eab4c |
|
483 | | @ 471f378eab4c | |
@@ -500,18 +500,18 b' Predecessors template should the predece' | |||||
500 | --hidden |
|
500 | --hidden | |
501 | $ hg tlog --hidden |
|
501 | $ hg tlog --hidden | |
502 | o 019fadeab383 |
|
502 | o 019fadeab383 | |
503 | | Predecessors: 65b757b745b9 |
|
503 | | Predecessors: 3:65b757b745b9 | |
504 | | semi-colon: 65b757b745b9 |
|
504 | | semi-colon: 3:65b757b745b9 | |
505 | | json: ["65b757b745b935093c87a2bccd877521cccffcbd"] |
|
505 | | json: ["65b757b745b935093c87a2bccd877521cccffcbd"] | |
506 | | map: 3:65b757b745b935093c87a2bccd877521cccffcbd |
|
506 | | map: 3:65b757b745b935093c87a2bccd877521cccffcbd | |
507 | | x 65b757b745b9 |
|
507 | | x 65b757b745b9 | |
508 | |/ Predecessors: 471f378eab4c |
|
508 | |/ Predecessors: 1:471f378eab4c | |
509 | | semi-colon: 471f378eab4c |
|
509 | | semi-colon: 1:471f378eab4c | |
510 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
510 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
511 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
511 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
512 | | @ fdf9bde5129a |
|
512 | | @ fdf9bde5129a | |
513 | |/ Predecessors: 471f378eab4c |
|
513 | |/ Predecessors: 1:471f378eab4c | |
514 | | semi-colon: 471f378eab4c |
|
514 | | semi-colon: 1:471f378eab4c | |
515 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
515 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
516 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
516 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
517 | | x 471f378eab4c |
|
517 | | x 471f378eab4c | |
@@ -604,8 +604,8 b' Check templates' | |||||
604 | Predecessors template should show current revision as it is the working copy |
|
604 | Predecessors template should show current revision as it is the working copy | |
605 | $ hg tlog |
|
605 | $ hg tlog | |
606 | o eb5a0daa2192 |
|
606 | o eb5a0daa2192 | |
607 | | Predecessors: 471f378eab4c |
|
607 | | Predecessors: 1:471f378eab4c | |
608 | | semi-colon: 471f378eab4c |
|
608 | | semi-colon: 1:471f378eab4c | |
609 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
609 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
610 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
610 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
611 | | @ 471f378eab4c |
|
611 | | @ 471f378eab4c | |
@@ -618,8 +618,8 b' Predecessors template should show curren' | |||||
618 | Predecessors template should both predecessors as they are visible |
|
618 | Predecessors template should both predecessors as they are visible | |
619 | $ hg tlog |
|
619 | $ hg tlog | |
620 | o eb5a0daa2192 |
|
620 | o eb5a0daa2192 | |
621 | | Predecessors: 0dec01379d3b 471f378eab4c |
|
621 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c | |
622 | | semi-colon: 0dec01379d3b; 471f378eab4c |
|
622 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c | |
623 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
623 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] | |
624 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
624 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
625 | | @ 0dec01379d3b |
|
625 | | @ 0dec01379d3b | |
@@ -634,8 +634,8 b' Predecessors template should both predec' | |||||
634 | Predecessors template should both predecessors as they are visible |
|
634 | Predecessors template should both predecessors as they are visible | |
635 | $ hg tlog |
|
635 | $ hg tlog | |
636 | o eb5a0daa2192 |
|
636 | o eb5a0daa2192 | |
637 | | Predecessors: 471f378eab4c b7ea6d14e664 |
|
637 | | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 | |
638 | | semi-colon: 471f378eab4c; b7ea6d14e664 |
|
638 | | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 | |
639 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
|
639 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] | |
640 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 |
|
640 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 | |
641 | | @ b7ea6d14e664 |
|
641 | | @ b7ea6d14e664 | |
@@ -657,13 +657,13 b' Predecessors template should show all pr' | |||||
657 | with --hidden |
|
657 | with --hidden | |
658 | $ hg tlog --hidden |
|
658 | $ hg tlog --hidden | |
659 | @ eb5a0daa2192 |
|
659 | @ eb5a0daa2192 | |
660 | | Predecessors: 471f378eab4c b7ea6d14e664 |
|
660 | | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 | |
661 | | semi-colon: 471f378eab4c; b7ea6d14e664 |
|
661 | | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 | |
662 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
|
662 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] | |
663 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 |
|
663 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 | |
664 | | x b7ea6d14e664 |
|
664 | | x b7ea6d14e664 | |
665 | | | Predecessors: 0dec01379d3b |
|
665 | | | Predecessors: 2:0dec01379d3b | |
666 | | | semi-colon: 0dec01379d3b |
|
666 | | | semi-colon: 2:0dec01379d3b | |
667 | | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
667 | | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
668 | | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
668 | | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
669 | | | x 0dec01379d3b |
|
669 | | | x 0dec01379d3b | |
@@ -765,8 +765,8 b' Check templates' | |||||
765 | Predecessors template should show current revision as it is the working copy |
|
765 | Predecessors template should show current revision as it is the working copy | |
766 | $ hg tlog |
|
766 | $ hg tlog | |
767 | o 7a230b46bf61 |
|
767 | o 7a230b46bf61 | |
768 | | Predecessors: 471f378eab4c |
|
768 | | Predecessors: 1:471f378eab4c | |
769 | | semi-colon: 471f378eab4c |
|
769 | | semi-colon: 1:471f378eab4c | |
770 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
770 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
771 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
771 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
772 | | @ 471f378eab4c |
|
772 | | @ 471f378eab4c | |
@@ -786,8 +786,8 b' Predecessors template should show all pr' | |||||
786 | with --hidden |
|
786 | with --hidden | |
787 | $ hg tlog --hidden |
|
787 | $ hg tlog --hidden | |
788 | @ 7a230b46bf61 |
|
788 | @ 7a230b46bf61 | |
789 | | Predecessors: 471f378eab4c |
|
789 | | Predecessors: 1:471f378eab4c | |
790 | | semi-colon: 471f378eab4c |
|
790 | | semi-colon: 1:471f378eab4c | |
791 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
791 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
792 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
792 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
793 | | x 471f378eab4c |
|
793 | | x 471f378eab4c | |
@@ -830,18 +830,18 b' Check templates' | |||||
830 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
830 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
831 | $ hg tlog |
|
831 | $ hg tlog | |
832 | o f897c6137566 |
|
832 | o f897c6137566 | |
833 | | Predecessors: 0dec01379d3b |
|
833 | | Predecessors: 2:0dec01379d3b | |
834 | | semi-colon: 0dec01379d3b |
|
834 | | semi-colon: 2:0dec01379d3b | |
835 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
835 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
836 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
836 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
837 | | @ 0dec01379d3b |
|
837 | | @ 0dec01379d3b | |
838 | | | Predecessors: 471f378eab4c |
|
838 | | | Predecessors: 1:471f378eab4c | |
839 | | | semi-colon: 471f378eab4c |
|
839 | | | semi-colon: 1:471f378eab4c | |
840 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
840 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
841 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
841 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
842 | | x 471f378eab4c |
|
842 | | x 471f378eab4c | |
843 | |/ Predecessors: 0dec01379d3b |
|
843 | |/ Predecessors: 2:0dec01379d3b | |
844 | | semi-colon: 0dec01379d3b |
|
844 | | semi-colon: 2:0dec01379d3b | |
845 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
845 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
846 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
846 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
847 | o ea207398892e |
|
847 | o ea207398892e | |
@@ -851,8 +851,8 b' Check templates' | |||||
851 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
851 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
852 | $ hg tlog |
|
852 | $ hg tlog | |
853 | o f897c6137566 |
|
853 | o f897c6137566 | |
854 | | Predecessors: 471f378eab4c |
|
854 | | Predecessors: 1:471f378eab4c | |
855 | | semi-colon: 471f378eab4c |
|
855 | | semi-colon: 1:471f378eab4c | |
856 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
856 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
857 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
857 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
858 | | @ 471f378eab4c |
|
858 | | @ 471f378eab4c | |
@@ -870,18 +870,18 b' Check templates' | |||||
870 |
|
870 | |||
871 | $ hg tlog --hidden |
|
871 | $ hg tlog --hidden | |
872 | o f897c6137566 |
|
872 | o f897c6137566 | |
873 | | Predecessors: 0dec01379d3b |
|
873 | | Predecessors: 2:0dec01379d3b | |
874 | | semi-colon: 0dec01379d3b |
|
874 | | semi-colon: 2:0dec01379d3b | |
875 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
875 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
876 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
876 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
877 | | x 0dec01379d3b |
|
877 | | x 0dec01379d3b | |
878 | | | Predecessors: 471f378eab4c |
|
878 | | | Predecessors: 1:471f378eab4c | |
879 | | | semi-colon: 471f378eab4c |
|
879 | | | semi-colon: 1:471f378eab4c | |
880 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
880 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
881 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
881 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
882 | | x 471f378eab4c |
|
882 | | x 471f378eab4c | |
883 | |/ Predecessors: 0dec01379d3b |
|
883 | |/ Predecessors: 2:0dec01379d3b | |
884 | | semi-colon: 0dec01379d3b |
|
884 | | semi-colon: 2:0dec01379d3b | |
885 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
885 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
886 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
886 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
887 | @ ea207398892e |
|
887 | @ ea207398892e |
General Comments 0
You need to be logged in to leave comments.
Login now