##// END OF EJS Templates
obsfate: rename obsfate into obsolete in changeset_printer...
Boris Feld -
r34901:3a3adbcb default
parent child Browse files
Show More
@@ -1728,7 +1728,7 b' class changeset_printer(object):'
1728 1728 if obsfate:
1729 1729 for obsfateline in obsfate:
1730 1730 # i18n: column positioning for "hg log"
1731 self.ui.write(_("obsfate: %s\n") % obsfateline,
1731 self.ui.write(_("obsolete: %s\n") % obsfateline,
1732 1732 label='log.obsfate')
1733 1733
1734 1734 def _exthook(self, ctx):
@@ -535,7 +535,7 b' changelog and manifest would have invali'
535 535 tag: tip
536 536 user: test
537 537 date: Thu Jan 01 00:00:00 1970 +0000
538 obsfate: pruned
538 obsolete: pruned
539 539 summary: .
540 540
541 541 changeset: 0:eff892de26ec
@@ -58,13 +58,13 b' Test setup'
58 58 |/ parent: 0:ea207398892e
59 59 | user: test
60 60 | date: Thu Jan 01 00:00:00 1970 +0000
61 | obsfate: rewritten using amend as 3:d004c8f274b9 by test2
61 | obsolete: rewritten using amend as 3:d004c8f274b9 by test2
62 62 | summary: A1
63 63 |
64 64 | x changeset: 1:471f378eab4c
65 65 |/ user: test
66 66 | date: Thu Jan 01 00:00:00 1970 +0000
67 | obsfate: rewritten using amend as 2:a468dc9b3633
67 | obsolete: rewritten using amend as 2:a468dc9b3633
68 68 | summary: A0
69 69 |
70 70 o changeset: 0:ea207398892e
@@ -117,7 +117,7 b' Predecessors template should show curren'
117 117 | @ changeset: 1:471f378eab4c
118 118 |/ user: test
119 119 | date: Thu Jan 01 00:00:00 1970 +0000
120 | obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2
120 | obsolete: rewritten using amend as 3:d004c8f274b9 by test, test2
121 121 | summary: A0
122 122 |
123 123 o changeset: 0:ea207398892e
@@ -401,7 +401,7 b' Test templates with splitted commit'
401 401 | x changeset: 1:471597cad322
402 402 |/ user: test
403 403 | date: Thu Jan 01 00:00:00 1970 +0000
404 | obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a
404 | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a
405 405 | summary: A0
406 406 |
407 407 o changeset: 0:ea207398892e
@@ -602,13 +602,13 b' Simulate a fold'
602 602 | x changeset: 2:0dec01379d3b
603 603 | | user: test
604 604 | | date: Thu Jan 01 00:00:00 1970 +0000
605 | | obsfate: rewritten as 3:eb5a0daa2192
605 | | obsolete: rewritten as 3:eb5a0daa2192
606 606 | | summary: B0
607 607 | |
608 608 | x changeset: 1:471f378eab4c
609 609 |/ user: test
610 610 | date: Thu Jan 01 00:00:00 1970 +0000
611 | obsfate: rewritten as 3:eb5a0daa2192
611 | obsolete: rewritten as 3:eb5a0daa2192
612 612 | summary: A0
613 613 |
614 614 o changeset: 0:ea207398892e
@@ -800,7 +800,7 b' Test setup'
800 800 | x changeset: 1:471f378eab4c
801 801 |/ user: test
802 802 | date: Thu Jan 01 00:00:00 1970 +0000
803 | obsfate: rewritten using amend as 2:fdf9bde5129a
803 | obsolete: rewritten using amend as 2:fdf9bde5129a
804 804 | summary: A0
805 805 |
806 806 o changeset: 0:ea207398892e
@@ -830,8 +830,8 b' Test setup'
830 830 | x changeset: 1:471f378eab4c
831 831 |/ user: test
832 832 | date: Thu Jan 01 00:00:00 1970 +0000
833 | obsfate: rewritten using amend as 2:fdf9bde5129a
834 | obsfate: rewritten using amend as 3:65b757b745b9
833 | obsolete: rewritten using amend as 2:fdf9bde5129a
834 | obsolete: rewritten using amend as 3:65b757b745b9
835 835 | summary: A0
836 836 |
837 837 o changeset: 0:ea207398892e
@@ -853,7 +853,7 b' Test setup'
853 853 |/ parent: 0:ea207398892e
854 854 | user: test
855 855 | date: Thu Jan 01 00:00:00 1970 +0000
856 | obsfate: rewritten using amend as 4:019fadeab383
856 | obsolete: rewritten using amend as 4:019fadeab383
857 857 | summary: A2
858 858 |
859 859 | o changeset: 2:fdf9bde5129a
@@ -866,8 +866,8 b' Test setup'
866 866 | x changeset: 1:471f378eab4c
867 867 |/ user: test
868 868 | date: Thu Jan 01 00:00:00 1970 +0000
869 | obsfate: rewritten using amend as 2:fdf9bde5129a
870 | obsfate: rewritten using amend as 3:65b757b745b9
869 | obsolete: rewritten using amend as 2:fdf9bde5129a
870 | obsolete: rewritten using amend as 3:65b757b745b9
871 871 | summary: A0
872 872 |
873 873 o changeset: 0:ea207398892e
@@ -1081,7 +1081,7 b' Test setup'
1081 1081 | x changeset: 2:0dec01379d3b
1082 1082 |/ user: test
1083 1083 | date: Thu Jan 01 00:00:00 1970 +0000
1084 | obsfate: rewritten using amend as 3:b7ea6d14e664
1084 | obsolete: rewritten using amend as 3:b7ea6d14e664
1085 1085 | summary: B0
1086 1086 |
1087 1087 o changeset: 1:471f378eab4c
@@ -1120,19 +1120,19 b' Test setup'
1120 1120 | | parent: 1:471f378eab4c
1121 1121 | | user: test
1122 1122 | | date: Thu Jan 01 00:00:00 1970 +0000
1123 | | obsfate: rewritten as 4:eb5a0daa2192
1123 | | obsolete: rewritten as 4:eb5a0daa2192
1124 1124 | | summary: B1
1125 1125 | |
1126 1126 | | x changeset: 2:0dec01379d3b
1127 1127 | |/ user: test
1128 1128 | | date: Thu Jan 01 00:00:00 1970 +0000
1129 | | obsfate: rewritten using amend as 3:b7ea6d14e664
1129 | | obsolete: rewritten using amend as 3:b7ea6d14e664
1130 1130 | | summary: B0
1131 1131 | |
1132 1132 | x changeset: 1:471f378eab4c
1133 1133 |/ user: test
1134 1134 | date: Thu Jan 01 00:00:00 1970 +0000
1135 | obsfate: rewritten as 4:eb5a0daa2192
1135 | obsolete: rewritten as 4:eb5a0daa2192
1136 1136 | summary: A0
1137 1137 |
1138 1138 o changeset: 0:ea207398892e
@@ -1403,13 +1403,13 b' Test setup'
1403 1403 |/ parent: 0:ea207398892e
1404 1404 | user: test
1405 1405 | date: Thu Jan 01 00:00:00 1970 +0000
1406 | obsfate: rewritten using amend as 3:7a230b46bf61
1406 | obsolete: rewritten using amend as 3:7a230b46bf61
1407 1407 | summary: A1
1408 1408 |
1409 1409 | x changeset: 1:471f378eab4c
1410 1410 |/ user: test
1411 1411 | date: Thu Jan 01 00:00:00 1970 +0000
1412 | obsfate: rewritten using amend as 2:fdf9bde5129a
1412 | obsolete: rewritten using amend as 2:fdf9bde5129a
1413 1413 | summary: A0
1414 1414 |
1415 1415 o changeset: 0:ea207398892e
@@ -1440,7 +1440,7 b' Test setup'
1440 1440 | @ changeset: 1:471f378eab4c
1441 1441 |/ user: test
1442 1442 | date: Thu Jan 01 00:00:00 1970 +0000
1443 | obsfate: rewritten using amend as 2:7a230b46bf61
1443 | obsolete: rewritten using amend as 2:7a230b46bf61
1444 1444 | summary: A0
1445 1445 |
1446 1446 o changeset: 0:ea207398892e
@@ -1893,8 +1893,8 b' Diverge one of the splitted commit'
1893 1893 | x changeset: 6:4a004186e638
1894 1894 |/ user: test
1895 1895 | date: Thu Jan 01 00:00:00 1970 +0000
1896 | obsfate: rewritten using amend as 8:b18bc8331526
1897 | obsfate: rewritten using amend as 9:0b997eb7ceee
1896 | obsolete: rewritten using amend as 8:b18bc8331526
1897 | obsolete: rewritten using amend as 9:0b997eb7ceee
1898 1898 | summary: Add A,B,C
1899 1899 |
1900 1900 o changeset: 5:dd800401bd8c
@@ -2441,7 +2441,7 b' Test templates with splitted and pruned '
2441 2441 | tag: tip
2442 2442 | user: test
2443 2443 | date: Thu Jan 01 00:00:00 1970 +0000
2444 | obsfate: pruned
2444 | obsolete: pruned
2445 2445 | summary: A2
2446 2446 |
2447 2447 o changeset: 2:617adc3a144c
@@ -2453,7 +2453,7 b' Test templates with splitted and pruned '
2453 2453 | x changeset: 1:471597cad322
2454 2454 |/ user: test
2455 2455 | date: Thu Jan 01 00:00:00 1970 +0000
2456 | obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e
2456 | obsolete: split as 2:617adc3a144c, 3:0d0ef4bdf70e
2457 2457 | summary: A0
2458 2458 |
2459 2459 o changeset: 0:ea207398892e
@@ -977,7 +977,7 b' test the obsolete labels'
977 977 [log.parent changeset.draft|parent: 3:6f9641995072]
978 978 [log.user|user: test]
979 979 [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
980 [log.obsfate|obsfate: pruned]
980 [log.obsfate|obsolete: pruned]
981 981 [log.summary|summary: add obsolete_e]
982 982
983 983
General Comments 0
You need to be logged in to leave comments. Login now