Show More
@@ -1,2641 +1,2641 b'' | |||||
1 | This test file test the various templates related to obsmarkers. |
|
1 | This test file test the various templates related to obsmarkers. | |
2 |
|
2 | |||
3 | Global setup |
|
3 | Global setup | |
4 | ============ |
|
4 | ============ | |
5 |
|
5 | |||
6 | $ . $TESTDIR/testlib/obsmarker-common.sh |
|
6 | $ . $TESTDIR/testlib/obsmarker-common.sh | |
7 | $ cat >> $HGRCPATH <<EOF |
|
7 | $ cat >> $HGRCPATH <<EOF | |
8 | > [ui] |
|
8 | > [ui] | |
9 | > interactive = true |
|
9 | > interactive = true | |
10 | > [phases] |
|
10 | > [phases] | |
11 | > publish=False |
|
11 | > publish=False | |
12 | > [experimental] |
|
12 | > [experimental] | |
13 | > evolution=true |
|
13 | > evolution=true | |
14 | > [templates] |
|
14 | > [templates] | |
15 | > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}" |
|
15 | > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}" | |
16 | > obsfateverb = "{obsfateverb(successors, markers)}" |
|
16 | > obsfateverb = "{obsfateverb(successors, markers)}" | |
17 | > obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}" |
|
17 | > obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}" | |
18 | > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}" |
|
18 | > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}" | |
19 | > obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}" |
|
19 | > obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}" | |
20 | > obsfatetempl = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; " |
|
20 | > obsfatetempl = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; " | |
21 | > [alias] |
|
21 | > [alias] | |
22 | > tlog = log -G -T '{node|short}\ |
|
22 | > tlog = log -G -T '{node|short}\ | |
23 | > {if(predecessors, "\n Predecessors: {predecessors}")}\ |
|
23 | > {if(predecessors, "\n Predecessors: {predecessors}")}\ | |
24 | > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\ |
|
24 | > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\ | |
25 | > {if(predecessors, "\n json: {predecessors|json}")}\ |
|
25 | > {if(predecessors, "\n json: {predecessors|json}")}\ | |
26 | > {if(predecessors, "\n map: {join(predecessors % "{rev}:{node}", " ")}")}\ |
|
26 | > {if(predecessors, "\n map: {join(predecessors % "{rev}:{node}", " ")}")}\ | |
27 | > {if(successorssets, "\n Successors: {successorssets}")}\ |
|
27 | > {if(successorssets, "\n Successors: {successorssets}")}\ | |
28 | > {if(successorssets, "\n multi-line: {join(successorssets, "\n multi-line: ")}")}\ |
|
28 | > {if(successorssets, "\n multi-line: {join(successorssets, "\n multi-line: ")}")}\ | |
29 | > {if(successorssets, "\n json: {successorssets|json}")}\n' |
|
29 | > {if(successorssets, "\n json: {successorssets|json}")}\n' | |
30 | > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers % "{obsfatetempl}"} \n" )}' |
|
30 | > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers % "{obsfatetempl}"} \n" )}' | |
31 | > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers|json}\n")}' |
|
31 | > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers|json}\n")}' | |
32 | > fatelogkw = log -G -T '{node|short}\n{if(obsfate, "{obsfate % " Obsfate: {fate}\n"}")}' |
|
32 | > fatelogkw = log -G -T '{node|short}\n{if(obsfate, "{obsfate % " Obsfate: {fate}\n"}")}' | |
33 | > EOF |
|
33 | > EOF | |
34 |
|
34 | |||
35 | Test templates on amended commit |
|
35 | Test templates on amended commit | |
36 | ================================ |
|
36 | ================================ | |
37 |
|
37 | |||
38 | Test setup |
|
38 | Test setup | |
39 | ---------- |
|
39 | ---------- | |
40 |
|
40 | |||
41 | $ hg init $TESTTMP/templates-local-amend |
|
41 | $ hg init $TESTTMP/templates-local-amend | |
42 | $ cd $TESTTMP/templates-local-amend |
|
42 | $ cd $TESTTMP/templates-local-amend | |
43 | $ mkcommit ROOT |
|
43 | $ mkcommit ROOT | |
44 | $ mkcommit A0 |
|
44 | $ mkcommit A0 | |
45 | $ echo 42 >> A0 |
|
45 | $ echo 42 >> A0 | |
46 | $ hg commit --amend -m "A1" --config devel.default-date="1234567890 0" |
|
46 | $ hg commit --amend -m "A1" --config devel.default-date="1234567890 0" | |
47 | $ hg commit --amend -m "A2" --config devel.default-date="987654321 0" --config devel.user.obsmarker=test2 |
|
47 | $ hg commit --amend -m "A2" --config devel.default-date="987654321 0" --config devel.user.obsmarker=test2 | |
48 |
|
48 | |||
49 | $ hg log --hidden -G |
|
49 | $ hg log --hidden -G | |
50 | @ changeset: 3:d004c8f274b9 |
|
50 | @ changeset: 3:d004c8f274b9 | |
51 | | tag: tip |
|
51 | | tag: tip | |
52 | | parent: 0:ea207398892e |
|
52 | | parent: 0:ea207398892e | |
53 | | user: test |
|
53 | | user: test | |
54 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
54 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
55 | | summary: A2 |
|
55 | | summary: A2 | |
56 | | |
|
56 | | | |
57 | | x changeset: 2:a468dc9b3633 |
|
57 | | x changeset: 2:a468dc9b3633 | |
58 | |/ parent: 0:ea207398892e |
|
58 | |/ parent: 0:ea207398892e | |
59 | | user: test |
|
59 | | user: test | |
60 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
60 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
61 | | obsolete: rewritten using amend as 3:d004c8f274b9 by test2 |
|
61 | | obsolete: rewritten using amend as 3:d004c8f274b9 by test2 | |
62 | | summary: A1 |
|
62 | | summary: A1 | |
63 | | |
|
63 | | | |
64 | | x changeset: 1:471f378eab4c |
|
64 | | x changeset: 1:471f378eab4c | |
65 | |/ user: test |
|
65 | |/ user: test | |
66 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
66 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
67 | | obsolete: rewritten using amend as 2:a468dc9b3633 |
|
67 | | obsolete: rewritten using amend as 2:a468dc9b3633 | |
68 | | summary: A0 |
|
68 | | summary: A0 | |
69 | | |
|
69 | | | |
70 | o changeset: 0:ea207398892e |
|
70 | o changeset: 0:ea207398892e | |
71 | user: test |
|
71 | user: test | |
72 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
72 | date: Thu Jan 01 00:00:00 1970 +0000 | |
73 | summary: ROOT |
|
73 | summary: ROOT | |
74 |
|
74 | |||
75 | Check templates |
|
75 | Check templates | |
76 | --------------- |
|
76 | --------------- | |
77 | $ hg up 'desc(A0)' --hidden |
|
77 | $ hg up 'desc(A0)' --hidden | |
78 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
78 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
79 | updated to hidden changeset 471f378eab4c |
|
79 | updated to hidden changeset 471f378eab4c | |
80 | (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9) |
|
80 | (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9) | |
81 |
|
81 | |||
82 | Predecessors template should show current revision as it is the working copy |
|
82 | Predecessors template should show current revision as it is the working copy | |
83 | $ hg tlog |
|
83 | $ hg tlog | |
84 | o d004c8f274b9 |
|
84 | o d004c8f274b9 | |
85 | | Predecessors: 1:471f378eab4c |
|
85 | | Predecessors: 1:471f378eab4c | |
86 | | semi-colon: 1:471f378eab4c |
|
86 | | semi-colon: 1:471f378eab4c | |
87 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
87 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
88 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
88 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
89 | | @ 471f378eab4c |
|
89 | | @ 471f378eab4c | |
90 | |/ Successors: 3:d004c8f274b9 |
|
90 | |/ Successors: 3:d004c8f274b9 | |
91 | | multi-line: 3:d004c8f274b9 |
|
91 | | multi-line: 3:d004c8f274b9 | |
92 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
|
92 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] | |
93 | o ea207398892e |
|
93 | o ea207398892e | |
94 |
|
94 | |||
95 | $ hg fatelog |
|
95 | $ hg fatelog | |
96 | o d004c8f274b9 |
|
96 | o d004c8f274b9 | |
97 | | |
|
97 | | | |
98 | | @ 471f378eab4c |
|
98 | | @ 471f378eab4c | |
99 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
|
99 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); | |
100 | o ea207398892e |
|
100 | o ea207398892e | |
101 |
|
101 | |||
102 |
|
102 | |||
103 | $ hg fatelogkw |
|
103 | $ hg fatelogkw | |
104 | o d004c8f274b9 |
|
104 | o d004c8f274b9 | |
105 | | |
|
105 | | | |
106 | | @ 471f378eab4c |
|
106 | | @ 471f378eab4c | |
107 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 |
|
107 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 | |
108 | o ea207398892e |
|
108 | o ea207398892e | |
109 |
|
109 | |||
110 |
|
110 | |||
111 | $ hg log -G --config ui.logtemplate= |
|
111 | $ hg log -G --config ui.logtemplate= | |
112 | o changeset: 3:d004c8f274b9 |
|
112 | o changeset: 3:d004c8f274b9 | |
113 | | tag: tip |
|
113 | | tag: tip | |
114 | | parent: 0:ea207398892e |
|
114 | | parent: 0:ea207398892e | |
115 | | user: test |
|
115 | | user: test | |
116 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
116 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
117 | | summary: A2 |
|
117 | | summary: A2 | |
118 | | |
|
118 | | | |
119 | | @ changeset: 1:471f378eab4c |
|
119 | | @ changeset: 1:471f378eab4c | |
120 | |/ user: test |
|
120 | |/ user: test | |
121 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
121 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
122 | | obsolete: rewritten using amend as 3:d004c8f274b9 by test, test2 |
|
122 | | obsolete: rewritten using amend as 3:d004c8f274b9 by test, test2 | |
123 | | summary: A0 |
|
123 | | summary: A0 | |
124 | | |
|
124 | | | |
125 | o changeset: 0:ea207398892e |
|
125 | o changeset: 0:ea207398892e | |
126 | user: test |
|
126 | user: test | |
127 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
127 | date: Thu Jan 01 00:00:00 1970 +0000 | |
128 | summary: ROOT |
|
128 | summary: ROOT | |
129 |
|
129 | |||
130 |
|
130 | |||
131 | $ hg log -G -T "default" |
|
131 | $ hg log -G -T "default" | |
132 | o changeset: 3:d004c8f274b9 |
|
132 | o changeset: 3:d004c8f274b9 | |
133 | | tag: tip |
|
133 | | tag: tip | |
134 | | parent: 0:ea207398892e |
|
134 | | parent: 0:ea207398892e | |
135 | | user: test |
|
135 | | user: test | |
136 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
136 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
137 | | summary: A2 |
|
137 | | summary: A2 | |
138 | | |
|
138 | | | |
139 | | @ changeset: 1:471f378eab4c |
|
139 | | @ changeset: 1:471f378eab4c | |
140 | |/ user: test |
|
140 | |/ user: test | |
141 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
141 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
142 | | obsolete: rewritten using amend as 3:d004c8f274b9 by test, test2 |
|
142 | | obsolete: rewritten using amend as 3:d004c8f274b9 by test, test2 | |
143 | | summary: A0 |
|
143 | | summary: A0 | |
144 | | |
|
144 | | | |
145 | o changeset: 0:ea207398892e |
|
145 | o changeset: 0:ea207398892e | |
146 | user: test |
|
146 | user: test | |
147 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
147 | date: Thu Jan 01 00:00:00 1970 +0000 | |
148 | summary: ROOT |
|
148 | summary: ROOT | |
149 |
|
149 | |||
150 | $ hg up 'desc(A1)' --hidden |
|
150 | $ hg up 'desc(A1)' --hidden | |
151 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
151 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
152 | updated to hidden changeset a468dc9b3633 |
|
152 | updated to hidden changeset a468dc9b3633 | |
153 | (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9) |
|
153 | (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9) | |
154 |
|
154 | |||
155 | Predecessors template should show current revision as it is the working copy |
|
155 | Predecessors template should show current revision as it is the working copy | |
156 | $ hg tlog |
|
156 | $ hg tlog | |
157 | o d004c8f274b9 |
|
157 | o d004c8f274b9 | |
158 | | Predecessors: 2:a468dc9b3633 |
|
158 | | Predecessors: 2:a468dc9b3633 | |
159 | | semi-colon: 2:a468dc9b3633 |
|
159 | | semi-colon: 2:a468dc9b3633 | |
160 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
|
160 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] | |
161 | | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
|
161 | | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad | |
162 | | @ a468dc9b3633 |
|
162 | | @ a468dc9b3633 | |
163 | |/ Successors: 3:d004c8f274b9 |
|
163 | |/ Successors: 3:d004c8f274b9 | |
164 | | multi-line: 3:d004c8f274b9 |
|
164 | | multi-line: 3:d004c8f274b9 | |
165 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
|
165 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] | |
166 | o ea207398892e |
|
166 | o ea207398892e | |
167 |
|
167 | |||
168 | $ hg fatelog |
|
168 | $ hg fatelog | |
169 | o d004c8f274b9 |
|
169 | o d004c8f274b9 | |
170 | | |
|
170 | | | |
171 | | @ a468dc9b3633 |
|
171 | | @ a468dc9b3633 | |
172 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
|
172 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); | |
173 | o ea207398892e |
|
173 | o ea207398892e | |
174 |
|
174 | |||
175 | Predecessors template should show all the predecessors as we force their display |
|
175 | Predecessors template should show all the predecessors as we force their display | |
176 | with --hidden |
|
176 | with --hidden | |
177 | $ hg tlog --hidden |
|
177 | $ hg tlog --hidden | |
178 | o d004c8f274b9 |
|
178 | o d004c8f274b9 | |
179 | | Predecessors: 2:a468dc9b3633 |
|
179 | | Predecessors: 2:a468dc9b3633 | |
180 | | semi-colon: 2:a468dc9b3633 |
|
180 | | semi-colon: 2:a468dc9b3633 | |
181 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
|
181 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] | |
182 | | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
|
182 | | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad | |
183 | | @ a468dc9b3633 |
|
183 | | @ a468dc9b3633 | |
184 | |/ Predecessors: 1:471f378eab4c |
|
184 | |/ Predecessors: 1:471f378eab4c | |
185 | | semi-colon: 1:471f378eab4c |
|
185 | | semi-colon: 1:471f378eab4c | |
186 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
186 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
187 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
187 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
188 | | Successors: 3:d004c8f274b9 |
|
188 | | Successors: 3:d004c8f274b9 | |
189 | | multi-line: 3:d004c8f274b9 |
|
189 | | multi-line: 3:d004c8f274b9 | |
190 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
|
190 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] | |
191 | | x 471f378eab4c |
|
191 | | x 471f378eab4c | |
192 | |/ Successors: 2:a468dc9b3633 |
|
192 | |/ Successors: 2:a468dc9b3633 | |
193 | | multi-line: 2:a468dc9b3633 |
|
193 | | multi-line: 2:a468dc9b3633 | |
194 | | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
|
194 | | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] | |
195 | o ea207398892e |
|
195 | o ea207398892e | |
196 |
|
196 | |||
197 | $ hg fatelog --hidden |
|
197 | $ hg fatelog --hidden | |
198 | o d004c8f274b9 |
|
198 | o d004c8f274b9 | |
199 | | |
|
199 | | | |
200 | | @ a468dc9b3633 |
|
200 | | @ a468dc9b3633 | |
201 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
|
201 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); | |
202 | | x 471f378eab4c |
|
202 | | x 471f378eab4c | |
203 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000); |
|
203 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000); | |
204 | o ea207398892e |
|
204 | o ea207398892e | |
205 |
|
205 | |||
206 |
|
206 | |||
207 | Predecessors template shouldn't show anything as all obsolete commit are not |
|
207 | Predecessors template shouldn't show anything as all obsolete commit are not | |
208 | visible. |
|
208 | visible. | |
209 | $ hg up 'desc(A2)' |
|
209 | $ hg up 'desc(A2)' | |
210 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
210 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
211 | $ hg tlog |
|
211 | $ hg tlog | |
212 | @ d004c8f274b9 |
|
212 | @ d004c8f274b9 | |
213 | | |
|
213 | | | |
214 | o ea207398892e |
|
214 | o ea207398892e | |
215 |
|
215 | |||
216 | $ hg tlog --hidden |
|
216 | $ hg tlog --hidden | |
217 | @ d004c8f274b9 |
|
217 | @ d004c8f274b9 | |
218 | | Predecessors: 2:a468dc9b3633 |
|
218 | | Predecessors: 2:a468dc9b3633 | |
219 | | semi-colon: 2:a468dc9b3633 |
|
219 | | semi-colon: 2:a468dc9b3633 | |
220 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] |
|
220 | | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"] | |
221 | | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad |
|
221 | | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad | |
222 | | x a468dc9b3633 |
|
222 | | x a468dc9b3633 | |
223 | |/ Predecessors: 1:471f378eab4c |
|
223 | |/ Predecessors: 1:471f378eab4c | |
224 | | semi-colon: 1:471f378eab4c |
|
224 | | semi-colon: 1:471f378eab4c | |
225 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
225 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
226 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
226 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
227 | | Successors: 3:d004c8f274b9 |
|
227 | | Successors: 3:d004c8f274b9 | |
228 | | multi-line: 3:d004c8f274b9 |
|
228 | | multi-line: 3:d004c8f274b9 | |
229 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] |
|
229 | | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] | |
230 | | x 471f378eab4c |
|
230 | | x 471f378eab4c | |
231 | |/ Successors: 2:a468dc9b3633 |
|
231 | |/ Successors: 2:a468dc9b3633 | |
232 | | multi-line: 2:a468dc9b3633 |
|
232 | | multi-line: 2:a468dc9b3633 | |
233 | | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] |
|
233 | | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]] | |
234 | o ea207398892e |
|
234 | o ea207398892e | |
235 |
|
235 | |||
236 | $ hg fatelog |
|
236 | $ hg fatelog | |
237 | @ d004c8f274b9 |
|
237 | @ d004c8f274b9 | |
238 | | |
|
238 | | | |
239 | o ea207398892e |
|
239 | o ea207398892e | |
240 |
|
240 | |||
241 |
|
241 | |||
242 | $ hg fatelog --hidden |
|
242 | $ hg fatelog --hidden | |
243 | @ d004c8f274b9 |
|
243 | @ d004c8f274b9 | |
244 | | |
|
244 | | | |
245 | | x a468dc9b3633 |
|
245 | | x a468dc9b3633 | |
246 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
|
246 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); | |
247 | | x 471f378eab4c |
|
247 | | x 471f378eab4c | |
248 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000); |
|
248 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000); | |
249 | o ea207398892e |
|
249 | o ea207398892e | |
250 |
|
250 | |||
251 | $ hg fatelogjson --hidden |
|
251 | $ hg fatelogjson --hidden | |
252 | @ d004c8f274b9 |
|
252 | @ d004c8f274b9 | |
253 | | |
|
253 | | | |
254 | | x a468dc9b3633 |
|
254 | | x a468dc9b3633 | |
255 | |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}] |
|
255 | |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}] | |
256 | | x 471f378eab4c |
|
256 | | x 471f378eab4c | |
257 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}] |
|
257 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}] | |
258 | o ea207398892e |
|
258 | o ea207398892e | |
259 |
|
259 | |||
260 |
|
260 | |||
261 | Check other fatelog implementations |
|
261 | Check other fatelog implementations | |
262 | ----------------------------------- |
|
262 | ----------------------------------- | |
263 |
|
263 | |||
264 | $ hg fatelogkw --hidden -q |
|
264 | $ hg fatelogkw --hidden -q | |
265 | @ d004c8f274b9 |
|
265 | @ d004c8f274b9 | |
266 | | |
|
266 | | | |
267 | | x a468dc9b3633 |
|
267 | | x a468dc9b3633 | |
268 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 |
|
268 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 | |
269 | | x 471f378eab4c |
|
269 | | x 471f378eab4c | |
270 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 |
|
270 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 | |
271 | o ea207398892e |
|
271 | o ea207398892e | |
272 |
|
272 | |||
273 | $ hg fatelogkw --hidden |
|
273 | $ hg fatelogkw --hidden | |
274 | @ d004c8f274b9 |
|
274 | @ d004c8f274b9 | |
275 | | |
|
275 | | | |
276 | | x a468dc9b3633 |
|
276 | | x a468dc9b3633 | |
277 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 |
|
277 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 | |
278 | | x 471f378eab4c |
|
278 | | x 471f378eab4c | |
279 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 |
|
279 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 | |
280 | o ea207398892e |
|
280 | o ea207398892e | |
281 |
|
281 | |||
282 | $ hg fatelogkw --hidden -v |
|
282 | $ hg fatelogkw --hidden -v | |
283 | @ d004c8f274b9 |
|
283 | @ d004c8f274b9 | |
284 | | |
|
284 | | | |
285 | | x a468dc9b3633 |
|
285 | | x a468dc9b3633 | |
286 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) |
|
286 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) | |
287 | | x 471f378eab4c |
|
287 | | x 471f378eab4c | |
288 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) |
|
288 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) | |
289 | o ea207398892e |
|
289 | o ea207398892e | |
290 |
|
290 | |||
291 |
|
291 | |||
292 | $ hg log -G -T "default" --hidden |
|
292 | $ hg log -G -T "default" --hidden | |
293 | @ changeset: 3:d004c8f274b9 |
|
293 | @ changeset: 3:d004c8f274b9 | |
294 | | tag: tip |
|
294 | | tag: tip | |
295 | | parent: 0:ea207398892e |
|
295 | | parent: 0:ea207398892e | |
296 | | user: test |
|
296 | | user: test | |
297 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
297 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
298 | | summary: A2 |
|
298 | | summary: A2 | |
299 | | |
|
299 | | | |
300 | | x changeset: 2:a468dc9b3633 |
|
300 | | x changeset: 2:a468dc9b3633 | |
301 | |/ parent: 0:ea207398892e |
|
301 | |/ parent: 0:ea207398892e | |
302 | | user: test |
|
302 | | user: test | |
303 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
303 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
304 | | obsolete: rewritten using amend as 3:d004c8f274b9 by test2 |
|
304 | | obsolete: rewritten using amend as 3:d004c8f274b9 by test2 | |
305 | | summary: A1 |
|
305 | | summary: A1 | |
306 | | |
|
306 | | | |
307 | | x changeset: 1:471f378eab4c |
|
307 | | x changeset: 1:471f378eab4c | |
308 | |/ user: test |
|
308 | |/ user: test | |
309 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
309 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
310 | | obsolete: rewritten using amend as 2:a468dc9b3633 |
|
310 | | obsolete: rewritten using amend as 2:a468dc9b3633 | |
311 | | summary: A0 |
|
311 | | summary: A0 | |
312 | | |
|
312 | | | |
313 | o changeset: 0:ea207398892e |
|
313 | o changeset: 0:ea207398892e | |
314 | user: test |
|
314 | user: test | |
315 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
315 | date: Thu Jan 01 00:00:00 1970 +0000 | |
316 | summary: ROOT |
|
316 | summary: ROOT | |
317 |
|
317 | |||
318 | $ hg log -G -T "default" --hidden -v |
|
318 | $ hg log -G -T "default" --hidden -v | |
319 | @ changeset: 3:d004c8f274b9 |
|
319 | @ changeset: 3:d004c8f274b9 | |
320 | | tag: tip |
|
320 | | tag: tip | |
321 | | parent: 0:ea207398892e |
|
321 | | parent: 0:ea207398892e | |
322 | | user: test |
|
322 | | user: test | |
323 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
323 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
324 | | files: A0 |
|
324 | | files: A0 | |
325 | | description: |
|
325 | | description: | |
326 | | A2 |
|
326 | | A2 | |
327 | | |
|
327 | | | |
328 | | |
|
328 | | | |
329 | | x changeset: 2:a468dc9b3633 |
|
329 | | x changeset: 2:a468dc9b3633 | |
330 | |/ parent: 0:ea207398892e |
|
330 | |/ parent: 0:ea207398892e | |
331 | | user: test |
|
331 | | user: test | |
332 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
332 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
333 | | obsolete: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) |
|
333 | | obsolete: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) | |
334 | | files: A0 |
|
334 | | files: A0 | |
335 | | description: |
|
335 | | description: | |
336 | | A1 |
|
336 | | A1 | |
337 | | |
|
337 | | | |
338 | | |
|
338 | | | |
339 | | x changeset: 1:471f378eab4c |
|
339 | | x changeset: 1:471f378eab4c | |
340 | |/ user: test |
|
340 | |/ user: test | |
341 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
341 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
342 | | obsolete: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) |
|
342 | | obsolete: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) | |
343 | | files: A0 |
|
343 | | files: A0 | |
344 | | description: |
|
344 | | description: | |
345 | | A0 |
|
345 | | A0 | |
346 | | |
|
346 | | | |
347 | | |
|
347 | | | |
348 | o changeset: 0:ea207398892e |
|
348 | o changeset: 0:ea207398892e | |
349 | user: test |
|
349 | user: test | |
350 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
350 | date: Thu Jan 01 00:00:00 1970 +0000 | |
351 | files: ROOT |
|
351 | files: ROOT | |
352 | description: |
|
352 | description: | |
353 | ROOT |
|
353 | ROOT | |
354 |
|
354 | |||
355 |
|
355 | |||
356 | Test templates with splitted commit |
|
356 | Test templates with splitted commit | |
357 | =================================== |
|
357 | =================================== | |
358 |
|
358 | |||
359 | $ hg init $TESTTMP/templates-local-split |
|
359 | $ hg init $TESTTMP/templates-local-split | |
360 | $ cd $TESTTMP/templates-local-split |
|
360 | $ cd $TESTTMP/templates-local-split | |
361 | $ mkcommit ROOT |
|
361 | $ mkcommit ROOT | |
362 | $ echo 42 >> a |
|
362 | $ echo 42 >> a | |
363 | $ echo 43 >> b |
|
363 | $ echo 43 >> b | |
364 | $ hg commit -A -m "A0" |
|
364 | $ hg commit -A -m "A0" | |
365 | adding a |
|
365 | adding a | |
366 | adding b |
|
366 | adding b | |
367 | $ hg log --hidden -G |
|
367 | $ hg log --hidden -G | |
368 | @ changeset: 1:471597cad322 |
|
368 | @ changeset: 1:471597cad322 | |
369 | | tag: tip |
|
369 | | tag: tip | |
370 | | user: test |
|
370 | | user: test | |
371 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
371 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
372 | | summary: A0 |
|
372 | | summary: A0 | |
373 | | |
|
373 | | | |
374 | o changeset: 0:ea207398892e |
|
374 | o changeset: 0:ea207398892e | |
375 | user: test |
|
375 | user: test | |
376 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
376 | date: Thu Jan 01 00:00:00 1970 +0000 | |
377 | summary: ROOT |
|
377 | summary: ROOT | |
378 |
|
378 | |||
379 | # Simulate split |
|
379 | # Simulate split | |
380 | $ hg up -r "desc(ROOT)" |
|
380 | $ hg up -r "desc(ROOT)" | |
381 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
381 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
382 | $ echo 42 >> a |
|
382 | $ echo 42 >> a | |
383 | $ hg commit -A -m "A0" |
|
383 | $ hg commit -A -m "A0" | |
384 | adding a |
|
384 | adding a | |
385 | created new head |
|
385 | created new head | |
386 | $ echo 43 >> b |
|
386 | $ echo 43 >> b | |
387 | $ hg commit -A -m "A0" |
|
387 | $ hg commit -A -m "A0" | |
388 | adding b |
|
388 | adding b | |
389 | $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` |
|
389 | $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` | |
390 | obsoleted 1 changesets |
|
390 | obsoleted 1 changesets | |
391 |
|
391 | |||
392 | $ hg log --hidden -G |
|
392 | $ hg log --hidden -G | |
393 | @ changeset: 3:f257fde29c7a |
|
393 | @ changeset: 3:f257fde29c7a | |
394 | | tag: tip |
|
394 | | tag: tip | |
395 | | user: test |
|
395 | | user: test | |
396 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
396 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
397 | | summary: A0 |
|
397 | | summary: A0 | |
398 | | |
|
398 | | | |
399 | o changeset: 2:337fec4d2edc |
|
399 | o changeset: 2:337fec4d2edc | |
400 | | parent: 0:ea207398892e |
|
400 | | parent: 0:ea207398892e | |
401 | | user: test |
|
401 | | user: test | |
402 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
402 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
403 | | summary: A0 |
|
403 | | summary: A0 | |
404 | | |
|
404 | | | |
405 | | x changeset: 1:471597cad322 |
|
405 | | x changeset: 1:471597cad322 | |
406 | |/ user: test |
|
406 | |/ user: test | |
407 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
407 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
408 | | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a |
|
408 | | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a | |
409 | | summary: A0 |
|
409 | | summary: A0 | |
410 | | |
|
410 | | | |
411 | o changeset: 0:ea207398892e |
|
411 | o changeset: 0:ea207398892e | |
412 | user: test |
|
412 | user: test | |
413 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
413 | date: Thu Jan 01 00:00:00 1970 +0000 | |
414 | summary: ROOT |
|
414 | summary: ROOT | |
415 |
|
415 | |||
416 | Check templates |
|
416 | Check templates | |
417 | --------------- |
|
417 | --------------- | |
418 |
|
418 | |||
419 | $ hg up 'obsolete()' --hidden |
|
419 | $ hg up 'obsolete()' --hidden | |
420 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
420 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
421 | updated to hidden changeset 471597cad322 |
|
421 | updated to hidden changeset 471597cad322 | |
422 | (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) |
|
422 | (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) | |
423 |
|
423 | |||
424 | Predecessors template should show current revision as it is the working copy |
|
424 | Predecessors template should show current revision as it is the working copy | |
425 | $ hg tlog |
|
425 | $ hg tlog | |
426 | o f257fde29c7a |
|
426 | o f257fde29c7a | |
427 | | Predecessors: 1:471597cad322 |
|
427 | | Predecessors: 1:471597cad322 | |
428 | | semi-colon: 1:471597cad322 |
|
428 | | semi-colon: 1:471597cad322 | |
429 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
|
429 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] | |
430 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
|
430 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 | |
431 | o 337fec4d2edc |
|
431 | o 337fec4d2edc | |
432 | | Predecessors: 1:471597cad322 |
|
432 | | Predecessors: 1:471597cad322 | |
433 | | semi-colon: 1:471597cad322 |
|
433 | | semi-colon: 1:471597cad322 | |
434 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
|
434 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] | |
435 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
|
435 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 | |
436 | | @ 471597cad322 |
|
436 | | @ 471597cad322 | |
437 | |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
|
437 | |/ Successors: 2:337fec4d2edc 3:f257fde29c7a | |
438 | | multi-line: 2:337fec4d2edc 3:f257fde29c7a |
|
438 | | multi-line: 2:337fec4d2edc 3:f257fde29c7a | |
439 | | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] |
|
439 | | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] | |
440 | o ea207398892e |
|
440 | o ea207398892e | |
441 |
|
441 | |||
442 |
|
442 | |||
443 | $ hg fatelog |
|
443 | $ hg fatelog | |
444 | o f257fde29c7a |
|
444 | o f257fde29c7a | |
445 | | |
|
445 | | | |
446 | o 337fec4d2edc |
|
446 | o 337fec4d2edc | |
447 | | |
|
447 | | | |
448 | | @ 471597cad322 |
|
448 | | @ 471597cad322 | |
449 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000); |
|
449 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000); | |
450 | o ea207398892e |
|
450 | o ea207398892e | |
451 |
|
451 | |||
452 | $ hg up f257fde29c7a |
|
452 | $ hg up f257fde29c7a | |
453 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
453 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
454 |
|
454 | |||
455 | Predecessors template should not show a predecessor as it's not displayed in |
|
455 | Predecessors template should not show a predecessor as it's not displayed in | |
456 | the log |
|
456 | the log | |
457 | $ hg tlog |
|
457 | $ hg tlog | |
458 | @ f257fde29c7a |
|
458 | @ f257fde29c7a | |
459 | | |
|
459 | | | |
460 | o 337fec4d2edc |
|
460 | o 337fec4d2edc | |
461 | | |
|
461 | | | |
462 | o ea207398892e |
|
462 | o ea207398892e | |
463 |
|
463 | |||
464 | Predecessors template should show both predecessors as we force their display |
|
464 | Predecessors template should show both predecessors as we force their display | |
465 | with --hidden |
|
465 | with --hidden | |
466 | $ hg tlog --hidden |
|
466 | $ hg tlog --hidden | |
467 | @ f257fde29c7a |
|
467 | @ f257fde29c7a | |
468 | | Predecessors: 1:471597cad322 |
|
468 | | Predecessors: 1:471597cad322 | |
469 | | semi-colon: 1:471597cad322 |
|
469 | | semi-colon: 1:471597cad322 | |
470 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
|
470 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] | |
471 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
|
471 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 | |
472 | o 337fec4d2edc |
|
472 | o 337fec4d2edc | |
473 | | Predecessors: 1:471597cad322 |
|
473 | | Predecessors: 1:471597cad322 | |
474 | | semi-colon: 1:471597cad322 |
|
474 | | semi-colon: 1:471597cad322 | |
475 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] |
|
475 | | json: ["471597cad322d1f659bb169751be9133dad92ef3"] | |
476 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 |
|
476 | | map: 1:471597cad322d1f659bb169751be9133dad92ef3 | |
477 | | x 471597cad322 |
|
477 | | x 471597cad322 | |
478 | |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
|
478 | |/ Successors: 2:337fec4d2edc 3:f257fde29c7a | |
479 | | multi-line: 2:337fec4d2edc 3:f257fde29c7a |
|
479 | | multi-line: 2:337fec4d2edc 3:f257fde29c7a | |
480 | | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] |
|
480 | | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]] | |
481 | o ea207398892e |
|
481 | o ea207398892e | |
482 |
|
482 | |||
483 |
|
483 | |||
484 | $ hg fatelog --hidden |
|
484 | $ hg fatelog --hidden | |
485 | @ f257fde29c7a |
|
485 | @ f257fde29c7a | |
486 | | |
|
486 | | | |
487 | o 337fec4d2edc |
|
487 | o 337fec4d2edc | |
488 | | |
|
488 | | | |
489 | | x 471597cad322 |
|
489 | | x 471597cad322 | |
490 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000); |
|
490 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000); | |
491 | o ea207398892e |
|
491 | o ea207398892e | |
492 |
|
492 | |||
493 | $ hg fatelogjson --hidden |
|
493 | $ hg fatelogjson --hidden | |
494 | @ f257fde29c7a |
|
494 | @ f257fde29c7a | |
495 | | |
|
495 | | | |
496 | o 337fec4d2edc |
|
496 | o 337fec4d2edc | |
497 | | |
|
497 | | | |
498 | | x 471597cad322 |
|
498 | | x 471597cad322 | |
499 | |/ Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}] |
|
499 | |/ Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}] | |
500 | o ea207398892e |
|
500 | o ea207398892e | |
501 |
|
501 | |||
502 | Check other fatelog implementations |
|
502 | Check other fatelog implementations | |
503 | ----------------------------------- |
|
503 | ----------------------------------- | |
504 |
|
504 | |||
505 | $ hg fatelogkw --hidden -q |
|
505 | $ hg fatelogkw --hidden -q | |
506 | @ f257fde29c7a |
|
506 | @ f257fde29c7a | |
507 | | |
|
507 | | | |
508 | o 337fec4d2edc |
|
508 | o 337fec4d2edc | |
509 | | |
|
509 | | | |
510 | | x 471597cad322 |
|
510 | | x 471597cad322 | |
511 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a |
|
511 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a | |
512 | o ea207398892e |
|
512 | o ea207398892e | |
513 |
|
513 | |||
514 | $ hg fatelogkw --hidden |
|
514 | $ hg fatelogkw --hidden | |
515 | @ f257fde29c7a |
|
515 | @ f257fde29c7a | |
516 | | |
|
516 | | | |
517 | o 337fec4d2edc |
|
517 | o 337fec4d2edc | |
518 | | |
|
518 | | | |
519 | | x 471597cad322 |
|
519 | | x 471597cad322 | |
520 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a |
|
520 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a | |
521 | o ea207398892e |
|
521 | o ea207398892e | |
522 |
|
522 | |||
523 | $ hg fatelogkw --hidden -v |
|
523 | $ hg fatelogkw --hidden -v | |
524 | @ f257fde29c7a |
|
524 | @ f257fde29c7a | |
525 | | |
|
525 | | | |
526 | o 337fec4d2edc |
|
526 | o 337fec4d2edc | |
527 | | |
|
527 | | | |
528 | | x 471597cad322 |
|
528 | | x 471597cad322 | |
529 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000) |
|
529 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000) | |
530 | o ea207398892e |
|
530 | o ea207398892e | |
531 |
|
531 | |||
532 |
|
532 | |||
533 | $ hg log -G -T "default" --hidden |
|
533 | $ hg log -G -T "default" --hidden | |
534 | @ changeset: 3:f257fde29c7a |
|
534 | @ changeset: 3:f257fde29c7a | |
535 | | tag: tip |
|
535 | | tag: tip | |
536 | | user: test |
|
536 | | user: test | |
537 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
537 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
538 | | summary: A0 |
|
538 | | summary: A0 | |
539 | | |
|
539 | | | |
540 | o changeset: 2:337fec4d2edc |
|
540 | o changeset: 2:337fec4d2edc | |
541 | | parent: 0:ea207398892e |
|
541 | | parent: 0:ea207398892e | |
542 | | user: test |
|
542 | | user: test | |
543 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
543 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
544 | | summary: A0 |
|
544 | | summary: A0 | |
545 | | |
|
545 | | | |
546 | | x changeset: 1:471597cad322 |
|
546 | | x changeset: 1:471597cad322 | |
547 | |/ user: test |
|
547 | |/ user: test | |
548 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
548 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
549 | | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a |
|
549 | | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a | |
550 | | summary: A0 |
|
550 | | summary: A0 | |
551 | | |
|
551 | | | |
552 | o changeset: 0:ea207398892e |
|
552 | o changeset: 0:ea207398892e | |
553 | user: test |
|
553 | user: test | |
554 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
554 | date: Thu Jan 01 00:00:00 1970 +0000 | |
555 | summary: ROOT |
|
555 | summary: ROOT | |
556 |
|
556 | |||
557 |
|
557 | |||
558 | Test templates with folded commit |
|
558 | Test templates with folded commit | |
559 | ================================= |
|
559 | ================================= | |
560 |
|
560 | |||
561 | Test setup |
|
561 | Test setup | |
562 | ---------- |
|
562 | ---------- | |
563 |
|
563 | |||
564 | $ hg init $TESTTMP/templates-local-fold |
|
564 | $ hg init $TESTTMP/templates-local-fold | |
565 | $ cd $TESTTMP/templates-local-fold |
|
565 | $ cd $TESTTMP/templates-local-fold | |
566 | $ mkcommit ROOT |
|
566 | $ mkcommit ROOT | |
567 | $ mkcommit A0 |
|
567 | $ mkcommit A0 | |
568 | $ mkcommit B0 |
|
568 | $ mkcommit B0 | |
569 | $ hg log --hidden -G |
|
569 | $ hg log --hidden -G | |
570 | @ changeset: 2:0dec01379d3b |
|
570 | @ changeset: 2:0dec01379d3b | |
571 | | tag: tip |
|
571 | | tag: tip | |
572 | | user: test |
|
572 | | user: test | |
573 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
573 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
574 | | summary: B0 |
|
574 | | summary: B0 | |
575 | | |
|
575 | | | |
576 | o changeset: 1:471f378eab4c |
|
576 | o changeset: 1:471f378eab4c | |
577 | | user: test |
|
577 | | user: test | |
578 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
578 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
579 | | summary: A0 |
|
579 | | summary: A0 | |
580 | | |
|
580 | | | |
581 | o changeset: 0:ea207398892e |
|
581 | o changeset: 0:ea207398892e | |
582 | user: test |
|
582 | user: test | |
583 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
583 | date: Thu Jan 01 00:00:00 1970 +0000 | |
584 | summary: ROOT |
|
584 | summary: ROOT | |
585 |
|
585 | |||
586 | Simulate a fold |
|
586 | Simulate a fold | |
587 | $ hg up -r "desc(ROOT)" |
|
587 | $ hg up -r "desc(ROOT)" | |
588 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
588 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
589 | $ echo "A0" > A0 |
|
589 | $ echo "A0" > A0 | |
590 | $ echo "B0" > B0 |
|
590 | $ echo "B0" > B0 | |
591 | $ hg commit -A -m "C0" |
|
591 | $ hg commit -A -m "C0" | |
592 | adding A0 |
|
592 | adding A0 | |
593 | adding B0 |
|
593 | adding B0 | |
594 | created new head |
|
594 | created new head | |
595 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
|
595 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` | |
596 | obsoleted 1 changesets |
|
596 | obsoleted 1 changesets | |
597 | 1 new orphan changesets |
|
597 | 1 new orphan changesets | |
598 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
|
598 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` | |
599 | obsoleted 1 changesets |
|
599 | obsoleted 1 changesets | |
600 |
|
600 | |||
601 | $ hg log --hidden -G |
|
601 | $ hg log --hidden -G | |
602 | @ changeset: 3:eb5a0daa2192 |
|
602 | @ changeset: 3:eb5a0daa2192 | |
603 | | tag: tip |
|
603 | | tag: tip | |
604 | | parent: 0:ea207398892e |
|
604 | | parent: 0:ea207398892e | |
605 | | user: test |
|
605 | | user: test | |
606 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
606 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
607 | | summary: C0 |
|
607 | | summary: C0 | |
608 | | |
|
608 | | | |
609 | | x changeset: 2:0dec01379d3b |
|
609 | | x changeset: 2:0dec01379d3b | |
610 | | | user: test |
|
610 | | | user: test | |
611 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
611 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
612 | | | obsolete: rewritten as 3:eb5a0daa2192 |
|
612 | | | obsolete: rewritten as 3:eb5a0daa2192 | |
613 | | | summary: B0 |
|
613 | | | summary: B0 | |
614 | | | |
|
614 | | | | |
615 | | x changeset: 1:471f378eab4c |
|
615 | | x changeset: 1:471f378eab4c | |
616 | |/ user: test |
|
616 | |/ user: test | |
617 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
617 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
618 | | obsolete: rewritten as 3:eb5a0daa2192 |
|
618 | | obsolete: rewritten as 3:eb5a0daa2192 | |
619 | | summary: A0 |
|
619 | | summary: A0 | |
620 | | |
|
620 | | | |
621 | o changeset: 0:ea207398892e |
|
621 | o changeset: 0:ea207398892e | |
622 | user: test |
|
622 | user: test | |
623 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
623 | date: Thu Jan 01 00:00:00 1970 +0000 | |
624 | summary: ROOT |
|
624 | summary: ROOT | |
625 |
|
625 | |||
626 | Check templates |
|
626 | Check templates | |
627 | --------------- |
|
627 | --------------- | |
628 |
|
628 | |||
629 | $ hg up 'desc(A0)' --hidden |
|
629 | $ hg up 'desc(A0)' --hidden | |
630 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
630 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
631 | updated to hidden changeset 471f378eab4c |
|
631 | updated to hidden changeset 471f378eab4c | |
632 | (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) |
|
632 | (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) | |
633 |
|
633 | |||
634 | Predecessors template should show current revision as it is the working copy |
|
634 | Predecessors template should show current revision as it is the working copy | |
635 | $ hg tlog |
|
635 | $ hg tlog | |
636 | o eb5a0daa2192 |
|
636 | o eb5a0daa2192 | |
637 | | Predecessors: 1:471f378eab4c |
|
637 | | Predecessors: 1:471f378eab4c | |
638 | | semi-colon: 1:471f378eab4c |
|
638 | | semi-colon: 1:471f378eab4c | |
639 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
639 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
640 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
640 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
641 | | @ 471f378eab4c |
|
641 | | @ 471f378eab4c | |
642 | |/ Successors: 3:eb5a0daa2192 |
|
642 | |/ Successors: 3:eb5a0daa2192 | |
643 | | multi-line: 3:eb5a0daa2192 |
|
643 | | multi-line: 3:eb5a0daa2192 | |
644 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
644 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
645 | o ea207398892e |
|
645 | o ea207398892e | |
646 |
|
646 | |||
647 |
|
647 | |||
648 | $ hg fatelog |
|
648 | $ hg fatelog | |
649 | o eb5a0daa2192 |
|
649 | o eb5a0daa2192 | |
650 | | |
|
650 | | | |
651 | | @ 471f378eab4c |
|
651 | | @ 471f378eab4c | |
652 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
652 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
653 | o ea207398892e |
|
653 | o ea207398892e | |
654 |
|
654 | |||
655 | $ hg up 'desc(B0)' --hidden |
|
655 | $ hg up 'desc(B0)' --hidden | |
656 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
656 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
657 | updated to hidden changeset 0dec01379d3b |
|
657 | updated to hidden changeset 0dec01379d3b | |
658 | (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) |
|
658 | (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) | |
659 |
|
659 | |||
660 | Predecessors template should show both predecessors as they should be both |
|
660 | Predecessors template should show both predecessors as they should be both | |
661 | displayed |
|
661 | displayed | |
662 | $ hg tlog |
|
662 | $ hg tlog | |
663 | o eb5a0daa2192 |
|
663 | o eb5a0daa2192 | |
664 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
|
664 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c | |
665 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
|
665 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c | |
666 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
666 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] | |
667 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
667 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
668 | | @ 0dec01379d3b |
|
668 | | @ 0dec01379d3b | |
669 | | | Successors: 3:eb5a0daa2192 |
|
669 | | | Successors: 3:eb5a0daa2192 | |
670 | | | multi-line: 3:eb5a0daa2192 |
|
670 | | | multi-line: 3:eb5a0daa2192 | |
671 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
671 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
672 | | x 471f378eab4c |
|
672 | | x 471f378eab4c | |
673 | |/ Successors: 3:eb5a0daa2192 |
|
673 | |/ Successors: 3:eb5a0daa2192 | |
674 | | multi-line: 3:eb5a0daa2192 |
|
674 | | multi-line: 3:eb5a0daa2192 | |
675 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
675 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
676 | o ea207398892e |
|
676 | o ea207398892e | |
677 |
|
677 | |||
678 |
|
678 | |||
679 | $ hg fatelog |
|
679 | $ hg fatelog | |
680 | o eb5a0daa2192 |
|
680 | o eb5a0daa2192 | |
681 | | |
|
681 | | | |
682 | | @ 0dec01379d3b |
|
682 | | @ 0dec01379d3b | |
683 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
683 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
684 | | x 471f378eab4c |
|
684 | | x 471f378eab4c | |
685 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
685 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
686 | o ea207398892e |
|
686 | o ea207398892e | |
687 |
|
687 | |||
688 | $ hg up 'desc(C0)' |
|
688 | $ hg up 'desc(C0)' | |
689 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
689 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
690 |
|
690 | |||
691 | Predecessors template should not show predecessors as they are not displayed in |
|
691 | Predecessors template should not show predecessors as they are not displayed in | |
692 | the log |
|
692 | the log | |
693 | $ hg tlog |
|
693 | $ hg tlog | |
694 | @ eb5a0daa2192 |
|
694 | @ eb5a0daa2192 | |
695 | | |
|
695 | | | |
696 | o ea207398892e |
|
696 | o ea207398892e | |
697 |
|
697 | |||
698 | Predecessors template should show both predecessors as we force their display |
|
698 | Predecessors template should show both predecessors as we force their display | |
699 | with --hidden |
|
699 | with --hidden | |
700 | $ hg tlog --hidden |
|
700 | $ hg tlog --hidden | |
701 | @ eb5a0daa2192 |
|
701 | @ eb5a0daa2192 | |
702 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
|
702 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c | |
703 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
|
703 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c | |
704 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
704 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] | |
705 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
705 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
706 | | x 0dec01379d3b |
|
706 | | x 0dec01379d3b | |
707 | | | Successors: 3:eb5a0daa2192 |
|
707 | | | Successors: 3:eb5a0daa2192 | |
708 | | | multi-line: 3:eb5a0daa2192 |
|
708 | | | multi-line: 3:eb5a0daa2192 | |
709 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
709 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
710 | | x 471f378eab4c |
|
710 | | x 471f378eab4c | |
711 | |/ Successors: 3:eb5a0daa2192 |
|
711 | |/ Successors: 3:eb5a0daa2192 | |
712 | | multi-line: 3:eb5a0daa2192 |
|
712 | | multi-line: 3:eb5a0daa2192 | |
713 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
713 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
714 | o ea207398892e |
|
714 | o ea207398892e | |
715 |
|
715 | |||
716 |
|
716 | |||
717 | $ hg fatelog --hidden |
|
717 | $ hg fatelog --hidden | |
718 | @ eb5a0daa2192 |
|
718 | @ eb5a0daa2192 | |
719 | | |
|
719 | | | |
720 | | x 0dec01379d3b |
|
720 | | x 0dec01379d3b | |
721 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
721 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
722 | | x 471f378eab4c |
|
722 | | x 471f378eab4c | |
723 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
723 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
724 | o ea207398892e |
|
724 | o ea207398892e | |
725 |
|
725 | |||
726 |
|
726 | |||
727 | $ hg fatelogjson --hidden |
|
727 | $ hg fatelogjson --hidden | |
728 | @ eb5a0daa2192 |
|
728 | @ eb5a0daa2192 | |
729 | | |
|
729 | | | |
730 | | x 0dec01379d3b |
|
730 | | x 0dec01379d3b | |
731 | | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] |
|
731 | | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] | |
732 | | x 471f378eab4c |
|
732 | | x 471f378eab4c | |
733 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] |
|
733 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] | |
734 | o ea207398892e |
|
734 | o ea207398892e | |
735 |
|
735 | |||
736 | Check other fatelog implementations |
|
736 | Check other fatelog implementations | |
737 | ----------------------------------- |
|
737 | ----------------------------------- | |
738 |
|
738 | |||
739 | $ hg fatelogkw --hidden -q |
|
739 | $ hg fatelogkw --hidden -q | |
740 | @ eb5a0daa2192 |
|
740 | @ eb5a0daa2192 | |
741 | | |
|
741 | | | |
742 | | x 0dec01379d3b |
|
742 | | x 0dec01379d3b | |
743 | | | Obsfate: rewritten as 3:eb5a0daa2192 |
|
743 | | | Obsfate: rewritten as 3:eb5a0daa2192 | |
744 | | x 471f378eab4c |
|
744 | | x 471f378eab4c | |
745 | |/ Obsfate: rewritten as 3:eb5a0daa2192 |
|
745 | |/ Obsfate: rewritten as 3:eb5a0daa2192 | |
746 | o ea207398892e |
|
746 | o ea207398892e | |
747 |
|
747 | |||
748 | $ hg fatelogkw --hidden |
|
748 | $ hg fatelogkw --hidden | |
749 | @ eb5a0daa2192 |
|
749 | @ eb5a0daa2192 | |
750 | | |
|
750 | | | |
751 | | x 0dec01379d3b |
|
751 | | x 0dec01379d3b | |
752 | | | Obsfate: rewritten as 3:eb5a0daa2192 |
|
752 | | | Obsfate: rewritten as 3:eb5a0daa2192 | |
753 | | x 471f378eab4c |
|
753 | | x 471f378eab4c | |
754 | |/ Obsfate: rewritten as 3:eb5a0daa2192 |
|
754 | |/ Obsfate: rewritten as 3:eb5a0daa2192 | |
755 | o ea207398892e |
|
755 | o ea207398892e | |
756 |
|
756 | |||
757 | $ hg fatelogkw --hidden -v |
|
757 | $ hg fatelogkw --hidden -v | |
758 | @ eb5a0daa2192 |
|
758 | @ eb5a0daa2192 | |
759 | | |
|
759 | | | |
760 | | x 0dec01379d3b |
|
760 | | x 0dec01379d3b | |
761 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) |
|
761 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |
762 | | x 471f378eab4c |
|
762 | | x 471f378eab4c | |
763 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) |
|
763 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |
764 | o ea207398892e |
|
764 | o ea207398892e | |
765 |
|
765 | |||
766 | $ hg log -G -T "default" --hidden |
|
766 | $ hg log -G -T "default" --hidden | |
767 | @ changeset: 3:eb5a0daa2192 |
|
767 | @ changeset: 3:eb5a0daa2192 | |
768 | | tag: tip |
|
768 | | tag: tip | |
769 | | parent: 0:ea207398892e |
|
769 | | parent: 0:ea207398892e | |
770 | | user: test |
|
770 | | user: test | |
771 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
771 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
772 | | summary: C0 |
|
772 | | summary: C0 | |
773 | | |
|
773 | | | |
774 | | x changeset: 2:0dec01379d3b |
|
774 | | x changeset: 2:0dec01379d3b | |
775 | | | user: test |
|
775 | | | user: test | |
776 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
776 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
777 | | | obsolete: rewritten as 3:eb5a0daa2192 |
|
777 | | | obsolete: rewritten as 3:eb5a0daa2192 | |
778 | | | summary: B0 |
|
778 | | | summary: B0 | |
779 | | | |
|
779 | | | | |
780 | | x changeset: 1:471f378eab4c |
|
780 | | x changeset: 1:471f378eab4c | |
781 | |/ user: test |
|
781 | |/ user: test | |
782 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
782 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
783 | | obsolete: rewritten as 3:eb5a0daa2192 |
|
783 | | obsolete: rewritten as 3:eb5a0daa2192 | |
784 | | summary: A0 |
|
784 | | summary: A0 | |
785 | | |
|
785 | | | |
786 | o changeset: 0:ea207398892e |
|
786 | o changeset: 0:ea207398892e | |
787 | user: test |
|
787 | user: test | |
788 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
788 | date: Thu Jan 01 00:00:00 1970 +0000 | |
789 | summary: ROOT |
|
789 | summary: ROOT | |
790 |
|
790 | |||
791 |
|
791 | |||
792 | Test templates with divergence |
|
792 | Test templates with divergence | |
793 | ============================== |
|
793 | ============================== | |
794 |
|
794 | |||
795 | Test setup |
|
795 | Test setup | |
796 | ---------- |
|
796 | ---------- | |
797 |
|
797 | |||
798 | $ hg init $TESTTMP/templates-local-divergence |
|
798 | $ hg init $TESTTMP/templates-local-divergence | |
799 | $ cd $TESTTMP/templates-local-divergence |
|
799 | $ cd $TESTTMP/templates-local-divergence | |
800 | $ mkcommit ROOT |
|
800 | $ mkcommit ROOT | |
801 | $ mkcommit A0 |
|
801 | $ mkcommit A0 | |
802 | $ hg commit --amend -m "A1" |
|
802 | $ hg commit --amend -m "A1" | |
803 | $ hg log --hidden -G |
|
803 | $ hg log --hidden -G | |
804 | @ changeset: 2:fdf9bde5129a |
|
804 | @ changeset: 2:fdf9bde5129a | |
805 | | tag: tip |
|
805 | | tag: tip | |
806 | | parent: 0:ea207398892e |
|
806 | | parent: 0:ea207398892e | |
807 | | user: test |
|
807 | | user: test | |
808 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
808 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
809 | | summary: A1 |
|
809 | | summary: A1 | |
810 | | |
|
810 | | | |
811 | | x changeset: 1:471f378eab4c |
|
811 | | x changeset: 1:471f378eab4c | |
812 | |/ user: test |
|
812 | |/ user: test | |
813 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
813 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
814 | | obsolete: rewritten using amend as 2:fdf9bde5129a |
|
814 | | obsolete: rewritten using amend as 2:fdf9bde5129a | |
815 | | summary: A0 |
|
815 | | summary: A0 | |
816 | | |
|
816 | | | |
817 | o changeset: 0:ea207398892e |
|
817 | o changeset: 0:ea207398892e | |
818 | user: test |
|
818 | user: test | |
819 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
819 | date: Thu Jan 01 00:00:00 1970 +0000 | |
820 | summary: ROOT |
|
820 | summary: ROOT | |
821 |
|
821 | |||
822 | $ hg update --hidden 'desc(A0)' |
|
822 | $ hg update --hidden 'desc(A0)' | |
823 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
823 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
824 | updated to hidden changeset 471f378eab4c |
|
824 | updated to hidden changeset 471f378eab4c | |
825 | (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) |
|
825 | (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) | |
826 | $ hg commit --amend -m "A2" |
|
826 | $ hg commit --amend -m "A2" | |
827 | 2 new content-divergent changesets |
|
827 | 2 new content-divergent changesets | |
828 | $ hg log --hidden -G |
|
828 | $ hg log --hidden -G | |
829 | @ changeset: 3:65b757b745b9 |
|
829 | @ changeset: 3:65b757b745b9 | |
830 | | tag: tip |
|
830 | | tag: tip | |
831 | | parent: 0:ea207398892e |
|
831 | | parent: 0:ea207398892e | |
832 | | user: test |
|
832 | | user: test | |
833 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
833 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
834 | | instability: content-divergent |
|
834 | | instability: content-divergent | |
835 | | summary: A2 |
|
835 | | summary: A2 | |
836 | | |
|
836 | | | |
837 | | * changeset: 2:fdf9bde5129a |
|
837 | | * changeset: 2:fdf9bde5129a | |
838 | |/ parent: 0:ea207398892e |
|
838 | |/ parent: 0:ea207398892e | |
839 | | user: test |
|
839 | | user: test | |
840 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
840 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
841 | | instability: content-divergent |
|
841 | | instability: content-divergent | |
842 | | summary: A1 |
|
842 | | summary: A1 | |
843 | | |
|
843 | | | |
844 | | x changeset: 1:471f378eab4c |
|
844 | | x changeset: 1:471f378eab4c | |
845 | |/ user: test |
|
845 | |/ user: test | |
846 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
846 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
847 | | obsolete: rewritten using amend as 2:fdf9bde5129a |
|
847 | | obsolete: rewritten using amend as 2:fdf9bde5129a | |
848 | | obsolete: rewritten using amend as 3:65b757b745b9 |
|
848 | | obsolete: rewritten using amend as 3:65b757b745b9 | |
849 | | summary: A0 |
|
849 | | summary: A0 | |
850 | | |
|
850 | | | |
851 | o changeset: 0:ea207398892e |
|
851 | o changeset: 0:ea207398892e | |
852 | user: test |
|
852 | user: test | |
853 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
853 | date: Thu Jan 01 00:00:00 1970 +0000 | |
854 | summary: ROOT |
|
854 | summary: ROOT | |
855 |
|
855 | |||
856 | $ hg commit --amend -m 'A3' |
|
856 | $ hg commit --amend -m 'A3' | |
857 | $ hg log --hidden -G |
|
857 | $ hg log --hidden -G | |
858 | @ changeset: 4:019fadeab383 |
|
858 | @ changeset: 4:019fadeab383 | |
859 | | tag: tip |
|
859 | | tag: tip | |
860 | | parent: 0:ea207398892e |
|
860 | | parent: 0:ea207398892e | |
861 | | user: test |
|
861 | | user: test | |
862 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
862 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
863 | | instability: content-divergent |
|
863 | | instability: content-divergent | |
864 | | summary: A3 |
|
864 | | summary: A3 | |
865 | | |
|
865 | | | |
866 | | x changeset: 3:65b757b745b9 |
|
866 | | x changeset: 3:65b757b745b9 | |
867 | |/ parent: 0:ea207398892e |
|
867 | |/ parent: 0:ea207398892e | |
868 | | user: test |
|
868 | | user: test | |
869 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
869 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
870 | | obsolete: rewritten using amend as 4:019fadeab383 |
|
870 | | obsolete: rewritten using amend as 4:019fadeab383 | |
871 | | summary: A2 |
|
871 | | summary: A2 | |
872 | | |
|
872 | | | |
873 | | * changeset: 2:fdf9bde5129a |
|
873 | | * changeset: 2:fdf9bde5129a | |
874 | |/ parent: 0:ea207398892e |
|
874 | |/ parent: 0:ea207398892e | |
875 | | user: test |
|
875 | | user: test | |
876 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
876 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
877 | | instability: content-divergent |
|
877 | | instability: content-divergent | |
878 | | summary: A1 |
|
878 | | summary: A1 | |
879 | | |
|
879 | | | |
880 | | x changeset: 1:471f378eab4c |
|
880 | | x changeset: 1:471f378eab4c | |
881 | |/ user: test |
|
881 | |/ user: test | |
882 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
882 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
883 | | obsolete: rewritten using amend as 2:fdf9bde5129a |
|
883 | | obsolete: rewritten using amend as 2:fdf9bde5129a | |
884 | | obsolete: rewritten using amend as 3:65b757b745b9 |
|
884 | | obsolete: rewritten using amend as 3:65b757b745b9 | |
885 | | summary: A0 |
|
885 | | summary: A0 | |
886 | | |
|
886 | | | |
887 | o changeset: 0:ea207398892e |
|
887 | o changeset: 0:ea207398892e | |
888 | user: test |
|
888 | user: test | |
889 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
889 | date: Thu Jan 01 00:00:00 1970 +0000 | |
890 | summary: ROOT |
|
890 | summary: ROOT | |
891 |
|
891 | |||
892 |
|
892 | |||
893 | Check templates |
|
893 | Check templates | |
894 | --------------- |
|
894 | --------------- | |
895 |
|
895 | |||
896 | $ hg up 'desc(A0)' --hidden |
|
896 | $ hg up 'desc(A0)' --hidden | |
897 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
897 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
898 | updated to hidden changeset 471f378eab4c |
|
898 | updated to hidden changeset 471f378eab4c | |
899 | (hidden revision '471f378eab4c' has diverged) |
|
899 | (hidden revision '471f378eab4c' has diverged) | |
900 |
|
900 | |||
901 | Predecessors template should show current revision as it is the working copy |
|
901 | Predecessors template should show current revision as it is the working copy | |
902 | $ hg tlog |
|
902 | $ hg tlog | |
903 | * 019fadeab383 |
|
903 | * 019fadeab383 | |
904 | | Predecessors: 1:471f378eab4c |
|
904 | | Predecessors: 1:471f378eab4c | |
905 | | semi-colon: 1:471f378eab4c |
|
905 | | semi-colon: 1:471f378eab4c | |
906 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
906 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
907 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
907 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
908 | | * fdf9bde5129a |
|
908 | | * fdf9bde5129a | |
909 | |/ Predecessors: 1:471f378eab4c |
|
909 | |/ Predecessors: 1:471f378eab4c | |
910 | | semi-colon: 1:471f378eab4c |
|
910 | | semi-colon: 1:471f378eab4c | |
911 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
911 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
912 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
912 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
913 | | @ 471f378eab4c |
|
913 | | @ 471f378eab4c | |
914 | |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 |
|
914 | |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 | |
915 | | multi-line: 2:fdf9bde5129a |
|
915 | | multi-line: 2:fdf9bde5129a | |
916 | | multi-line: 4:019fadeab383 |
|
916 | | multi-line: 4:019fadeab383 | |
917 | | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
|
917 | | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] | |
918 | o ea207398892e |
|
918 | o ea207398892e | |
919 |
|
919 | |||
920 | $ hg fatelog |
|
920 | $ hg fatelog | |
921 | * 019fadeab383 |
|
921 | * 019fadeab383 | |
922 | | |
|
922 | | | |
923 | | * fdf9bde5129a |
|
923 | | * fdf9bde5129a | |
924 | |/ |
|
924 | |/ | |
925 | | @ 471f378eab4c |
|
925 | | @ 471f378eab4c | |
926 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); |
|
926 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); | |
927 | o ea207398892e |
|
927 | o ea207398892e | |
928 |
|
928 | |||
929 | $ hg up 'desc(A1)' |
|
929 | $ hg up 'desc(A1)' | |
930 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
930 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
931 |
|
931 | |||
932 | Predecessors template should not show predecessors as they are not displayed in |
|
932 | Predecessors template should not show predecessors as they are not displayed in | |
933 | the log |
|
933 | the log | |
934 | $ hg tlog |
|
934 | $ hg tlog | |
935 | * 019fadeab383 |
|
935 | * 019fadeab383 | |
936 | | |
|
936 | | | |
937 | | @ fdf9bde5129a |
|
937 | | @ fdf9bde5129a | |
938 | |/ |
|
938 | |/ | |
939 | o ea207398892e |
|
939 | o ea207398892e | |
940 |
|
940 | |||
941 |
|
941 | |||
942 | $ hg fatelog |
|
942 | $ hg fatelog | |
943 | * 019fadeab383 |
|
943 | * 019fadeab383 | |
944 | | |
|
944 | | | |
945 | | @ fdf9bde5129a |
|
945 | | @ fdf9bde5129a | |
946 | |/ |
|
946 | |/ | |
947 | o ea207398892e |
|
947 | o ea207398892e | |
948 |
|
948 | |||
949 | Predecessors template should the predecessors as we force their display with |
|
949 | Predecessors template should the predecessors as we force their display with | |
950 | --hidden |
|
950 | --hidden | |
951 | $ hg tlog --hidden |
|
951 | $ hg tlog --hidden | |
952 | * 019fadeab383 |
|
952 | * 019fadeab383 | |
953 | | Predecessors: 3:65b757b745b9 |
|
953 | | Predecessors: 3:65b757b745b9 | |
954 | | semi-colon: 3:65b757b745b9 |
|
954 | | semi-colon: 3:65b757b745b9 | |
955 | | json: ["65b757b745b935093c87a2bccd877521cccffcbd"] |
|
955 | | json: ["65b757b745b935093c87a2bccd877521cccffcbd"] | |
956 | | map: 3:65b757b745b935093c87a2bccd877521cccffcbd |
|
956 | | map: 3:65b757b745b935093c87a2bccd877521cccffcbd | |
957 | | x 65b757b745b9 |
|
957 | | x 65b757b745b9 | |
958 | |/ Predecessors: 1:471f378eab4c |
|
958 | |/ Predecessors: 1:471f378eab4c | |
959 | | semi-colon: 1:471f378eab4c |
|
959 | | semi-colon: 1:471f378eab4c | |
960 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
960 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
961 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
961 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
962 | | Successors: 4:019fadeab383 |
|
962 | | Successors: 4:019fadeab383 | |
963 | | multi-line: 4:019fadeab383 |
|
963 | | multi-line: 4:019fadeab383 | |
964 | | json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
|
964 | | json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] | |
965 | | @ fdf9bde5129a |
|
965 | | @ fdf9bde5129a | |
966 | |/ Predecessors: 1:471f378eab4c |
|
966 | |/ Predecessors: 1:471f378eab4c | |
967 | | semi-colon: 1:471f378eab4c |
|
967 | | semi-colon: 1:471f378eab4c | |
968 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
968 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
969 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
969 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
970 | | x 471f378eab4c |
|
970 | | x 471f378eab4c | |
971 | |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 |
|
971 | |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 | |
972 | | multi-line: 2:fdf9bde5129a |
|
972 | | multi-line: 2:fdf9bde5129a | |
973 | | multi-line: 3:65b757b745b9 |
|
973 | | multi-line: 3:65b757b745b9 | |
974 | | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]] |
|
974 | | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]] | |
975 | o ea207398892e |
|
975 | o ea207398892e | |
976 |
|
976 | |||
977 |
|
977 | |||
978 | $ hg fatelog --hidden |
|
978 | $ hg fatelog --hidden | |
979 | * 019fadeab383 |
|
979 | * 019fadeab383 | |
980 | | |
|
980 | | | |
981 | | x 65b757b745b9 |
|
981 | | x 65b757b745b9 | |
982 | |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); |
|
982 | |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); | |
983 | | @ fdf9bde5129a |
|
983 | | @ fdf9bde5129a | |
984 | |/ |
|
984 | |/ | |
985 | | x 471f378eab4c |
|
985 | | x 471f378eab4c | |
986 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); |
|
986 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); | |
987 | o ea207398892e |
|
987 | o ea207398892e | |
988 |
|
988 | |||
989 |
|
989 | |||
990 | $ hg fatelogjson --hidden |
|
990 | $ hg fatelogjson --hidden | |
991 | * 019fadeab383 |
|
991 | * 019fadeab383 | |
992 | | |
|
992 | | | |
993 | | x 65b757b745b9 |
|
993 | | x 65b757b745b9 | |
994 | |/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}] |
|
994 | |/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}] | |
995 | | @ fdf9bde5129a |
|
995 | | @ fdf9bde5129a | |
996 | |/ |
|
996 | |/ | |
997 | | x 471f378eab4c |
|
997 | | x 471f378eab4c | |
998 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"]}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"]}] |
|
998 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"]}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"]}] | |
999 | o ea207398892e |
|
999 | o ea207398892e | |
1000 |
|
1000 | |||
1001 |
|
1001 | |||
1002 | Check other fatelog implementations |
|
1002 | Check other fatelog implementations | |
1003 | ----------------------------------- |
|
1003 | ----------------------------------- | |
1004 |
|
1004 | |||
1005 | $ hg fatelogkw --hidden -q |
|
1005 | $ hg fatelogkw --hidden -q | |
1006 | * 019fadeab383 |
|
1006 | * 019fadeab383 | |
1007 | | |
|
1007 | | | |
1008 | | x 65b757b745b9 |
|
1008 | | x 65b757b745b9 | |
1009 | |/ Obsfate: rewritten using amend as 4:019fadeab383 |
|
1009 | |/ Obsfate: rewritten using amend as 4:019fadeab383 | |
1010 | | @ fdf9bde5129a |
|
1010 | | @ fdf9bde5129a | |
1011 | |/ |
|
1011 | |/ | |
1012 | | x 471f378eab4c |
|
1012 | | x 471f378eab4c | |
1013 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a |
|
1013 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a | |
1014 | | Obsfate: rewritten using amend as 3:65b757b745b9 |
|
1014 | | Obsfate: rewritten using amend as 3:65b757b745b9 | |
1015 | o ea207398892e |
|
1015 | o ea207398892e | |
1016 |
|
1016 | |||
1017 | $ hg fatelogkw --hidden |
|
1017 | $ hg fatelogkw --hidden | |
1018 | * 019fadeab383 |
|
1018 | * 019fadeab383 | |
1019 | | |
|
1019 | | | |
1020 | | x 65b757b745b9 |
|
1020 | | x 65b757b745b9 | |
1021 | |/ Obsfate: rewritten using amend as 4:019fadeab383 |
|
1021 | |/ Obsfate: rewritten using amend as 4:019fadeab383 | |
1022 | | @ fdf9bde5129a |
|
1022 | | @ fdf9bde5129a | |
1023 | |/ |
|
1023 | |/ | |
1024 | | x 471f378eab4c |
|
1024 | | x 471f378eab4c | |
1025 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a |
|
1025 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a | |
1026 | | Obsfate: rewritten using amend as 3:65b757b745b9 |
|
1026 | | Obsfate: rewritten using amend as 3:65b757b745b9 | |
1027 | o ea207398892e |
|
1027 | o ea207398892e | |
1028 |
|
1028 | |||
1029 | $ hg fatelogkw --hidden -v |
|
1029 | $ hg fatelogkw --hidden -v | |
1030 | * 019fadeab383 |
|
1030 | * 019fadeab383 | |
1031 | | |
|
1031 | | | |
1032 | | x 65b757b745b9 |
|
1032 | | x 65b757b745b9 | |
1033 | |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000) |
|
1033 | |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000) | |
1034 | | @ fdf9bde5129a |
|
1034 | | @ fdf9bde5129a | |
1035 | |/ |
|
1035 | |/ | |
1036 | | x 471f378eab4c |
|
1036 | | x 471f378eab4c | |
1037 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) |
|
1037 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) | |
1038 | | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) |
|
1038 | | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) | |
1039 | o ea207398892e |
|
1039 | o ea207398892e | |
1040 |
|
1040 | |||
1041 | $ hg log -G -T "default" --hidden |
|
1041 | $ hg log -G -T "default" --hidden | |
1042 | * changeset: 4:019fadeab383 |
|
1042 | * changeset: 4:019fadeab383 | |
1043 | | tag: tip |
|
1043 | | tag: tip | |
1044 | | parent: 0:ea207398892e |
|
1044 | | parent: 0:ea207398892e | |
1045 | | user: test |
|
1045 | | user: test | |
1046 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1046 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1047 | | instability: content-divergent |
|
1047 | | instability: content-divergent | |
1048 | | summary: A3 |
|
1048 | | summary: A3 | |
1049 | | |
|
1049 | | | |
1050 | | x changeset: 3:65b757b745b9 |
|
1050 | | x changeset: 3:65b757b745b9 | |
1051 | |/ parent: 0:ea207398892e |
|
1051 | |/ parent: 0:ea207398892e | |
1052 | | user: test |
|
1052 | | user: test | |
1053 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1053 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1054 | | obsolete: rewritten using amend as 4:019fadeab383 |
|
1054 | | obsolete: rewritten using amend as 4:019fadeab383 | |
1055 | | summary: A2 |
|
1055 | | summary: A2 | |
1056 | | |
|
1056 | | | |
1057 | | @ changeset: 2:fdf9bde5129a |
|
1057 | | @ changeset: 2:fdf9bde5129a | |
1058 | |/ parent: 0:ea207398892e |
|
1058 | |/ parent: 0:ea207398892e | |
1059 | | user: test |
|
1059 | | user: test | |
1060 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1060 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1061 | | instability: content-divergent |
|
1061 | | instability: content-divergent | |
1062 | | summary: A1 |
|
1062 | | summary: A1 | |
1063 | | |
|
1063 | | | |
1064 | | x changeset: 1:471f378eab4c |
|
1064 | | x changeset: 1:471f378eab4c | |
1065 | |/ user: test |
|
1065 | |/ user: test | |
1066 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1066 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1067 | | obsolete: rewritten using amend as 2:fdf9bde5129a |
|
1067 | | obsolete: rewritten using amend as 2:fdf9bde5129a | |
1068 | | obsolete: rewritten using amend as 3:65b757b745b9 |
|
1068 | | obsolete: rewritten using amend as 3:65b757b745b9 | |
1069 | | summary: A0 |
|
1069 | | summary: A0 | |
1070 | | |
|
1070 | | | |
1071 | o changeset: 0:ea207398892e |
|
1071 | o changeset: 0:ea207398892e | |
1072 | user: test |
|
1072 | user: test | |
1073 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1073 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1074 | summary: ROOT |
|
1074 | summary: ROOT | |
1075 |
|
1075 | |||
1076 |
|
1076 | |||
1077 | Test templates with amended + folded commit |
|
1077 | Test templates with amended + folded commit | |
1078 | =========================================== |
|
1078 | =========================================== | |
1079 |
|
1079 | |||
1080 | Test setup |
|
1080 | Test setup | |
1081 | ---------- |
|
1081 | ---------- | |
1082 |
|
1082 | |||
1083 | $ hg init $TESTTMP/templates-local-amend-fold |
|
1083 | $ hg init $TESTTMP/templates-local-amend-fold | |
1084 | $ cd $TESTTMP/templates-local-amend-fold |
|
1084 | $ cd $TESTTMP/templates-local-amend-fold | |
1085 | $ mkcommit ROOT |
|
1085 | $ mkcommit ROOT | |
1086 | $ mkcommit A0 |
|
1086 | $ mkcommit A0 | |
1087 | $ mkcommit B0 |
|
1087 | $ mkcommit B0 | |
1088 | $ hg commit --amend -m "B1" |
|
1088 | $ hg commit --amend -m "B1" | |
1089 | $ hg log --hidden -G |
|
1089 | $ hg log --hidden -G | |
1090 | @ changeset: 3:b7ea6d14e664 |
|
1090 | @ changeset: 3:b7ea6d14e664 | |
1091 | | tag: tip |
|
1091 | | tag: tip | |
1092 | | parent: 1:471f378eab4c |
|
1092 | | parent: 1:471f378eab4c | |
1093 | | user: test |
|
1093 | | user: test | |
1094 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1094 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1095 | | summary: B1 |
|
1095 | | summary: B1 | |
1096 | | |
|
1096 | | | |
1097 | | x changeset: 2:0dec01379d3b |
|
1097 | | x changeset: 2:0dec01379d3b | |
1098 | |/ user: test |
|
1098 | |/ user: test | |
1099 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1099 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1100 | | obsolete: rewritten using amend as 3:b7ea6d14e664 |
|
1100 | | obsolete: rewritten using amend as 3:b7ea6d14e664 | |
1101 | | summary: B0 |
|
1101 | | summary: B0 | |
1102 | | |
|
1102 | | | |
1103 | o changeset: 1:471f378eab4c |
|
1103 | o changeset: 1:471f378eab4c | |
1104 | | user: test |
|
1104 | | user: test | |
1105 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1105 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1106 | | summary: A0 |
|
1106 | | summary: A0 | |
1107 | | |
|
1107 | | | |
1108 | o changeset: 0:ea207398892e |
|
1108 | o changeset: 0:ea207398892e | |
1109 | user: test |
|
1109 | user: test | |
1110 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1110 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1111 | summary: ROOT |
|
1111 | summary: ROOT | |
1112 |
|
1112 | |||
1113 | # Simulate a fold |
|
1113 | # Simulate a fold | |
1114 | $ hg up -r "desc(ROOT)" |
|
1114 | $ hg up -r "desc(ROOT)" | |
1115 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1115 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
1116 | $ echo "A0" > A0 |
|
1116 | $ echo "A0" > A0 | |
1117 | $ echo "B0" > B0 |
|
1117 | $ echo "B0" > B0 | |
1118 | $ hg commit -A -m "C0" |
|
1118 | $ hg commit -A -m "C0" | |
1119 | adding A0 |
|
1119 | adding A0 | |
1120 | adding B0 |
|
1120 | adding B0 | |
1121 | created new head |
|
1121 | created new head | |
1122 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` |
|
1122 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"` | |
1123 | obsoleted 1 changesets |
|
1123 | obsoleted 1 changesets | |
1124 | 1 new orphan changesets |
|
1124 | 1 new orphan changesets | |
1125 | $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"` |
|
1125 | $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"` | |
1126 | obsoleted 1 changesets |
|
1126 | obsoleted 1 changesets | |
1127 |
|
1127 | |||
1128 | $ hg log --hidden -G |
|
1128 | $ hg log --hidden -G | |
1129 | @ changeset: 4:eb5a0daa2192 |
|
1129 | @ changeset: 4:eb5a0daa2192 | |
1130 | | tag: tip |
|
1130 | | tag: tip | |
1131 | | parent: 0:ea207398892e |
|
1131 | | parent: 0:ea207398892e | |
1132 | | user: test |
|
1132 | | user: test | |
1133 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1133 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1134 | | summary: C0 |
|
1134 | | summary: C0 | |
1135 | | |
|
1135 | | | |
1136 | | x changeset: 3:b7ea6d14e664 |
|
1136 | | x changeset: 3:b7ea6d14e664 | |
1137 | | | parent: 1:471f378eab4c |
|
1137 | | | parent: 1:471f378eab4c | |
1138 | | | user: test |
|
1138 | | | user: test | |
1139 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1139 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1140 | | | obsolete: rewritten as 4:eb5a0daa2192 |
|
1140 | | | obsolete: rewritten as 4:eb5a0daa2192 | |
1141 | | | summary: B1 |
|
1141 | | | summary: B1 | |
1142 | | | |
|
1142 | | | | |
1143 | | | x changeset: 2:0dec01379d3b |
|
1143 | | | x changeset: 2:0dec01379d3b | |
1144 | | |/ user: test |
|
1144 | | |/ user: test | |
1145 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1145 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1146 | | | obsolete: rewritten using amend as 3:b7ea6d14e664 |
|
1146 | | | obsolete: rewritten using amend as 3:b7ea6d14e664 | |
1147 | | | summary: B0 |
|
1147 | | | summary: B0 | |
1148 | | | |
|
1148 | | | | |
1149 | | x changeset: 1:471f378eab4c |
|
1149 | | x changeset: 1:471f378eab4c | |
1150 | |/ user: test |
|
1150 | |/ user: test | |
1151 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1151 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1152 | | obsolete: rewritten as 4:eb5a0daa2192 |
|
1152 | | obsolete: rewritten as 4:eb5a0daa2192 | |
1153 | | summary: A0 |
|
1153 | | summary: A0 | |
1154 | | |
|
1154 | | | |
1155 | o changeset: 0:ea207398892e |
|
1155 | o changeset: 0:ea207398892e | |
1156 | user: test |
|
1156 | user: test | |
1157 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1157 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1158 | summary: ROOT |
|
1158 | summary: ROOT | |
1159 |
|
1159 | |||
1160 | Check templates |
|
1160 | Check templates | |
1161 | --------------- |
|
1161 | --------------- | |
1162 |
|
1162 | |||
1163 | $ hg up 'desc(A0)' --hidden |
|
1163 | $ hg up 'desc(A0)' --hidden | |
1164 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1164 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1165 | updated to hidden changeset 471f378eab4c |
|
1165 | updated to hidden changeset 471f378eab4c | |
1166 | (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) |
|
1166 | (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) | |
1167 |
|
1167 | |||
1168 | Predecessors template should show current revision as it is the working copy |
|
1168 | Predecessors template should show current revision as it is the working copy | |
1169 | $ hg tlog |
|
1169 | $ hg tlog | |
1170 | o eb5a0daa2192 |
|
1170 | o eb5a0daa2192 | |
1171 | | Predecessors: 1:471f378eab4c |
|
1171 | | Predecessors: 1:471f378eab4c | |
1172 | | semi-colon: 1:471f378eab4c |
|
1172 | | semi-colon: 1:471f378eab4c | |
1173 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1173 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
1174 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1174 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
1175 | | @ 471f378eab4c |
|
1175 | | @ 471f378eab4c | |
1176 | |/ Successors: 4:eb5a0daa2192 |
|
1176 | |/ Successors: 4:eb5a0daa2192 | |
1177 | | multi-line: 4:eb5a0daa2192 |
|
1177 | | multi-line: 4:eb5a0daa2192 | |
1178 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
1178 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
1179 | o ea207398892e |
|
1179 | o ea207398892e | |
1180 |
|
1180 | |||
1181 |
|
1181 | |||
1182 | $ hg fatelog |
|
1182 | $ hg fatelog | |
1183 | o eb5a0daa2192 |
|
1183 | o eb5a0daa2192 | |
1184 | | |
|
1184 | | | |
1185 | | @ 471f378eab4c |
|
1185 | | @ 471f378eab4c | |
1186 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
1186 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
1187 | o ea207398892e |
|
1187 | o ea207398892e | |
1188 |
|
1188 | |||
1189 | $ hg up 'desc(B0)' --hidden |
|
1189 | $ hg up 'desc(B0)' --hidden | |
1190 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1190 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1191 | updated to hidden changeset 0dec01379d3b |
|
1191 | updated to hidden changeset 0dec01379d3b | |
1192 | (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) |
|
1192 | (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) | |
1193 |
|
1193 | |||
1194 | Predecessors template should both predecessors as they are visible |
|
1194 | Predecessors template should both predecessors as they are visible | |
1195 | $ hg tlog |
|
1195 | $ hg tlog | |
1196 | o eb5a0daa2192 |
|
1196 | o eb5a0daa2192 | |
1197 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
|
1197 | | Predecessors: 2:0dec01379d3b 1:471f378eab4c | |
1198 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
|
1198 | | semi-colon: 2:0dec01379d3b; 1:471f378eab4c | |
1199 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1199 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"] | |
1200 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1200 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
1201 | | @ 0dec01379d3b |
|
1201 | | @ 0dec01379d3b | |
1202 | | | Successors: 4:eb5a0daa2192 |
|
1202 | | | Successors: 4:eb5a0daa2192 | |
1203 | | | multi-line: 4:eb5a0daa2192 |
|
1203 | | | multi-line: 4:eb5a0daa2192 | |
1204 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
1204 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
1205 | | x 471f378eab4c |
|
1205 | | x 471f378eab4c | |
1206 | |/ Successors: 4:eb5a0daa2192 |
|
1206 | |/ Successors: 4:eb5a0daa2192 | |
1207 | | multi-line: 4:eb5a0daa2192 |
|
1207 | | multi-line: 4:eb5a0daa2192 | |
1208 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
1208 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
1209 | o ea207398892e |
|
1209 | o ea207398892e | |
1210 |
|
1210 | |||
1211 |
|
1211 | |||
1212 | $ hg fatelog |
|
1212 | $ hg fatelog | |
1213 | o eb5a0daa2192 |
|
1213 | o eb5a0daa2192 | |
1214 | | |
|
1214 | | | |
1215 | | @ 0dec01379d3b |
|
1215 | | @ 0dec01379d3b | |
1216 | | | Obsfate: rewritten using amend as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
1216 | | | Obsfate: rewritten using amend as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
1217 | | x 471f378eab4c |
|
1217 | | x 471f378eab4c | |
1218 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
1218 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
1219 | o ea207398892e |
|
1219 | o ea207398892e | |
1220 |
|
1220 | |||
1221 | $ hg up 'desc(B1)' --hidden |
|
1221 | $ hg up 'desc(B1)' --hidden | |
1222 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1222 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1223 | updated to hidden changeset b7ea6d14e664 |
|
1223 | updated to hidden changeset b7ea6d14e664 | |
1224 | (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192) |
|
1224 | (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192) | |
1225 |
|
1225 | |||
1226 | Predecessors template should both predecessors as they are visible |
|
1226 | Predecessors template should both predecessors as they are visible | |
1227 | $ hg tlog |
|
1227 | $ hg tlog | |
1228 | o eb5a0daa2192 |
|
1228 | o eb5a0daa2192 | |
1229 | | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
|
1229 | | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 | |
1230 | | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
|
1230 | | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 | |
1231 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
|
1231 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] | |
1232 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 |
|
1232 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 | |
1233 | | @ b7ea6d14e664 |
|
1233 | | @ b7ea6d14e664 | |
1234 | | | Successors: 4:eb5a0daa2192 |
|
1234 | | | Successors: 4:eb5a0daa2192 | |
1235 | | | multi-line: 4:eb5a0daa2192 |
|
1235 | | | multi-line: 4:eb5a0daa2192 | |
1236 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
1236 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
1237 | | x 471f378eab4c |
|
1237 | | x 471f378eab4c | |
1238 | |/ Successors: 4:eb5a0daa2192 |
|
1238 | |/ Successors: 4:eb5a0daa2192 | |
1239 | | multi-line: 4:eb5a0daa2192 |
|
1239 | | multi-line: 4:eb5a0daa2192 | |
1240 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
1240 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
1241 | o ea207398892e |
|
1241 | o ea207398892e | |
1242 |
|
1242 | |||
1243 |
|
1243 | |||
1244 | $ hg fatelog |
|
1244 | $ hg fatelog | |
1245 | o eb5a0daa2192 |
|
1245 | o eb5a0daa2192 | |
1246 | | |
|
1246 | | | |
1247 | | @ b7ea6d14e664 |
|
1247 | | @ b7ea6d14e664 | |
1248 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
1248 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
1249 | | x 471f378eab4c |
|
1249 | | x 471f378eab4c | |
1250 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
1250 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
1251 | o ea207398892e |
|
1251 | o ea207398892e | |
1252 |
|
1252 | |||
1253 | $ hg up 'desc(C0)' |
|
1253 | $ hg up 'desc(C0)' | |
1254 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1254 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1255 |
|
1255 | |||
1256 | Predecessors template should show no predecessors as they are both non visible |
|
1256 | Predecessors template should show no predecessors as they are both non visible | |
1257 | $ hg tlog |
|
1257 | $ hg tlog | |
1258 | @ eb5a0daa2192 |
|
1258 | @ eb5a0daa2192 | |
1259 | | |
|
1259 | | | |
1260 | o ea207398892e |
|
1260 | o ea207398892e | |
1261 |
|
1261 | |||
1262 |
|
1262 | |||
1263 | $ hg fatelog |
|
1263 | $ hg fatelog | |
1264 | @ eb5a0daa2192 |
|
1264 | @ eb5a0daa2192 | |
1265 | | |
|
1265 | | | |
1266 | o ea207398892e |
|
1266 | o ea207398892e | |
1267 |
|
1267 | |||
1268 | Predecessors template should show all predecessors as we force their display |
|
1268 | Predecessors template should show all predecessors as we force their display | |
1269 | with --hidden |
|
1269 | with --hidden | |
1270 | $ hg tlog --hidden |
|
1270 | $ hg tlog --hidden | |
1271 | @ eb5a0daa2192 |
|
1271 | @ eb5a0daa2192 | |
1272 | | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
|
1272 | | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 | |
1273 | | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
|
1273 | | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 | |
1274 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] |
|
1274 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"] | |
1275 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 |
|
1275 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07 | |
1276 | | x b7ea6d14e664 |
|
1276 | | x b7ea6d14e664 | |
1277 | | | Predecessors: 2:0dec01379d3b |
|
1277 | | | Predecessors: 2:0dec01379d3b | |
1278 | | | semi-colon: 2:0dec01379d3b |
|
1278 | | | semi-colon: 2:0dec01379d3b | |
1279 | | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1279 | | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
1280 | | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1280 | | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
1281 | | | Successors: 4:eb5a0daa2192 |
|
1281 | | | Successors: 4:eb5a0daa2192 | |
1282 | | | multi-line: 4:eb5a0daa2192 |
|
1282 | | | multi-line: 4:eb5a0daa2192 | |
1283 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
1283 | | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
1284 | | | x 0dec01379d3b |
|
1284 | | | x 0dec01379d3b | |
1285 | | |/ Successors: 3:b7ea6d14e664 |
|
1285 | | |/ Successors: 3:b7ea6d14e664 | |
1286 | | | multi-line: 3:b7ea6d14e664 |
|
1286 | | | multi-line: 3:b7ea6d14e664 | |
1287 | | | json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]] |
|
1287 | | | json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]] | |
1288 | | x 471f378eab4c |
|
1288 | | x 471f378eab4c | |
1289 | |/ Successors: 4:eb5a0daa2192 |
|
1289 | |/ Successors: 4:eb5a0daa2192 | |
1290 | | multi-line: 4:eb5a0daa2192 |
|
1290 | | multi-line: 4:eb5a0daa2192 | |
1291 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] |
|
1291 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]] | |
1292 | o ea207398892e |
|
1292 | o ea207398892e | |
1293 |
|
1293 | |||
1294 |
|
1294 | |||
1295 | $ hg fatelog --hidden |
|
1295 | $ hg fatelog --hidden | |
1296 | @ eb5a0daa2192 |
|
1296 | @ eb5a0daa2192 | |
1297 | | |
|
1297 | | | |
1298 | | x b7ea6d14e664 |
|
1298 | | x b7ea6d14e664 | |
1299 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
1299 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
1300 | | | x 0dec01379d3b |
|
1300 | | | x 0dec01379d3b | |
1301 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000); |
|
1301 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000); | |
1302 | | x 471f378eab4c |
|
1302 | | x 471f378eab4c | |
1303 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
|
1303 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); | |
1304 | o ea207398892e |
|
1304 | o ea207398892e | |
1305 |
|
1305 | |||
1306 |
|
1306 | |||
1307 | $ hg fatelogjson --hidden |
|
1307 | $ hg fatelogjson --hidden | |
1308 | @ eb5a0daa2192 |
|
1308 | @ eb5a0daa2192 | |
1309 | | |
|
1309 | | | |
1310 | | x b7ea6d14e664 |
|
1310 | | x b7ea6d14e664 | |
1311 | | | Obsfate: [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] |
|
1311 | | | Obsfate: [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] | |
1312 | | | x 0dec01379d3b |
|
1312 | | | x 0dec01379d3b | |
1313 | | |/ Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"]}] |
|
1313 | | |/ Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"]}] | |
1314 | | x 471f378eab4c |
|
1314 | | x 471f378eab4c | |
1315 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] |
|
1315 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] | |
1316 | o ea207398892e |
|
1316 | o ea207398892e | |
1317 |
|
1317 | |||
1318 |
|
1318 | |||
1319 | Check other fatelog implementations |
|
1319 | Check other fatelog implementations | |
1320 | ----------------------------------- |
|
1320 | ----------------------------------- | |
1321 |
|
1321 | |||
1322 | $ hg fatelogkw --hidden -q |
|
1322 | $ hg fatelogkw --hidden -q | |
1323 | @ eb5a0daa2192 |
|
1323 | @ eb5a0daa2192 | |
1324 | | |
|
1324 | | | |
1325 | | x b7ea6d14e664 |
|
1325 | | x b7ea6d14e664 | |
1326 | | | Obsfate: rewritten as 4:eb5a0daa2192 |
|
1326 | | | Obsfate: rewritten as 4:eb5a0daa2192 | |
1327 | | | x 0dec01379d3b |
|
1327 | | | x 0dec01379d3b | |
1328 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 |
|
1328 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 | |
1329 | | x 471f378eab4c |
|
1329 | | x 471f378eab4c | |
1330 | |/ Obsfate: rewritten as 4:eb5a0daa2192 |
|
1330 | |/ Obsfate: rewritten as 4:eb5a0daa2192 | |
1331 | o ea207398892e |
|
1331 | o ea207398892e | |
1332 |
|
1332 | |||
1333 | $ hg fatelogkw --hidden |
|
1333 | $ hg fatelogkw --hidden | |
1334 | @ eb5a0daa2192 |
|
1334 | @ eb5a0daa2192 | |
1335 | | |
|
1335 | | | |
1336 | | x b7ea6d14e664 |
|
1336 | | x b7ea6d14e664 | |
1337 | | | Obsfate: rewritten as 4:eb5a0daa2192 |
|
1337 | | | Obsfate: rewritten as 4:eb5a0daa2192 | |
1338 | | | x 0dec01379d3b |
|
1338 | | | x 0dec01379d3b | |
1339 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 |
|
1339 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 | |
1340 | | x 471f378eab4c |
|
1340 | | x 471f378eab4c | |
1341 | |/ Obsfate: rewritten as 4:eb5a0daa2192 |
|
1341 | |/ Obsfate: rewritten as 4:eb5a0daa2192 | |
1342 | o ea207398892e |
|
1342 | o ea207398892e | |
1343 |
|
1343 | |||
1344 | $ hg fatelogkw --hidden -v |
|
1344 | $ hg fatelogkw --hidden -v | |
1345 | @ eb5a0daa2192 |
|
1345 | @ eb5a0daa2192 | |
1346 | | |
|
1346 | | | |
1347 | | x b7ea6d14e664 |
|
1347 | | x b7ea6d14e664 | |
1348 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) |
|
1348 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |
1349 | | | x 0dec01379d3b |
|
1349 | | | x 0dec01379d3b | |
1350 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000) |
|
1350 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000) | |
1351 | | x 471f378eab4c |
|
1351 | | x 471f378eab4c | |
1352 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) |
|
1352 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |
1353 | o ea207398892e |
|
1353 | o ea207398892e | |
1354 |
|
1354 | |||
1355 | $ hg log -G -T "default" --hidden |
|
1355 | $ hg log -G -T "default" --hidden | |
1356 | @ changeset: 4:eb5a0daa2192 |
|
1356 | @ changeset: 4:eb5a0daa2192 | |
1357 | | tag: tip |
|
1357 | | tag: tip | |
1358 | | parent: 0:ea207398892e |
|
1358 | | parent: 0:ea207398892e | |
1359 | | user: test |
|
1359 | | user: test | |
1360 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1360 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1361 | | summary: C0 |
|
1361 | | summary: C0 | |
1362 | | |
|
1362 | | | |
1363 | | x changeset: 3:b7ea6d14e664 |
|
1363 | | x changeset: 3:b7ea6d14e664 | |
1364 | | | parent: 1:471f378eab4c |
|
1364 | | | parent: 1:471f378eab4c | |
1365 | | | user: test |
|
1365 | | | user: test | |
1366 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1366 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1367 | | | obsolete: rewritten as 4:eb5a0daa2192 |
|
1367 | | | obsolete: rewritten as 4:eb5a0daa2192 | |
1368 | | | summary: B1 |
|
1368 | | | summary: B1 | |
1369 | | | |
|
1369 | | | | |
1370 | | | x changeset: 2:0dec01379d3b |
|
1370 | | | x changeset: 2:0dec01379d3b | |
1371 | | |/ user: test |
|
1371 | | |/ user: test | |
1372 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1372 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1373 | | | obsolete: rewritten using amend as 3:b7ea6d14e664 |
|
1373 | | | obsolete: rewritten using amend as 3:b7ea6d14e664 | |
1374 | | | summary: B0 |
|
1374 | | | summary: B0 | |
1375 | | | |
|
1375 | | | | |
1376 | | x changeset: 1:471f378eab4c |
|
1376 | | x changeset: 1:471f378eab4c | |
1377 | |/ user: test |
|
1377 | |/ user: test | |
1378 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1378 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1379 | | obsolete: rewritten as 4:eb5a0daa2192 |
|
1379 | | obsolete: rewritten as 4:eb5a0daa2192 | |
1380 | | summary: A0 |
|
1380 | | summary: A0 | |
1381 | | |
|
1381 | | | |
1382 | o changeset: 0:ea207398892e |
|
1382 | o changeset: 0:ea207398892e | |
1383 | user: test |
|
1383 | user: test | |
1384 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1384 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1385 | summary: ROOT |
|
1385 | summary: ROOT | |
1386 |
|
1386 | |||
1387 |
|
1387 | |||
1388 | Test template with pushed and pulled obs markers |
|
1388 | Test template with pushed and pulled obs markers | |
1389 | ================================================ |
|
1389 | ================================================ | |
1390 |
|
1390 | |||
1391 | Test setup |
|
1391 | Test setup | |
1392 | ---------- |
|
1392 | ---------- | |
1393 |
|
1393 | |||
1394 | $ hg init $TESTTMP/templates-local-remote-markers-1 |
|
1394 | $ hg init $TESTTMP/templates-local-remote-markers-1 | |
1395 | $ cd $TESTTMP/templates-local-remote-markers-1 |
|
1395 | $ cd $TESTTMP/templates-local-remote-markers-1 | |
1396 | $ mkcommit ROOT |
|
1396 | $ mkcommit ROOT | |
1397 | $ mkcommit A0 |
|
1397 | $ mkcommit A0 | |
1398 | $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2 |
|
1398 | $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2 | |
1399 | updating to branch default |
|
1399 | updating to branch default | |
1400 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1400 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1401 | $ cd $TESTTMP/templates-local-remote-markers-2 |
|
1401 | $ cd $TESTTMP/templates-local-remote-markers-2 | |
1402 | $ hg log --hidden -G |
|
1402 | $ hg log --hidden -G | |
1403 | @ changeset: 1:471f378eab4c |
|
1403 | @ changeset: 1:471f378eab4c | |
1404 | | tag: tip |
|
1404 | | tag: tip | |
1405 | | user: test |
|
1405 | | user: test | |
1406 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1406 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1407 | | summary: A0 |
|
1407 | | summary: A0 | |
1408 | | |
|
1408 | | | |
1409 | o changeset: 0:ea207398892e |
|
1409 | o changeset: 0:ea207398892e | |
1410 | user: test |
|
1410 | user: test | |
1411 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1411 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1412 | summary: ROOT |
|
1412 | summary: ROOT | |
1413 |
|
1413 | |||
1414 | $ cd $TESTTMP/templates-local-remote-markers-1 |
|
1414 | $ cd $TESTTMP/templates-local-remote-markers-1 | |
1415 | $ hg commit --amend -m "A1" |
|
1415 | $ hg commit --amend -m "A1" | |
1416 | $ hg commit --amend -m "A2" |
|
1416 | $ hg commit --amend -m "A2" | |
1417 | $ hg log --hidden -G |
|
1417 | $ hg log --hidden -G | |
1418 | @ changeset: 3:7a230b46bf61 |
|
1418 | @ changeset: 3:7a230b46bf61 | |
1419 | | tag: tip |
|
1419 | | tag: tip | |
1420 | | parent: 0:ea207398892e |
|
1420 | | parent: 0:ea207398892e | |
1421 | | user: test |
|
1421 | | user: test | |
1422 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1422 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1423 | | summary: A2 |
|
1423 | | summary: A2 | |
1424 | | |
|
1424 | | | |
1425 | | x changeset: 2:fdf9bde5129a |
|
1425 | | x changeset: 2:fdf9bde5129a | |
1426 | |/ parent: 0:ea207398892e |
|
1426 | |/ parent: 0:ea207398892e | |
1427 | | user: test |
|
1427 | | user: test | |
1428 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1428 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1429 | | obsolete: rewritten using amend as 3:7a230b46bf61 |
|
1429 | | obsolete: rewritten using amend as 3:7a230b46bf61 | |
1430 | | summary: A1 |
|
1430 | | summary: A1 | |
1431 | | |
|
1431 | | | |
1432 | | x changeset: 1:471f378eab4c |
|
1432 | | x changeset: 1:471f378eab4c | |
1433 | |/ user: test |
|
1433 | |/ user: test | |
1434 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1434 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1435 | | obsolete: rewritten using amend as 2:fdf9bde5129a |
|
1435 | | obsolete: rewritten using amend as 2:fdf9bde5129a | |
1436 | | summary: A0 |
|
1436 | | summary: A0 | |
1437 | | |
|
1437 | | | |
1438 | o changeset: 0:ea207398892e |
|
1438 | o changeset: 0:ea207398892e | |
1439 | user: test |
|
1439 | user: test | |
1440 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1440 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1441 | summary: ROOT |
|
1441 | summary: ROOT | |
1442 |
|
1442 | |||
1443 | $ cd $TESTTMP/templates-local-remote-markers-2 |
|
1443 | $ cd $TESTTMP/templates-local-remote-markers-2 | |
1444 | $ hg pull |
|
1444 | $ hg pull | |
1445 | pulling from $TESTTMP/templates-local-remote-markers-1 |
|
1445 | pulling from $TESTTMP/templates-local-remote-markers-1 | |
1446 | searching for changes |
|
1446 | searching for changes | |
1447 | adding changesets |
|
1447 | adding changesets | |
1448 | adding manifests |
|
1448 | adding manifests | |
1449 | adding file changes |
|
1449 | adding file changes | |
1450 | added 1 changesets with 0 changes to 1 files (+1 heads) |
|
1450 | added 1 changesets with 0 changes to 1 files (+1 heads) | |
1451 | 2 new obsolescence markers |
|
1451 | 2 new obsolescence markers | |
1452 | obsoleted 1 changesets |
|
1452 | obsoleted 1 changesets | |
1453 | new changesets 7a230b46bf61 |
|
1453 | new changesets 7a230b46bf61 | |
1454 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
1454 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
1455 | $ hg log --hidden -G |
|
1455 | $ hg log --hidden -G | |
1456 | o changeset: 2:7a230b46bf61 |
|
1456 | o changeset: 2:7a230b46bf61 | |
1457 | | tag: tip |
|
1457 | | tag: tip | |
1458 | | parent: 0:ea207398892e |
|
1458 | | parent: 0:ea207398892e | |
1459 | | user: test |
|
1459 | | user: test | |
1460 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1460 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1461 | | summary: A2 |
|
1461 | | summary: A2 | |
1462 | | |
|
1462 | | | |
1463 | | @ changeset: 1:471f378eab4c |
|
1463 | | @ changeset: 1:471f378eab4c | |
1464 | |/ user: test |
|
1464 | |/ user: test | |
1465 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1465 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1466 | | obsolete: rewritten using amend as 2:7a230b46bf61 |
|
1466 | | obsolete: rewritten using amend as 2:7a230b46bf61 | |
1467 | | summary: A0 |
|
1467 | | summary: A0 | |
1468 | | |
|
1468 | | | |
1469 | o changeset: 0:ea207398892e |
|
1469 | o changeset: 0:ea207398892e | |
1470 | user: test |
|
1470 | user: test | |
1471 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1471 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1472 | summary: ROOT |
|
1472 | summary: ROOT | |
1473 |
|
1473 | |||
1474 |
|
1474 | |||
1475 | $ hg debugobsolete |
|
1475 | $ hg debugobsolete | |
1476 | 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
1476 | 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} | |
1477 | fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 7a230b46bf61e50b30308c6cfd7bd1269ef54702 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
1477 | fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 7a230b46bf61e50b30308c6cfd7bd1269ef54702 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} | |
1478 |
|
1478 | |||
1479 | Check templates |
|
1479 | Check templates | |
1480 | --------------- |
|
1480 | --------------- | |
1481 |
|
1481 | |||
1482 | Predecessors template should show current revision as it is the working copy |
|
1482 | Predecessors template should show current revision as it is the working copy | |
1483 | $ hg tlog |
|
1483 | $ hg tlog | |
1484 | o 7a230b46bf61 |
|
1484 | o 7a230b46bf61 | |
1485 | | Predecessors: 1:471f378eab4c |
|
1485 | | Predecessors: 1:471f378eab4c | |
1486 | | semi-colon: 1:471f378eab4c |
|
1486 | | semi-colon: 1:471f378eab4c | |
1487 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1487 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
1488 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1488 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
1489 | | @ 471f378eab4c |
|
1489 | | @ 471f378eab4c | |
1490 | |/ Successors: 2:7a230b46bf61 |
|
1490 | |/ Successors: 2:7a230b46bf61 | |
1491 | | multi-line: 2:7a230b46bf61 |
|
1491 | | multi-line: 2:7a230b46bf61 | |
1492 | | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] |
|
1492 | | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] | |
1493 | o ea207398892e |
|
1493 | o ea207398892e | |
1494 |
|
1494 | |||
1495 |
|
1495 | |||
1496 | $ hg fatelog |
|
1496 | $ hg fatelog | |
1497 | o 7a230b46bf61 |
|
1497 | o 7a230b46bf61 | |
1498 | | |
|
1498 | | | |
1499 | | @ 471f378eab4c |
|
1499 | | @ 471f378eab4c | |
1500 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000); |
|
1500 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000); | |
1501 | o ea207398892e |
|
1501 | o ea207398892e | |
1502 |
|
1502 | |||
1503 | $ hg up 'desc(A2)' |
|
1503 | $ hg up 'desc(A2)' | |
1504 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1504 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1505 |
|
1505 | |||
1506 | Predecessors template should show no predecessors as they are non visible |
|
1506 | Predecessors template should show no predecessors as they are non visible | |
1507 | $ hg tlog |
|
1507 | $ hg tlog | |
1508 | @ 7a230b46bf61 |
|
1508 | @ 7a230b46bf61 | |
1509 | | |
|
1509 | | | |
1510 | o ea207398892e |
|
1510 | o ea207398892e | |
1511 |
|
1511 | |||
1512 |
|
1512 | |||
1513 | $ hg fatelog |
|
1513 | $ hg fatelog | |
1514 | @ 7a230b46bf61 |
|
1514 | @ 7a230b46bf61 | |
1515 | | |
|
1515 | | | |
1516 | o ea207398892e |
|
1516 | o ea207398892e | |
1517 |
|
1517 | |||
1518 | Predecessors template should show all predecessors as we force their display |
|
1518 | Predecessors template should show all predecessors as we force their display | |
1519 | with --hidden |
|
1519 | with --hidden | |
1520 | $ hg tlog --hidden |
|
1520 | $ hg tlog --hidden | |
1521 | @ 7a230b46bf61 |
|
1521 | @ 7a230b46bf61 | |
1522 | | Predecessors: 1:471f378eab4c |
|
1522 | | Predecessors: 1:471f378eab4c | |
1523 | | semi-colon: 1:471f378eab4c |
|
1523 | | semi-colon: 1:471f378eab4c | |
1524 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1524 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
1525 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1525 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
1526 | | x 471f378eab4c |
|
1526 | | x 471f378eab4c | |
1527 | |/ Successors: 2:7a230b46bf61 |
|
1527 | |/ Successors: 2:7a230b46bf61 | |
1528 | | multi-line: 2:7a230b46bf61 |
|
1528 | | multi-line: 2:7a230b46bf61 | |
1529 | | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] |
|
1529 | | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]] | |
1530 | o ea207398892e |
|
1530 | o ea207398892e | |
1531 |
|
1531 | |||
1532 |
|
1532 | |||
1533 | $ hg fatelog --hidden |
|
1533 | $ hg fatelog --hidden | |
1534 | @ 7a230b46bf61 |
|
1534 | @ 7a230b46bf61 | |
1535 | | |
|
1535 | | | |
1536 | | x 471f378eab4c |
|
1536 | | x 471f378eab4c | |
1537 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000); |
|
1537 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000); | |
1538 | o ea207398892e |
|
1538 | o ea207398892e | |
1539 |
|
1539 | |||
1540 |
|
1540 | |||
1541 | Check other fatelog implementations |
|
1541 | Check other fatelog implementations | |
1542 | ----------------------------------- |
|
1542 | ----------------------------------- | |
1543 |
|
1543 | |||
1544 | $ hg fatelogkw --hidden -q |
|
1544 | $ hg fatelogkw --hidden -q | |
1545 | @ 7a230b46bf61 |
|
1545 | @ 7a230b46bf61 | |
1546 | | |
|
1546 | | | |
1547 | | x 471f378eab4c |
|
1547 | | x 471f378eab4c | |
1548 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 |
|
1548 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 | |
1549 | o ea207398892e |
|
1549 | o ea207398892e | |
1550 |
|
1550 | |||
1551 | $ hg fatelogkw --hidden |
|
1551 | $ hg fatelogkw --hidden | |
1552 | @ 7a230b46bf61 |
|
1552 | @ 7a230b46bf61 | |
1553 | | |
|
1553 | | | |
1554 | | x 471f378eab4c |
|
1554 | | x 471f378eab4c | |
1555 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 |
|
1555 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 | |
1556 | o ea207398892e |
|
1556 | o ea207398892e | |
1557 |
|
1557 | |||
1558 | $ hg fatelogkw --hidden -v |
|
1558 | $ hg fatelogkw --hidden -v | |
1559 | @ 7a230b46bf61 |
|
1559 | @ 7a230b46bf61 | |
1560 | | |
|
1560 | | | |
1561 | | x 471f378eab4c |
|
1561 | | x 471f378eab4c | |
1562 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) |
|
1562 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) | |
1563 | o ea207398892e |
|
1563 | o ea207398892e | |
1564 |
|
1564 | |||
1565 | $ hg log -G -T "default" --hidden |
|
1565 | $ hg log -G -T "default" --hidden | |
1566 | @ changeset: 2:7a230b46bf61 |
|
1566 | @ changeset: 2:7a230b46bf61 | |
1567 | | tag: tip |
|
1567 | | tag: tip | |
1568 | | parent: 0:ea207398892e |
|
1568 | | parent: 0:ea207398892e | |
1569 | | user: test |
|
1569 | | user: test | |
1570 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1570 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1571 | | summary: A2 |
|
1571 | | summary: A2 | |
1572 | | |
|
1572 | | | |
1573 | | x changeset: 1:471f378eab4c |
|
1573 | | x changeset: 1:471f378eab4c | |
1574 | |/ user: test |
|
1574 | |/ user: test | |
1575 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1575 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1576 | | obsolete: rewritten using amend as 2:7a230b46bf61 |
|
1576 | | obsolete: rewritten using amend as 2:7a230b46bf61 | |
1577 | | summary: A0 |
|
1577 | | summary: A0 | |
1578 | | |
|
1578 | | | |
1579 | o changeset: 0:ea207398892e |
|
1579 | o changeset: 0:ea207398892e | |
1580 | user: test |
|
1580 | user: test | |
1581 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1581 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1582 | summary: ROOT |
|
1582 | summary: ROOT | |
1583 |
|
1583 | |||
1584 |
|
1584 | |||
1585 | Test template with obsmarkers cycle |
|
1585 | Test template with obsmarkers cycle | |
1586 | =================================== |
|
1586 | =================================== | |
1587 |
|
1587 | |||
1588 | Test setup |
|
1588 | Test setup | |
1589 | ---------- |
|
1589 | ---------- | |
1590 |
|
1590 | |||
1591 | $ hg init $TESTTMP/templates-local-cycle |
|
1591 | $ hg init $TESTTMP/templates-local-cycle | |
1592 | $ cd $TESTTMP/templates-local-cycle |
|
1592 | $ cd $TESTTMP/templates-local-cycle | |
1593 | $ mkcommit ROOT |
|
1593 | $ mkcommit ROOT | |
1594 | $ mkcommit A0 |
|
1594 | $ mkcommit A0 | |
1595 | $ mkcommit B0 |
|
1595 | $ mkcommit B0 | |
1596 | $ hg up -r 0 |
|
1596 | $ hg up -r 0 | |
1597 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1597 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
1598 | $ mkcommit C0 |
|
1598 | $ mkcommit C0 | |
1599 | created new head |
|
1599 | created new head | |
1600 |
|
1600 | |||
1601 | Create the cycle |
|
1601 | Create the cycle | |
1602 |
|
1602 | |||
1603 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` |
|
1603 | $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` | |
1604 | obsoleted 1 changesets |
|
1604 | obsoleted 1 changesets | |
1605 | 1 new orphan changesets |
|
1605 | 1 new orphan changesets | |
1606 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` |
|
1606 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` | |
1607 | obsoleted 1 changesets |
|
1607 | obsoleted 1 changesets | |
1608 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` |
|
1608 | $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` | |
1609 |
|
1609 | |||
1610 | Check templates |
|
1610 | Check templates | |
1611 | --------------- |
|
1611 | --------------- | |
1612 |
|
1612 | |||
1613 | $ hg tlog |
|
1613 | $ hg tlog | |
1614 | @ f897c6137566 |
|
1614 | @ f897c6137566 | |
1615 | | |
|
1615 | | | |
1616 | o ea207398892e |
|
1616 | o ea207398892e | |
1617 |
|
1617 | |||
1618 |
|
1618 | |||
1619 | $ hg fatelog |
|
1619 | $ hg fatelog | |
1620 | @ f897c6137566 |
|
1620 | @ f897c6137566 | |
1621 | | |
|
1621 | | | |
1622 | o ea207398892e |
|
1622 | o ea207398892e | |
1623 |
|
1623 | |||
1624 |
|
1624 | |||
1625 | $ hg up -r "desc(B0)" --hidden |
|
1625 | $ hg up -r "desc(B0)" --hidden | |
1626 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1626 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1627 | updated to hidden changeset 0dec01379d3b |
|
1627 | updated to hidden changeset 0dec01379d3b | |
1628 | (hidden revision '0dec01379d3b' is pruned) |
|
1628 | (hidden revision '0dec01379d3b' is pruned) | |
1629 | $ hg tlog |
|
1629 | $ hg tlog | |
1630 | o f897c6137566 |
|
1630 | o f897c6137566 | |
1631 | | Predecessors: 2:0dec01379d3b |
|
1631 | | Predecessors: 2:0dec01379d3b | |
1632 | | semi-colon: 2:0dec01379d3b |
|
1632 | | semi-colon: 2:0dec01379d3b | |
1633 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1633 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
1634 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1634 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
1635 | | @ 0dec01379d3b |
|
1635 | | @ 0dec01379d3b | |
1636 | | | Predecessors: 1:471f378eab4c |
|
1636 | | | Predecessors: 1:471f378eab4c | |
1637 | | | semi-colon: 1:471f378eab4c |
|
1637 | | | semi-colon: 1:471f378eab4c | |
1638 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1638 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
1639 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1639 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
1640 | | | Successors: 3:f897c6137566; 1:471f378eab4c |
|
1640 | | | Successors: 3:f897c6137566; 1:471f378eab4c | |
1641 | | | multi-line: 3:f897c6137566 |
|
1641 | | | multi-line: 3:f897c6137566 | |
1642 | | | multi-line: 1:471f378eab4c |
|
1642 | | | multi-line: 1:471f378eab4c | |
1643 | | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
|
1643 | | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] | |
1644 | | x 471f378eab4c |
|
1644 | | x 471f378eab4c | |
1645 | |/ Predecessors: 2:0dec01379d3b |
|
1645 | |/ Predecessors: 2:0dec01379d3b | |
1646 | | semi-colon: 2:0dec01379d3b |
|
1646 | | semi-colon: 2:0dec01379d3b | |
1647 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1647 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
1648 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1648 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
1649 | | Successors: 2:0dec01379d3b |
|
1649 | | Successors: 2:0dec01379d3b | |
1650 | | multi-line: 2:0dec01379d3b |
|
1650 | | multi-line: 2:0dec01379d3b | |
1651 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
|
1651 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] | |
1652 | o ea207398892e |
|
1652 | o ea207398892e | |
1653 |
|
1653 | |||
1654 |
|
1654 | |||
1655 | $ hg fatelog |
|
1655 | $ hg fatelog | |
1656 | o f897c6137566 |
|
1656 | o f897c6137566 | |
1657 | | |
|
1657 | | | |
1658 | | @ 0dec01379d3b |
|
1658 | | @ 0dec01379d3b | |
1659 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000); |
|
1659 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000); | |
1660 | | x 471f378eab4c |
|
1660 | | x 471f378eab4c | |
1661 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000); |
|
1661 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000); | |
1662 | o ea207398892e |
|
1662 | o ea207398892e | |
1663 |
|
1663 | |||
1664 |
|
1664 | |||
1665 | $ hg up -r "desc(A0)" --hidden |
|
1665 | $ hg up -r "desc(A0)" --hidden | |
1666 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1666 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1667 | $ hg tlog |
|
1667 | $ hg tlog | |
1668 | o f897c6137566 |
|
1668 | o f897c6137566 | |
1669 | | Predecessors: 1:471f378eab4c |
|
1669 | | Predecessors: 1:471f378eab4c | |
1670 | | semi-colon: 1:471f378eab4c |
|
1670 | | semi-colon: 1:471f378eab4c | |
1671 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1671 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
1672 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1672 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
1673 | | @ 471f378eab4c |
|
1673 | | @ 471f378eab4c | |
1674 | |/ |
|
1674 | |/ | |
1675 | o ea207398892e |
|
1675 | o ea207398892e | |
1676 |
|
1676 | |||
1677 |
|
1677 | |||
1678 | $ hg fatelog |
|
1678 | $ hg fatelog | |
1679 | o f897c6137566 |
|
1679 | o f897c6137566 | |
1680 | | |
|
1680 | | | |
1681 | | @ 471f378eab4c |
|
1681 | | @ 471f378eab4c | |
1682 | |/ Obsfate: pruned; |
|
1682 | |/ Obsfate: pruned; | |
1683 | o ea207398892e |
|
1683 | o ea207398892e | |
1684 |
|
1684 | |||
1685 |
|
1685 | |||
1686 | $ hg up -r "desc(ROOT)" --hidden |
|
1686 | $ hg up -r "desc(ROOT)" --hidden | |
1687 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1687 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1688 | $ hg tlog |
|
1688 | $ hg tlog | |
1689 | o f897c6137566 |
|
1689 | o f897c6137566 | |
1690 | | |
|
1690 | | | |
1691 | @ ea207398892e |
|
1691 | @ ea207398892e | |
1692 |
|
1692 | |||
1693 |
|
1693 | |||
1694 | $ hg fatelog |
|
1694 | $ hg fatelog | |
1695 | o f897c6137566 |
|
1695 | o f897c6137566 | |
1696 | | |
|
1696 | | | |
1697 | @ ea207398892e |
|
1697 | @ ea207398892e | |
1698 |
|
1698 | |||
1699 |
|
1699 | |||
1700 | $ hg tlog --hidden |
|
1700 | $ hg tlog --hidden | |
1701 | o f897c6137566 |
|
1701 | o f897c6137566 | |
1702 | | Predecessors: 2:0dec01379d3b |
|
1702 | | Predecessors: 2:0dec01379d3b | |
1703 | | semi-colon: 2:0dec01379d3b |
|
1703 | | semi-colon: 2:0dec01379d3b | |
1704 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1704 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
1705 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1705 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
1706 | | x 0dec01379d3b |
|
1706 | | x 0dec01379d3b | |
1707 | | | Predecessors: 1:471f378eab4c |
|
1707 | | | Predecessors: 1:471f378eab4c | |
1708 | | | semi-colon: 1:471f378eab4c |
|
1708 | | | semi-colon: 1:471f378eab4c | |
1709 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
1709 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
1710 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
1710 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
1711 | | | Successors: 3:f897c6137566; 1:471f378eab4c |
|
1711 | | | Successors: 3:f897c6137566; 1:471f378eab4c | |
1712 | | | multi-line: 3:f897c6137566 |
|
1712 | | | multi-line: 3:f897c6137566 | |
1713 | | | multi-line: 1:471f378eab4c |
|
1713 | | | multi-line: 1:471f378eab4c | |
1714 | | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
|
1714 | | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] | |
1715 | | x 471f378eab4c |
|
1715 | | x 471f378eab4c | |
1716 | |/ Predecessors: 2:0dec01379d3b |
|
1716 | |/ Predecessors: 2:0dec01379d3b | |
1717 | | semi-colon: 2:0dec01379d3b |
|
1717 | | semi-colon: 2:0dec01379d3b | |
1718 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
1718 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
1719 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
1719 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
1720 | | Successors: 2:0dec01379d3b |
|
1720 | | Successors: 2:0dec01379d3b | |
1721 | | multi-line: 2:0dec01379d3b |
|
1721 | | multi-line: 2:0dec01379d3b | |
1722 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
|
1722 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] | |
1723 | @ ea207398892e |
|
1723 | @ ea207398892e | |
1724 |
|
1724 | |||
1725 |
|
1725 | |||
1726 | Check other fatelog implementations |
|
1726 | Check other fatelog implementations | |
1727 | ----------------------------------- |
|
1727 | ----------------------------------- | |
1728 |
|
1728 | |||
1729 | $ hg fatelogkw --hidden -q |
|
1729 | $ hg fatelogkw --hidden -q | |
1730 | o f897c6137566 |
|
1730 | o f897c6137566 | |
1731 | | |
|
1731 | | | |
1732 | | x 0dec01379d3b |
|
1732 | | x 0dec01379d3b | |
1733 | | | Obsfate: rewritten as 3:f897c6137566 |
|
1733 | | | Obsfate: rewritten as 3:f897c6137566 | |
1734 | | | Obsfate: rewritten as 1:471f378eab4c |
|
1734 | | | Obsfate: rewritten as 1:471f378eab4c | |
1735 | | x 471f378eab4c |
|
1735 | | x 471f378eab4c | |
1736 | |/ Obsfate: rewritten as 2:0dec01379d3b |
|
1736 | |/ Obsfate: rewritten as 2:0dec01379d3b | |
1737 | @ ea207398892e |
|
1737 | @ ea207398892e | |
1738 |
|
1738 | |||
1739 | $ hg fatelogkw --hidden |
|
1739 | $ hg fatelogkw --hidden | |
1740 | o f897c6137566 |
|
1740 | o f897c6137566 | |
1741 | | |
|
1741 | | | |
1742 | | x 0dec01379d3b |
|
1742 | | x 0dec01379d3b | |
1743 | | | Obsfate: rewritten as 3:f897c6137566 |
|
1743 | | | Obsfate: rewritten as 3:f897c6137566 | |
1744 | | | Obsfate: rewritten as 1:471f378eab4c |
|
1744 | | | Obsfate: rewritten as 1:471f378eab4c | |
1745 | | x 471f378eab4c |
|
1745 | | x 471f378eab4c | |
1746 | |/ Obsfate: rewritten as 2:0dec01379d3b |
|
1746 | |/ Obsfate: rewritten as 2:0dec01379d3b | |
1747 | @ ea207398892e |
|
1747 | @ ea207398892e | |
1748 |
|
1748 | |||
1749 | $ hg fatelogkw --hidden -v |
|
1749 | $ hg fatelogkw --hidden -v | |
1750 | o f897c6137566 |
|
1750 | o f897c6137566 | |
1751 | | |
|
1751 | | | |
1752 | | x 0dec01379d3b |
|
1752 | | x 0dec01379d3b | |
1753 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) |
|
1753 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) | |
1754 | | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) |
|
1754 | | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) | |
1755 | | x 471f378eab4c |
|
1755 | | x 471f378eab4c | |
1756 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) |
|
1756 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) | |
1757 | @ ea207398892e |
|
1757 | @ ea207398892e | |
1758 |
|
1758 | |||
1759 | $ hg log -G -T "default" --hidden |
|
1759 | $ hg log -G -T "default" --hidden | |
1760 | o changeset: 3:f897c6137566 |
|
1760 | o changeset: 3:f897c6137566 | |
1761 | | tag: tip |
|
1761 | | tag: tip | |
1762 | | parent: 0:ea207398892e |
|
1762 | | parent: 0:ea207398892e | |
1763 | | user: test |
|
1763 | | user: test | |
1764 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1764 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1765 | | summary: C0 |
|
1765 | | summary: C0 | |
1766 | | |
|
1766 | | | |
1767 | | x changeset: 2:0dec01379d3b |
|
1767 | | x changeset: 2:0dec01379d3b | |
1768 | | | user: test |
|
1768 | | | user: test | |
1769 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1769 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1770 | | | obsolete: rewritten as 3:f897c6137566 |
|
1770 | | | obsolete: rewritten as 3:f897c6137566 | |
1771 | | | obsolete: rewritten as 1:471f378eab4c |
|
1771 | | | obsolete: rewritten as 1:471f378eab4c | |
1772 | | | summary: B0 |
|
1772 | | | summary: B0 | |
1773 | | | |
|
1773 | | | | |
1774 | | x changeset: 1:471f378eab4c |
|
1774 | | x changeset: 1:471f378eab4c | |
1775 | |/ user: test |
|
1775 | |/ user: test | |
1776 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1776 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1777 | | obsolete: rewritten as 2:0dec01379d3b |
|
1777 | | obsolete: rewritten as 2:0dec01379d3b | |
1778 | | summary: A0 |
|
1778 | | summary: A0 | |
1779 | | |
|
1779 | | | |
1780 | @ changeset: 0:ea207398892e |
|
1780 | @ changeset: 0:ea207398892e | |
1781 | user: test |
|
1781 | user: test | |
1782 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1782 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1783 | summary: ROOT |
|
1783 | summary: ROOT | |
1784 |
|
1784 | |||
1785 |
|
1785 | |||
1786 | Test template with split + divergence with cycles |
|
1786 | Test template with split + divergence with cycles | |
1787 | ================================================= |
|
1787 | ================================================= | |
1788 |
|
1788 | |||
1789 | $ hg log -G |
|
1789 | $ hg log -G | |
1790 | o changeset: 3:f897c6137566 |
|
1790 | o changeset: 3:f897c6137566 | |
1791 | | tag: tip |
|
1791 | | tag: tip | |
1792 | | parent: 0:ea207398892e |
|
1792 | | parent: 0:ea207398892e | |
1793 | | user: test |
|
1793 | | user: test | |
1794 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1794 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1795 | | summary: C0 |
|
1795 | | summary: C0 | |
1796 | | |
|
1796 | | | |
1797 | @ changeset: 0:ea207398892e |
|
1797 | @ changeset: 0:ea207398892e | |
1798 | user: test |
|
1798 | user: test | |
1799 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1799 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1800 | summary: ROOT |
|
1800 | summary: ROOT | |
1801 |
|
1801 | |||
1802 | $ hg up |
|
1802 | $ hg up | |
1803 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1803 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1804 |
|
1804 | |||
1805 | Create a commit with three files |
|
1805 | Create a commit with three files | |
1806 | $ touch A B C |
|
1806 | $ touch A B C | |
1807 | $ hg commit -A -m "Add A,B,C" A B C |
|
1807 | $ hg commit -A -m "Add A,B,C" A B C | |
1808 |
|
1808 | |||
1809 | Split it |
|
1809 | Split it | |
1810 | $ hg up 3 |
|
1810 | $ hg up 3 | |
1811 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
1811 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
1812 | $ touch A |
|
1812 | $ touch A | |
1813 | $ hg commit -A -m "Add A,B,C" A |
|
1813 | $ hg commit -A -m "Add A,B,C" A | |
1814 | created new head |
|
1814 | created new head | |
1815 |
|
1815 | |||
1816 | $ touch B |
|
1816 | $ touch B | |
1817 | $ hg commit -A -m "Add A,B,C" B |
|
1817 | $ hg commit -A -m "Add A,B,C" B | |
1818 |
|
1818 | |||
1819 | $ touch C |
|
1819 | $ touch C | |
1820 | $ hg commit -A -m "Add A,B,C" C |
|
1820 | $ hg commit -A -m "Add A,B,C" C | |
1821 |
|
1821 | |||
1822 | $ hg log -G |
|
1822 | $ hg log -G | |
1823 | @ changeset: 7:ba2ed02b0c9a |
|
1823 | @ changeset: 7:ba2ed02b0c9a | |
1824 | | tag: tip |
|
1824 | | tag: tip | |
1825 | | user: test |
|
1825 | | user: test | |
1826 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1826 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1827 | | summary: Add A,B,C |
|
1827 | | summary: Add A,B,C | |
1828 | | |
|
1828 | | | |
1829 | o changeset: 6:4a004186e638 |
|
1829 | o changeset: 6:4a004186e638 | |
1830 | | user: test |
|
1830 | | user: test | |
1831 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1831 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1832 | | summary: Add A,B,C |
|
1832 | | summary: Add A,B,C | |
1833 | | |
|
1833 | | | |
1834 | o changeset: 5:dd800401bd8c |
|
1834 | o changeset: 5:dd800401bd8c | |
1835 | | parent: 3:f897c6137566 |
|
1835 | | parent: 3:f897c6137566 | |
1836 | | user: test |
|
1836 | | user: test | |
1837 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1837 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1838 | | summary: Add A,B,C |
|
1838 | | summary: Add A,B,C | |
1839 | | |
|
1839 | | | |
1840 | | o changeset: 4:9bd10a0775e4 |
|
1840 | | o changeset: 4:9bd10a0775e4 | |
1841 | |/ user: test |
|
1841 | |/ user: test | |
1842 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1842 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1843 | | summary: Add A,B,C |
|
1843 | | summary: Add A,B,C | |
1844 | | |
|
1844 | | | |
1845 | o changeset: 3:f897c6137566 |
|
1845 | o changeset: 3:f897c6137566 | |
1846 | | parent: 0:ea207398892e |
|
1846 | | parent: 0:ea207398892e | |
1847 | | user: test |
|
1847 | | user: test | |
1848 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1848 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1849 | | summary: C0 |
|
1849 | | summary: C0 | |
1850 | | |
|
1850 | | | |
1851 | o changeset: 0:ea207398892e |
|
1851 | o changeset: 0:ea207398892e | |
1852 | user: test |
|
1852 | user: test | |
1853 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1853 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1854 | summary: ROOT |
|
1854 | summary: ROOT | |
1855 |
|
1855 | |||
1856 | $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"` |
|
1856 | $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"` | |
1857 | obsoleted 1 changesets |
|
1857 | obsoleted 1 changesets | |
1858 | $ hg log -G |
|
1858 | $ hg log -G | |
1859 | @ changeset: 7:ba2ed02b0c9a |
|
1859 | @ changeset: 7:ba2ed02b0c9a | |
1860 | | tag: tip |
|
1860 | | tag: tip | |
1861 | | user: test |
|
1861 | | user: test | |
1862 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1862 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1863 | | summary: Add A,B,C |
|
1863 | | summary: Add A,B,C | |
1864 | | |
|
1864 | | | |
1865 | o changeset: 6:4a004186e638 |
|
1865 | o changeset: 6:4a004186e638 | |
1866 | | user: test |
|
1866 | | user: test | |
1867 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1867 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1868 | | summary: Add A,B,C |
|
1868 | | summary: Add A,B,C | |
1869 | | |
|
1869 | | | |
1870 | o changeset: 5:dd800401bd8c |
|
1870 | o changeset: 5:dd800401bd8c | |
1871 | | parent: 3:f897c6137566 |
|
1871 | | parent: 3:f897c6137566 | |
1872 | | user: test |
|
1872 | | user: test | |
1873 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1873 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1874 | | summary: Add A,B,C |
|
1874 | | summary: Add A,B,C | |
1875 | | |
|
1875 | | | |
1876 | o changeset: 3:f897c6137566 |
|
1876 | o changeset: 3:f897c6137566 | |
1877 | | parent: 0:ea207398892e |
|
1877 | | parent: 0:ea207398892e | |
1878 | | user: test |
|
1878 | | user: test | |
1879 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1879 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1880 | | summary: C0 |
|
1880 | | summary: C0 | |
1881 | | |
|
1881 | | | |
1882 | o changeset: 0:ea207398892e |
|
1882 | o changeset: 0:ea207398892e | |
1883 | user: test |
|
1883 | user: test | |
1884 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1884 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1885 | summary: ROOT |
|
1885 | summary: ROOT | |
1886 |
|
1886 | |||
1887 | Diverge one of the splitted commit |
|
1887 | Diverge one of the splitted commit | |
1888 |
|
1888 | |||
1889 | $ hg up 6 |
|
1889 | $ hg up 6 | |
1890 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1890 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1891 | $ hg commit --amend -m "Add only B" |
|
1891 | $ hg commit --amend -m "Add only B" | |
1892 | 1 new orphan changesets |
|
1892 | 1 new orphan changesets | |
1893 |
|
1893 | |||
1894 | $ hg up 6 --hidden |
|
1894 | $ hg up 6 --hidden | |
1895 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1895 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1896 | $ hg commit --amend -m "Add B only" |
|
1896 | $ hg commit --amend -m "Add B only" | |
1897 | 4 new content-divergent changesets |
|
1897 | 4 new content-divergent changesets | |
1898 |
|
1898 | |||
1899 | $ hg log -G |
|
1899 | $ hg log -G | |
1900 | @ changeset: 9:0b997eb7ceee |
|
1900 | @ changeset: 9:0b997eb7ceee | |
1901 | | tag: tip |
|
1901 | | tag: tip | |
1902 | | parent: 5:dd800401bd8c |
|
1902 | | parent: 5:dd800401bd8c | |
1903 | | user: test |
|
1903 | | user: test | |
1904 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1904 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1905 | | instability: content-divergent |
|
1905 | | instability: content-divergent | |
1906 | | summary: Add B only |
|
1906 | | summary: Add B only | |
1907 | | |
|
1907 | | | |
1908 | | * changeset: 8:b18bc8331526 |
|
1908 | | * changeset: 8:b18bc8331526 | |
1909 | |/ parent: 5:dd800401bd8c |
|
1909 | |/ parent: 5:dd800401bd8c | |
1910 | | user: test |
|
1910 | | user: test | |
1911 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1911 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1912 | | instability: content-divergent |
|
1912 | | instability: content-divergent | |
1913 | | summary: Add only B |
|
1913 | | summary: Add only B | |
1914 | | |
|
1914 | | | |
1915 | | * changeset: 7:ba2ed02b0c9a |
|
1915 | | * changeset: 7:ba2ed02b0c9a | |
1916 | | | user: test |
|
1916 | | | user: test | |
1917 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1917 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1918 | | | instability: orphan, content-divergent |
|
1918 | | | instability: orphan, content-divergent | |
1919 | | | summary: Add A,B,C |
|
1919 | | | summary: Add A,B,C | |
1920 | | | |
|
1920 | | | | |
1921 | | x changeset: 6:4a004186e638 |
|
1921 | | x changeset: 6:4a004186e638 | |
1922 | |/ user: test |
|
1922 | |/ user: test | |
1923 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1923 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1924 | | obsolete: rewritten using amend as 8:b18bc8331526 |
|
1924 | | obsolete: rewritten using amend as 8:b18bc8331526 | |
1925 | | obsolete: rewritten using amend as 9:0b997eb7ceee |
|
1925 | | obsolete: rewritten using amend as 9:0b997eb7ceee | |
1926 | | summary: Add A,B,C |
|
1926 | | summary: Add A,B,C | |
1927 | | |
|
1927 | | | |
1928 | * changeset: 5:dd800401bd8c |
|
1928 | * changeset: 5:dd800401bd8c | |
1929 | | parent: 3:f897c6137566 |
|
1929 | | parent: 3:f897c6137566 | |
1930 | | user: test |
|
1930 | | user: test | |
1931 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1931 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1932 | | instability: content-divergent |
|
1932 | | instability: content-divergent | |
1933 | | summary: Add A,B,C |
|
1933 | | summary: Add A,B,C | |
1934 | | |
|
1934 | | | |
1935 | o changeset: 3:f897c6137566 |
|
1935 | o changeset: 3:f897c6137566 | |
1936 | | parent: 0:ea207398892e |
|
1936 | | parent: 0:ea207398892e | |
1937 | | user: test |
|
1937 | | user: test | |
1938 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1938 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1939 | | summary: C0 |
|
1939 | | summary: C0 | |
1940 | | |
|
1940 | | | |
1941 | o changeset: 0:ea207398892e |
|
1941 | o changeset: 0:ea207398892e | |
1942 | user: test |
|
1942 | user: test | |
1943 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1943 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1944 | summary: ROOT |
|
1944 | summary: ROOT | |
1945 |
|
1945 | |||
1946 |
|
1946 | |||
1947 | Check templates |
|
1947 | Check templates | |
1948 | --------------- |
|
1948 | --------------- | |
1949 |
|
1949 | |||
1950 | $ hg tlog |
|
1950 | $ hg tlog | |
1951 | @ 0b997eb7ceee |
|
1951 | @ 0b997eb7ceee | |
1952 | | Predecessors: 6:4a004186e638 |
|
1952 | | Predecessors: 6:4a004186e638 | |
1953 | | semi-colon: 6:4a004186e638 |
|
1953 | | semi-colon: 6:4a004186e638 | |
1954 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
|
1954 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] | |
1955 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
|
1955 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace | |
1956 | | * b18bc8331526 |
|
1956 | | * b18bc8331526 | |
1957 | |/ Predecessors: 6:4a004186e638 |
|
1957 | |/ Predecessors: 6:4a004186e638 | |
1958 | | semi-colon: 6:4a004186e638 |
|
1958 | | semi-colon: 6:4a004186e638 | |
1959 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
|
1959 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] | |
1960 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
|
1960 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace | |
1961 | | * ba2ed02b0c9a |
|
1961 | | * ba2ed02b0c9a | |
1962 | | | |
|
1962 | | | | |
1963 | | x 4a004186e638 |
|
1963 | | x 4a004186e638 | |
1964 | |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee |
|
1964 | |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee | |
1965 | | multi-line: 8:b18bc8331526 |
|
1965 | | multi-line: 8:b18bc8331526 | |
1966 | | multi-line: 9:0b997eb7ceee |
|
1966 | | multi-line: 9:0b997eb7ceee | |
1967 | | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
|
1967 | | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] | |
1968 | * dd800401bd8c |
|
1968 | * dd800401bd8c | |
1969 | | |
|
1969 | | | |
1970 | o f897c6137566 |
|
1970 | o f897c6137566 | |
1971 | | |
|
1971 | | | |
1972 | o ea207398892e |
|
1972 | o ea207398892e | |
1973 |
|
1973 | |||
1974 | $ hg fatelog |
|
1974 | $ hg fatelog | |
1975 | @ 0b997eb7ceee |
|
1975 | @ 0b997eb7ceee | |
1976 | | |
|
1976 | | | |
1977 | | * b18bc8331526 |
|
1977 | | * b18bc8331526 | |
1978 | |/ |
|
1978 | |/ | |
1979 | | * ba2ed02b0c9a |
|
1979 | | * ba2ed02b0c9a | |
1980 | | | |
|
1980 | | | | |
1981 | | x 4a004186e638 |
|
1981 | | x 4a004186e638 | |
1982 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); |
|
1982 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); | |
1983 | * dd800401bd8c |
|
1983 | * dd800401bd8c | |
1984 | | |
|
1984 | | | |
1985 | o f897c6137566 |
|
1985 | o f897c6137566 | |
1986 | | |
|
1986 | | | |
1987 | o ea207398892e |
|
1987 | o ea207398892e | |
1988 |
|
1988 | |||
1989 | $ hg tlog --hidden |
|
1989 | $ hg tlog --hidden | |
1990 | @ 0b997eb7ceee |
|
1990 | @ 0b997eb7ceee | |
1991 | | Predecessors: 6:4a004186e638 |
|
1991 | | Predecessors: 6:4a004186e638 | |
1992 | | semi-colon: 6:4a004186e638 |
|
1992 | | semi-colon: 6:4a004186e638 | |
1993 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
|
1993 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] | |
1994 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
|
1994 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace | |
1995 | | * b18bc8331526 |
|
1995 | | * b18bc8331526 | |
1996 | |/ Predecessors: 6:4a004186e638 |
|
1996 | |/ Predecessors: 6:4a004186e638 | |
1997 | | semi-colon: 6:4a004186e638 |
|
1997 | | semi-colon: 6:4a004186e638 | |
1998 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
|
1998 | | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] | |
1999 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
|
1999 | | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace | |
2000 | | * ba2ed02b0c9a |
|
2000 | | * ba2ed02b0c9a | |
2001 | | | Predecessors: 4:9bd10a0775e4 |
|
2001 | | | Predecessors: 4:9bd10a0775e4 | |
2002 | | | semi-colon: 4:9bd10a0775e4 |
|
2002 | | | semi-colon: 4:9bd10a0775e4 | |
2003 | | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
2003 | | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] | |
2004 | | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
2004 | | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 | |
2005 | | x 4a004186e638 |
|
2005 | | x 4a004186e638 | |
2006 | |/ Predecessors: 4:9bd10a0775e4 |
|
2006 | |/ Predecessors: 4:9bd10a0775e4 | |
2007 | | semi-colon: 4:9bd10a0775e4 |
|
2007 | | semi-colon: 4:9bd10a0775e4 | |
2008 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
2008 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] | |
2009 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
2009 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 | |
2010 | | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
|
2010 | | Successors: 8:b18bc8331526; 9:0b997eb7ceee | |
2011 | | multi-line: 8:b18bc8331526 |
|
2011 | | multi-line: 8:b18bc8331526 | |
2012 | | multi-line: 9:0b997eb7ceee |
|
2012 | | multi-line: 9:0b997eb7ceee | |
2013 | | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
|
2013 | | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] | |
2014 | * dd800401bd8c |
|
2014 | * dd800401bd8c | |
2015 | | Predecessors: 4:9bd10a0775e4 |
|
2015 | | Predecessors: 4:9bd10a0775e4 | |
2016 | | semi-colon: 4:9bd10a0775e4 |
|
2016 | | semi-colon: 4:9bd10a0775e4 | |
2017 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
2017 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] | |
2018 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
2018 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 | |
2019 | | x 9bd10a0775e4 |
|
2019 | | x 9bd10a0775e4 | |
2020 | |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
|
2020 | |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a | |
2021 | | multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
|
2021 | | multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a | |
2022 | | json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]] |
|
2022 | | json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]] | |
2023 | o f897c6137566 |
|
2023 | o f897c6137566 | |
2024 | | Predecessors: 2:0dec01379d3b |
|
2024 | | Predecessors: 2:0dec01379d3b | |
2025 | | semi-colon: 2:0dec01379d3b |
|
2025 | | semi-colon: 2:0dec01379d3b | |
2026 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
2026 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
2027 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
2027 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
2028 | | x 0dec01379d3b |
|
2028 | | x 0dec01379d3b | |
2029 | | | Predecessors: 1:471f378eab4c |
|
2029 | | | Predecessors: 1:471f378eab4c | |
2030 | | | semi-colon: 1:471f378eab4c |
|
2030 | | | semi-colon: 1:471f378eab4c | |
2031 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
|
2031 | | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] | |
2032 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
|
2032 | | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 | |
2033 | | | Successors: 3:f897c6137566; 1:471f378eab4c |
|
2033 | | | Successors: 3:f897c6137566; 1:471f378eab4c | |
2034 | | | multi-line: 3:f897c6137566 |
|
2034 | | | multi-line: 3:f897c6137566 | |
2035 | | | multi-line: 1:471f378eab4c |
|
2035 | | | multi-line: 1:471f378eab4c | |
2036 | | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] |
|
2036 | | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]] | |
2037 | | x 471f378eab4c |
|
2037 | | x 471f378eab4c | |
2038 | |/ Predecessors: 2:0dec01379d3b |
|
2038 | |/ Predecessors: 2:0dec01379d3b | |
2039 | | semi-colon: 2:0dec01379d3b |
|
2039 | | semi-colon: 2:0dec01379d3b | |
2040 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
|
2040 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] | |
2041 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 |
|
2041 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 | |
2042 | | Successors: 2:0dec01379d3b |
|
2042 | | Successors: 2:0dec01379d3b | |
2043 | | multi-line: 2:0dec01379d3b |
|
2043 | | multi-line: 2:0dec01379d3b | |
2044 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
|
2044 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] | |
2045 | o ea207398892e |
|
2045 | o ea207398892e | |
2046 |
|
2046 | |||
2047 | $ hg fatelog --hidden |
|
2047 | $ hg fatelog --hidden | |
2048 | @ 0b997eb7ceee |
|
2048 | @ 0b997eb7ceee | |
2049 | | |
|
2049 | | | |
2050 | | * b18bc8331526 |
|
2050 | | * b18bc8331526 | |
2051 | |/ |
|
2051 | |/ | |
2052 | | * ba2ed02b0c9a |
|
2052 | | * ba2ed02b0c9a | |
2053 | | | |
|
2053 | | | | |
2054 | | x 4a004186e638 |
|
2054 | | x 4a004186e638 | |
2055 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); |
|
2055 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); | |
2056 | * dd800401bd8c |
|
2056 | * dd800401bd8c | |
2057 | | |
|
2057 | | | |
2058 | | x 9bd10a0775e4 |
|
2058 | | x 9bd10a0775e4 | |
2059 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000); |
|
2059 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000); | |
2060 | o f897c6137566 |
|
2060 | o f897c6137566 | |
2061 | | |
|
2061 | | | |
2062 | | x 0dec01379d3b |
|
2062 | | x 0dec01379d3b | |
2063 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000); |
|
2063 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000); | |
2064 | | x 471f378eab4c |
|
2064 | | x 471f378eab4c | |
2065 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000); |
|
2065 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000); | |
2066 | o ea207398892e |
|
2066 | o ea207398892e | |
2067 |
|
2067 | |||
2068 | $ hg fatelogjson --hidden |
|
2068 | $ hg fatelogjson --hidden | |
2069 | @ 0b997eb7ceee |
|
2069 | @ 0b997eb7ceee | |
2070 | | |
|
2070 | | | |
2071 | | * b18bc8331526 |
|
2071 | | * b18bc8331526 | |
2072 | |/ |
|
2072 | |/ | |
2073 | | * ba2ed02b0c9a |
|
2073 | | * ba2ed02b0c9a | |
2074 | | | |
|
2074 | | | | |
2075 | | x 4a004186e638 |
|
2075 | | x 4a004186e638 | |
2076 | |/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}] |
|
2076 | |/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}] | |
2077 | * dd800401bd8c |
|
2077 | * dd800401bd8c | |
2078 | | |
|
2078 | | | |
2079 | | x 9bd10a0775e4 |
|
2079 | | x 9bd10a0775e4 | |
2080 | |/ Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}] |
|
2080 | |/ Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}] | |
2081 | o f897c6137566 |
|
2081 | o f897c6137566 | |
2082 | | |
|
2082 | | | |
2083 | | x 0dec01379d3b |
|
2083 | | x 0dec01379d3b | |
2084 | | | 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"]}] |
|
2084 | | | 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"]}] | |
2085 | | x 471f378eab4c |
|
2085 | | x 471f378eab4c | |
2086 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}] |
|
2086 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}] | |
2087 | o ea207398892e |
|
2087 | o ea207398892e | |
2088 |
|
2088 | |||
2089 | $ hg up --hidden 4 |
|
2089 | $ hg up --hidden 4 | |
2090 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2090 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2091 | updated to hidden changeset 9bd10a0775e4 |
|
2091 | updated to hidden changeset 9bd10a0775e4 | |
2092 | (hidden revision '9bd10a0775e4' has diverged) |
|
2092 | (hidden revision '9bd10a0775e4' has diverged) | |
2093 | $ hg rebase -r 7 -d 8 --config extensions.rebase= |
|
2093 | $ hg rebase -r 7 -d 8 --config extensions.rebase= | |
2094 | rebasing 7:ba2ed02b0c9a "Add A,B,C" |
|
2094 | rebasing 7:ba2ed02b0c9a "Add A,B,C" | |
2095 | $ hg tlog |
|
2095 | $ hg tlog | |
2096 | * eceed8f98ffc |
|
2096 | * eceed8f98ffc | |
2097 | | Predecessors: 4:9bd10a0775e4 |
|
2097 | | Predecessors: 4:9bd10a0775e4 | |
2098 | | semi-colon: 4:9bd10a0775e4 |
|
2098 | | semi-colon: 4:9bd10a0775e4 | |
2099 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
2099 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] | |
2100 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
2100 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 | |
2101 | | * 0b997eb7ceee |
|
2101 | | * 0b997eb7ceee | |
2102 | | | Predecessors: 4:9bd10a0775e4 |
|
2102 | | | Predecessors: 4:9bd10a0775e4 | |
2103 | | | semi-colon: 4:9bd10a0775e4 |
|
2103 | | | semi-colon: 4:9bd10a0775e4 | |
2104 | | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
2104 | | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] | |
2105 | | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
2105 | | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 | |
2106 | * | b18bc8331526 |
|
2106 | * | b18bc8331526 | |
2107 | |/ Predecessors: 4:9bd10a0775e4 |
|
2107 | |/ Predecessors: 4:9bd10a0775e4 | |
2108 | | semi-colon: 4:9bd10a0775e4 |
|
2108 | | semi-colon: 4:9bd10a0775e4 | |
2109 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
2109 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] | |
2110 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
2110 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 | |
2111 | * dd800401bd8c |
|
2111 | * dd800401bd8c | |
2112 | | Predecessors: 4:9bd10a0775e4 |
|
2112 | | Predecessors: 4:9bd10a0775e4 | |
2113 | | semi-colon: 4:9bd10a0775e4 |
|
2113 | | semi-colon: 4:9bd10a0775e4 | |
2114 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
|
2114 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] | |
2115 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
|
2115 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 | |
2116 | | @ 9bd10a0775e4 |
|
2116 | | @ 9bd10a0775e4 | |
2117 | |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
|
2117 | |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc | |
2118 | | multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc |
|
2118 | | multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc | |
2119 | | multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
|
2119 | | multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc | |
2120 | | json: [["dd800401bd8c79d815329277739e433e883f784e", "0b997eb7ceeee06200a02f8aab185979092d514e", "eceed8f98ffc4186032e29a6542ab98888ebf68d"], ["dd800401bd8c79d815329277739e433e883f784e", "b18bc8331526a22cbb1801022bd1555bf291c48b", "eceed8f98ffc4186032e29a6542ab98888ebf68d"]] |
|
2120 | | json: [["dd800401bd8c79d815329277739e433e883f784e", "0b997eb7ceeee06200a02f8aab185979092d514e", "eceed8f98ffc4186032e29a6542ab98888ebf68d"], ["dd800401bd8c79d815329277739e433e883f784e", "b18bc8331526a22cbb1801022bd1555bf291c48b", "eceed8f98ffc4186032e29a6542ab98888ebf68d"]] | |
2121 | o f897c6137566 |
|
2121 | o f897c6137566 | |
2122 | | |
|
2122 | | | |
2123 | o ea207398892e |
|
2123 | o ea207398892e | |
2124 |
|
2124 | |||
2125 |
|
2125 | |||
2126 | $ hg fatelog |
|
2126 | $ hg fatelog | |
2127 | * eceed8f98ffc |
|
2127 | * eceed8f98ffc | |
2128 | | |
|
2128 | | | |
2129 | | * 0b997eb7ceee |
|
2129 | | * 0b997eb7ceee | |
2130 | | | |
|
2130 | | | | |
2131 | * | b18bc8331526 |
|
2131 | * | b18bc8331526 | |
2132 | |/ |
|
2132 | |/ | |
2133 | * dd800401bd8c |
|
2133 | * dd800401bd8c | |
2134 | | |
|
2134 | | | |
2135 | | @ 9bd10a0775e4 |
|
2135 | | @ 9bd10a0775e4 | |
2136 | |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); |
|
2136 | |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); | |
2137 | o f897c6137566 |
|
2137 | o f897c6137566 | |
2138 | | |
|
2138 | | | |
2139 | o ea207398892e |
|
2139 | o ea207398892e | |
2140 |
|
2140 | |||
2141 | Check other fatelog implementations |
|
2141 | Check other fatelog implementations | |
2142 | ----------------------------------- |
|
2142 | ----------------------------------- | |
2143 |
|
2143 | |||
2144 | $ hg fatelogkw --hidden -q |
|
2144 | $ hg fatelogkw --hidden -q | |
2145 | * eceed8f98ffc |
|
2145 | * eceed8f98ffc | |
2146 | | |
|
2146 | | | |
2147 | | * 0b997eb7ceee |
|
2147 | | * 0b997eb7ceee | |
2148 | | | |
|
2148 | | | | |
2149 | * | b18bc8331526 |
|
2149 | * | b18bc8331526 | |
2150 | |/ |
|
2150 | |/ | |
2151 | | x ba2ed02b0c9a |
|
2151 | | x ba2ed02b0c9a | |
2152 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc |
|
2152 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc | |
2153 | | x 4a004186e638 |
|
2153 | | x 4a004186e638 | |
2154 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 |
|
2154 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 | |
2155 | | Obsfate: rewritten using amend as 9:0b997eb7ceee |
|
2155 | | Obsfate: rewritten using amend as 9:0b997eb7ceee | |
2156 | * dd800401bd8c |
|
2156 | * dd800401bd8c | |
2157 | | |
|
2157 | | | |
2158 | | @ 9bd10a0775e4 |
|
2158 | | @ 9bd10a0775e4 | |
2159 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
|
2159 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a | |
2160 | o f897c6137566 |
|
2160 | o f897c6137566 | |
2161 | | |
|
2161 | | | |
2162 | | x 0dec01379d3b |
|
2162 | | x 0dec01379d3b | |
2163 | | | Obsfate: rewritten as 3:f897c6137566 |
|
2163 | | | Obsfate: rewritten as 3:f897c6137566 | |
2164 | | | Obsfate: rewritten as 1:471f378eab4c |
|
2164 | | | Obsfate: rewritten as 1:471f378eab4c | |
2165 | | x 471f378eab4c |
|
2165 | | x 471f378eab4c | |
2166 | |/ Obsfate: rewritten as 2:0dec01379d3b |
|
2166 | |/ Obsfate: rewritten as 2:0dec01379d3b | |
2167 | o ea207398892e |
|
2167 | o ea207398892e | |
2168 |
|
2168 | |||
2169 | $ hg fatelogkw --hidden |
|
2169 | $ hg fatelogkw --hidden | |
2170 | * eceed8f98ffc |
|
2170 | * eceed8f98ffc | |
2171 | | |
|
2171 | | | |
2172 | | * 0b997eb7ceee |
|
2172 | | * 0b997eb7ceee | |
2173 | | | |
|
2173 | | | | |
2174 | * | b18bc8331526 |
|
2174 | * | b18bc8331526 | |
2175 | |/ |
|
2175 | |/ | |
2176 | | x ba2ed02b0c9a |
|
2176 | | x ba2ed02b0c9a | |
2177 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc |
|
2177 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc | |
2178 | | x 4a004186e638 |
|
2178 | | x 4a004186e638 | |
2179 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 |
|
2179 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 | |
2180 | | Obsfate: rewritten using amend as 9:0b997eb7ceee |
|
2180 | | Obsfate: rewritten using amend as 9:0b997eb7ceee | |
2181 | * dd800401bd8c |
|
2181 | * dd800401bd8c | |
2182 | | |
|
2182 | | | |
2183 | | @ 9bd10a0775e4 |
|
2183 | | @ 9bd10a0775e4 | |
2184 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
|
2184 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a | |
2185 | o f897c6137566 |
|
2185 | o f897c6137566 | |
2186 | | |
|
2186 | | | |
2187 | | x 0dec01379d3b |
|
2187 | | x 0dec01379d3b | |
2188 | | | Obsfate: rewritten as 3:f897c6137566 |
|
2188 | | | Obsfate: rewritten as 3:f897c6137566 | |
2189 | | | Obsfate: rewritten as 1:471f378eab4c |
|
2189 | | | Obsfate: rewritten as 1:471f378eab4c | |
2190 | | x 471f378eab4c |
|
2190 | | x 471f378eab4c | |
2191 | |/ Obsfate: rewritten as 2:0dec01379d3b |
|
2191 | |/ Obsfate: rewritten as 2:0dec01379d3b | |
2192 | o ea207398892e |
|
2192 | o ea207398892e | |
2193 |
|
2193 | |||
2194 | $ hg fatelogkw --hidden -v |
|
2194 | $ hg fatelogkw --hidden -v | |
2195 | * eceed8f98ffc |
|
2195 | * eceed8f98ffc | |
2196 | | |
|
2196 | | | |
2197 | | * 0b997eb7ceee |
|
2197 | | * 0b997eb7ceee | |
2198 | | | |
|
2198 | | | | |
2199 | * | b18bc8331526 |
|
2199 | * | b18bc8331526 | |
2200 | |/ |
|
2200 | |/ | |
2201 | | x ba2ed02b0c9a |
|
2201 | | x ba2ed02b0c9a | |
2202 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000) |
|
2202 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000) | |
2203 | | x 4a004186e638 |
|
2203 | | x 4a004186e638 | |
2204 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000) |
|
2204 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000) | |
2205 | | Obsfate: rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000) |
|
2205 | | Obsfate: rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000) | |
2206 | * dd800401bd8c |
|
2206 | * dd800401bd8c | |
2207 | | |
|
2207 | | | |
2208 | | @ 9bd10a0775e4 |
|
2208 | | @ 9bd10a0775e4 | |
2209 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000) |
|
2209 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000) | |
2210 | o f897c6137566 |
|
2210 | o f897c6137566 | |
2211 | | |
|
2211 | | | |
2212 | | x 0dec01379d3b |
|
2212 | | x 0dec01379d3b | |
2213 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) |
|
2213 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) | |
2214 | | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) |
|
2214 | | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) | |
2215 | | x 471f378eab4c |
|
2215 | | x 471f378eab4c | |
2216 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) |
|
2216 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) | |
2217 | o ea207398892e |
|
2217 | o ea207398892e | |
2218 |
|
2218 | |||
2219 | $ hg log -G -T "default" --hidden |
|
2219 | $ hg log -G -T "default" --hidden | |
2220 | * changeset: 10:eceed8f98ffc |
|
2220 | * changeset: 10:eceed8f98ffc | |
2221 | | tag: tip |
|
2221 | | tag: tip | |
2222 | | parent: 8:b18bc8331526 |
|
2222 | | parent: 8:b18bc8331526 | |
2223 | | user: test |
|
2223 | | user: test | |
2224 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2224 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2225 | | instability: content-divergent |
|
2225 | | instability: content-divergent | |
2226 | | summary: Add A,B,C |
|
2226 | | summary: Add A,B,C | |
2227 | | |
|
2227 | | | |
2228 | | * changeset: 9:0b997eb7ceee |
|
2228 | | * changeset: 9:0b997eb7ceee | |
2229 | | | parent: 5:dd800401bd8c |
|
2229 | | | parent: 5:dd800401bd8c | |
2230 | | | user: test |
|
2230 | | | user: test | |
2231 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2231 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2232 | | | instability: content-divergent |
|
2232 | | | instability: content-divergent | |
2233 | | | summary: Add B only |
|
2233 | | | summary: Add B only | |
2234 | | | |
|
2234 | | | | |
2235 | * | changeset: 8:b18bc8331526 |
|
2235 | * | changeset: 8:b18bc8331526 | |
2236 | |/ parent: 5:dd800401bd8c |
|
2236 | |/ parent: 5:dd800401bd8c | |
2237 | | user: test |
|
2237 | | user: test | |
2238 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2238 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2239 | | instability: content-divergent |
|
2239 | | instability: content-divergent | |
2240 | | summary: Add only B |
|
2240 | | summary: Add only B | |
2241 | | |
|
2241 | | | |
2242 | | x changeset: 7:ba2ed02b0c9a |
|
2242 | | x changeset: 7:ba2ed02b0c9a | |
2243 | | | user: test |
|
2243 | | | user: test | |
2244 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2244 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2245 | | | obsolete: rewritten using rebase as 10:eceed8f98ffc |
|
2245 | | | obsolete: rewritten using rebase as 10:eceed8f98ffc | |
2246 | | | summary: Add A,B,C |
|
2246 | | | summary: Add A,B,C | |
2247 | | | |
|
2247 | | | | |
2248 | | x changeset: 6:4a004186e638 |
|
2248 | | x changeset: 6:4a004186e638 | |
2249 | |/ user: test |
|
2249 | |/ user: test | |
2250 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2250 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2251 | | obsolete: rewritten using amend as 8:b18bc8331526 |
|
2251 | | obsolete: rewritten using amend as 8:b18bc8331526 | |
2252 | | obsolete: rewritten using amend as 9:0b997eb7ceee |
|
2252 | | obsolete: rewritten using amend as 9:0b997eb7ceee | |
2253 | | summary: Add A,B,C |
|
2253 | | summary: Add A,B,C | |
2254 | | |
|
2254 | | | |
2255 | * changeset: 5:dd800401bd8c |
|
2255 | * changeset: 5:dd800401bd8c | |
2256 | | parent: 3:f897c6137566 |
|
2256 | | parent: 3:f897c6137566 | |
2257 | | user: test |
|
2257 | | user: test | |
2258 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2258 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2259 | | instability: content-divergent |
|
2259 | | instability: content-divergent | |
2260 | | summary: Add A,B,C |
|
2260 | | summary: Add A,B,C | |
2261 | | |
|
2261 | | | |
2262 | | @ changeset: 4:9bd10a0775e4 |
|
2262 | | @ changeset: 4:9bd10a0775e4 | |
2263 | |/ user: test |
|
2263 | |/ user: test | |
2264 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2264 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2265 | | obsolete: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
|
2265 | | obsolete: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a | |
2266 | | summary: Add A,B,C |
|
2266 | | summary: Add A,B,C | |
2267 | | |
|
2267 | | | |
2268 | o changeset: 3:f897c6137566 |
|
2268 | o changeset: 3:f897c6137566 | |
2269 | | parent: 0:ea207398892e |
|
2269 | | parent: 0:ea207398892e | |
2270 | | user: test |
|
2270 | | user: test | |
2271 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2271 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2272 | | summary: C0 |
|
2272 | | summary: C0 | |
2273 | | |
|
2273 | | | |
2274 | | x changeset: 2:0dec01379d3b |
|
2274 | | x changeset: 2:0dec01379d3b | |
2275 | | | user: test |
|
2275 | | | user: test | |
2276 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2276 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2277 | | | obsolete: rewritten as 3:f897c6137566 |
|
2277 | | | obsolete: rewritten as 3:f897c6137566 | |
2278 | | | obsolete: rewritten as 1:471f378eab4c |
|
2278 | | | obsolete: rewritten as 1:471f378eab4c | |
2279 | | | summary: B0 |
|
2279 | | | summary: B0 | |
2280 | | | |
|
2280 | | | | |
2281 | | x changeset: 1:471f378eab4c |
|
2281 | | x changeset: 1:471f378eab4c | |
2282 | |/ user: test |
|
2282 | |/ user: test | |
2283 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2283 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2284 | | obsolete: rewritten as 2:0dec01379d3b |
|
2284 | | obsolete: rewritten as 2:0dec01379d3b | |
2285 | | summary: A0 |
|
2285 | | summary: A0 | |
2286 | | |
|
2286 | | | |
2287 | o changeset: 0:ea207398892e |
|
2287 | o changeset: 0:ea207398892e | |
2288 | user: test |
|
2288 | user: test | |
2289 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2289 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2290 | summary: ROOT |
|
2290 | summary: ROOT | |
2291 |
|
2291 | |||
2292 |
|
2292 | |||
2293 | Test templates with pruned commits |
|
2293 | Test templates with pruned commits | |
2294 | ================================== |
|
2294 | ================================== | |
2295 |
|
2295 | |||
2296 | Test setup |
|
2296 | Test setup | |
2297 | ---------- |
|
2297 | ---------- | |
2298 |
|
2298 | |||
2299 | $ hg init $TESTTMP/templates-local-prune |
|
2299 | $ hg init $TESTTMP/templates-local-prune | |
2300 | $ cd $TESTTMP/templates-local-prune |
|
2300 | $ cd $TESTTMP/templates-local-prune | |
2301 | $ mkcommit ROOT |
|
2301 | $ mkcommit ROOT | |
2302 | $ mkcommit A0 |
|
2302 | $ mkcommit A0 | |
2303 | $ hg debugobsolete --record-parent `getid "."` |
|
2303 | $ hg debugobsolete --record-parent `getid "."` | |
2304 | obsoleted 1 changesets |
|
2304 | obsoleted 1 changesets | |
2305 |
|
2305 | |||
2306 | Check output |
|
2306 | Check output | |
2307 | ------------ |
|
2307 | ------------ | |
2308 |
|
2308 | |||
2309 | $ hg up "desc(A0)" --hidden |
|
2309 | $ hg up "desc(A0)" --hidden | |
2310 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2310 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2311 | $ hg tlog |
|
2311 | $ hg tlog | |
2312 | @ 471f378eab4c |
|
2312 | @ 471f378eab4c | |
2313 | | |
|
2313 | | | |
2314 | o ea207398892e |
|
2314 | o ea207398892e | |
2315 |
|
2315 | |||
2316 | $ hg fatelog |
|
2316 | $ hg fatelog | |
2317 | @ 471f378eab4c |
|
2317 | @ 471f378eab4c | |
2318 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |
|
2318 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); | |
2319 | o ea207398892e |
|
2319 | o ea207398892e | |
2320 |
|
2320 | |||
2321 | Test templates with multiple pruned commits |
|
2321 | Test templates with multiple pruned commits | |
2322 | =========================================== |
|
2322 | =========================================== | |
2323 |
|
2323 | |||
2324 | Test setup |
|
2324 | Test setup | |
2325 | ---------- |
|
2325 | ---------- | |
2326 |
|
2326 | |||
2327 | $ hg init $TESTTMP/multiple-local-prune |
|
2327 | $ hg init $TESTTMP/multiple-local-prune | |
2328 | $ cd $TESTTMP/multiple-local-prune |
|
2328 | $ cd $TESTTMP/multiple-local-prune | |
2329 | $ mkcommit ROOT |
|
2329 | $ mkcommit ROOT | |
2330 | $ mkcommit A0 |
|
2330 | $ mkcommit A0 | |
2331 | $ hg commit --amend -m "A1" |
|
2331 | $ hg commit --amend -m "A1" | |
2332 | $ hg debugobsolete --record-parent `getid "."` |
|
2332 | $ hg debugobsolete --record-parent `getid "."` | |
2333 | obsoleted 1 changesets |
|
2333 | obsoleted 1 changesets | |
2334 |
|
2334 | |||
2335 | $ hg up -r "desc(A0)" --hidden |
|
2335 | $ hg up -r "desc(A0)" --hidden | |
2336 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2336 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2337 | updated to hidden changeset 471f378eab4c |
|
2337 | updated to hidden changeset 471f378eab4c | |
2338 | (hidden revision '471f378eab4c' is pruned) |
|
2338 | (hidden revision '471f378eab4c' is pruned) | |
2339 | $ hg commit --amend -m "A2" |
|
2339 | $ hg commit --amend -m "A2" | |
2340 | $ hg debugobsolete --record-parent `getid "."` |
|
2340 | $ hg debugobsolete --record-parent `getid "."` | |
2341 | obsoleted 1 changesets |
|
2341 | obsoleted 1 changesets | |
2342 |
|
2342 | |||
2343 | Check output |
|
2343 | Check output | |
2344 | ------------ |
|
2344 | ------------ | |
2345 |
|
2345 | |||
2346 | $ hg up "desc(A0)" --hidden |
|
2346 | $ hg up "desc(A0)" --hidden | |
2347 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2347 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2348 | updated to hidden changeset 471f378eab4c |
|
2348 | updated to hidden changeset 471f378eab4c | |
2349 | (hidden revision '471f378eab4c' is pruned) |
|
2349 | (hidden revision '471f378eab4c' is pruned) | |
2350 | $ hg tlog |
|
2350 | $ hg tlog | |
2351 | @ 471f378eab4c |
|
2351 | @ 471f378eab4c | |
2352 | | |
|
2352 | | | |
2353 | o ea207398892e |
|
2353 | o ea207398892e | |
2354 |
|
2354 | |||
2355 | # todo: the obsfate output is not ideal |
|
2355 | # todo: the obsfate output is not ideal | |
2356 | $ hg fatelog |
|
2356 | $ hg fatelog | |
2357 | @ 471f378eab4c |
|
2357 | @ 471f378eab4c | |
2358 | | Obsfate: pruned; |
|
2358 | | Obsfate: pruned; | |
2359 | o ea207398892e |
|
2359 | o ea207398892e | |
2360 |
|
2360 | |||
2361 | $ hg fatelog --hidden |
|
2361 | $ hg fatelog --hidden | |
2362 | x 65b757b745b9 |
|
2362 | x 65b757b745b9 | |
2363 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |
|
2363 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); | |
2364 | | x fdf9bde5129a |
|
2364 | | x fdf9bde5129a | |
2365 | |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |
|
2365 | |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000); | |
2366 | | @ 471f378eab4c |
|
2366 | | @ 471f378eab4c | |
2367 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); |
|
2367 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); | |
2368 | o ea207398892e |
|
2368 | o ea207398892e | |
2369 |
|
2369 | |||
2370 | Check other fatelog implementations |
|
2370 | Check other fatelog implementations | |
2371 | ----------------------------------- |
|
2371 | ----------------------------------- | |
2372 |
|
2372 | |||
2373 | $ hg fatelogkw --hidden -q |
|
2373 | $ hg fatelogkw --hidden -q | |
2374 | x 65b757b745b9 |
|
2374 | x 65b757b745b9 | |
2375 | | Obsfate: pruned |
|
2375 | | Obsfate: pruned | |
2376 | | x fdf9bde5129a |
|
2376 | | x fdf9bde5129a | |
2377 | |/ Obsfate: pruned |
|
2377 | |/ Obsfate: pruned | |
2378 | | @ 471f378eab4c |
|
2378 | | @ 471f378eab4c | |
2379 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a |
|
2379 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a | |
2380 | | Obsfate: rewritten using amend as 3:65b757b745b9 |
|
2380 | | Obsfate: rewritten using amend as 3:65b757b745b9 | |
2381 | o ea207398892e |
|
2381 | o ea207398892e | |
2382 |
|
2382 | |||
2383 | $ hg fatelogkw --hidden |
|
2383 | $ hg fatelogkw --hidden | |
2384 | x 65b757b745b9 |
|
2384 | x 65b757b745b9 | |
2385 | | Obsfate: pruned |
|
2385 | | Obsfate: pruned | |
2386 | | x fdf9bde5129a |
|
2386 | | x fdf9bde5129a | |
2387 | |/ Obsfate: pruned |
|
2387 | |/ Obsfate: pruned | |
2388 | | @ 471f378eab4c |
|
2388 | | @ 471f378eab4c | |
2389 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a |
|
2389 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a | |
2390 | | Obsfate: rewritten using amend as 3:65b757b745b9 |
|
2390 | | Obsfate: rewritten using amend as 3:65b757b745b9 | |
2391 | o ea207398892e |
|
2391 | o ea207398892e | |
2392 |
|
2392 | |||
2393 | $ hg fatelogkw --hidden -v |
|
2393 | $ hg fatelogkw --hidden -v | |
2394 | x 65b757b745b9 |
|
2394 | x 65b757b745b9 | |
2395 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) |
|
2395 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) | |
2396 | | x fdf9bde5129a |
|
2396 | | x fdf9bde5129a | |
2397 | |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000) |
|
2397 | |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000) | |
2398 | | @ 471f378eab4c |
|
2398 | | @ 471f378eab4c | |
2399 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) |
|
2399 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) | |
2400 | | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) |
|
2400 | | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) | |
2401 | o ea207398892e |
|
2401 | o ea207398892e | |
2402 |
|
2402 | |||
2403 |
|
2403 | |||
2404 | $ hg log -G -T "default" --hidden |
|
2404 | $ hg log -G -T "default" --hidden | |
2405 | x changeset: 3:65b757b745b9 |
|
2405 | x changeset: 3:65b757b745b9 | |
2406 | | tag: tip |
|
2406 | | tag: tip | |
2407 | | parent: 0:ea207398892e |
|
2407 | | parent: 0:ea207398892e | |
2408 | | user: test |
|
2408 | | user: test | |
2409 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2409 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2410 | | obsolete: pruned |
|
2410 | | obsolete: pruned | |
2411 | | summary: A2 |
|
2411 | | summary: A2 | |
2412 | | |
|
2412 | | | |
2413 | | x changeset: 2:fdf9bde5129a |
|
2413 | | x changeset: 2:fdf9bde5129a | |
2414 | |/ parent: 0:ea207398892e |
|
2414 | |/ parent: 0:ea207398892e | |
2415 | | user: test |
|
2415 | | user: test | |
2416 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2416 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2417 | | obsolete: pruned |
|
2417 | | obsolete: pruned | |
2418 | | summary: A1 |
|
2418 | | summary: A1 | |
2419 | | |
|
2419 | | | |
2420 | | @ changeset: 1:471f378eab4c |
|
2420 | | @ changeset: 1:471f378eab4c | |
2421 | |/ user: test |
|
2421 | |/ user: test | |
2422 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2422 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2423 | | obsolete: rewritten using amend as 2:fdf9bde5129a |
|
2423 | | obsolete: rewritten using amend as 2:fdf9bde5129a | |
2424 | | obsolete: rewritten using amend as 3:65b757b745b9 |
|
2424 | | obsolete: rewritten using amend as 3:65b757b745b9 | |
2425 | | summary: A0 |
|
2425 | | summary: A0 | |
2426 | | |
|
2426 | | | |
2427 | o changeset: 0:ea207398892e |
|
2427 | o changeset: 0:ea207398892e | |
2428 | user: test |
|
2428 | user: test | |
2429 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2429 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2430 | summary: ROOT |
|
2430 | summary: ROOT | |
2431 |
|
2431 | |||
2432 |
|
2432 | |||
2433 | Test templates with splitted and pruned commit |
|
2433 | Test templates with splitted and pruned commit | |
2434 | ============================================== |
|
2434 | ============================================== | |
2435 |
|
2435 | |||
2436 | $ hg init $TESTTMP/templates-local-split-prune |
|
2436 | $ hg init $TESTTMP/templates-local-split-prune | |
2437 | $ cd $TESTTMP/templates-local-split-prune |
|
2437 | $ cd $TESTTMP/templates-local-split-prune | |
2438 | $ mkcommit ROOT |
|
2438 | $ mkcommit ROOT | |
2439 | $ echo 42 >> a |
|
2439 | $ echo 42 >> a | |
2440 | $ echo 43 >> b |
|
2440 | $ echo 43 >> b | |
2441 | $ hg commit -A -m "A0" |
|
2441 | $ hg commit -A -m "A0" | |
2442 | adding a |
|
2442 | adding a | |
2443 | adding b |
|
2443 | adding b | |
2444 | $ hg log --hidden -G |
|
2444 | $ hg log --hidden -G | |
2445 | @ changeset: 1:471597cad322 |
|
2445 | @ changeset: 1:471597cad322 | |
2446 | | tag: tip |
|
2446 | | tag: tip | |
2447 | | user: test |
|
2447 | | user: test | |
2448 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2448 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2449 | | summary: A0 |
|
2449 | | summary: A0 | |
2450 | | |
|
2450 | | | |
2451 | o changeset: 0:ea207398892e |
|
2451 | o changeset: 0:ea207398892e | |
2452 | user: test |
|
2452 | user: test | |
2453 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2453 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2454 | summary: ROOT |
|
2454 | summary: ROOT | |
2455 |
|
2455 | |||
2456 | # Simulate split |
|
2456 | # Simulate split | |
2457 | $ hg up -r "desc(ROOT)" |
|
2457 | $ hg up -r "desc(ROOT)" | |
2458 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
2458 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
2459 | $ echo 42 >> a |
|
2459 | $ echo 42 >> a | |
2460 | $ hg commit -A -m "A1" |
|
2460 | $ hg commit -A -m "A1" | |
2461 | adding a |
|
2461 | adding a | |
2462 | created new head |
|
2462 | created new head | |
2463 | $ echo 43 >> b |
|
2463 | $ echo 43 >> b | |
2464 | $ hg commit -A -m "A2" |
|
2464 | $ hg commit -A -m "A2" | |
2465 | adding b |
|
2465 | adding b | |
2466 | $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` |
|
2466 | $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"` | |
2467 | obsoleted 1 changesets |
|
2467 | obsoleted 1 changesets | |
2468 |
|
2468 | |||
2469 | # Simulate prune |
|
2469 | # Simulate prune | |
2470 | $ hg debugobsolete --record-parent `getid "."` |
|
2470 | $ hg debugobsolete --record-parent `getid "."` | |
2471 | obsoleted 1 changesets |
|
2471 | obsoleted 1 changesets | |
2472 |
|
2472 | |||
2473 | $ hg log --hidden -G |
|
2473 | $ hg log --hidden -G | |
2474 | @ changeset: 3:0d0ef4bdf70e |
|
2474 | @ changeset: 3:0d0ef4bdf70e | |
2475 | | tag: tip |
|
2475 | | tag: tip | |
2476 | | user: test |
|
2476 | | user: test | |
2477 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2477 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2478 | | obsolete: pruned |
|
2478 | | obsolete: pruned | |
2479 | | summary: A2 |
|
2479 | | summary: A2 | |
2480 | | |
|
2480 | | | |
2481 | o changeset: 2:617adc3a144c |
|
2481 | o changeset: 2:617adc3a144c | |
2482 | | parent: 0:ea207398892e |
|
2482 | | parent: 0:ea207398892e | |
2483 | | user: test |
|
2483 | | user: test | |
2484 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2484 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2485 | | summary: A1 |
|
2485 | | summary: A1 | |
2486 | | |
|
2486 | | | |
2487 | | x changeset: 1:471597cad322 |
|
2487 | | x changeset: 1:471597cad322 | |
2488 | |/ user: test |
|
2488 | |/ user: test | |
2489 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2489 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2490 | | obsolete: split as 2:617adc3a144c, 3:0d0ef4bdf70e |
|
2490 | | obsolete: split as 2:617adc3a144c, 3:0d0ef4bdf70e | |
2491 | | summary: A0 |
|
2491 | | summary: A0 | |
2492 | | |
|
2492 | | | |
2493 | o changeset: 0:ea207398892e |
|
2493 | o changeset: 0:ea207398892e | |
2494 | user: test |
|
2494 | user: test | |
2495 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2495 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2496 | summary: ROOT |
|
2496 | summary: ROOT | |
2497 |
|
2497 | |||
2498 | Check templates |
|
2498 | Check templates | |
2499 | --------------- |
|
2499 | --------------- | |
2500 |
|
2500 | |||
2501 | $ hg up 'desc("A0")' --hidden |
|
2501 | $ hg up 'desc("A0")' --hidden | |
2502 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2502 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2503 | updated to hidden changeset 471597cad322 |
|
2503 | updated to hidden changeset 471597cad322 | |
2504 | (hidden revision '471597cad322' is pruned) |
|
2504 | (hidden revision '471597cad322' is pruned) | |
2505 |
|
2505 | |||
2506 | # todo: the obsfate output is not ideal |
|
2506 | # todo: the obsfate output is not ideal | |
2507 | $ hg fatelog |
|
2507 | $ hg fatelog | |
2508 | o 617adc3a144c |
|
2508 | o 617adc3a144c | |
2509 | | |
|
2509 | | | |
2510 | | @ 471597cad322 |
|
2510 | | @ 471597cad322 | |
2511 | |/ Obsfate: pruned; |
|
2511 | |/ Obsfate: pruned; | |
2512 | o ea207398892e |
|
2512 | o ea207398892e | |
2513 |
|
2513 | |||
2514 | $ hg up -r 'desc("A2")' --hidden |
|
2514 | $ hg up -r 'desc("A2")' --hidden | |
2515 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2515 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2516 | updated to hidden changeset 0d0ef4bdf70e |
|
2516 | updated to hidden changeset 0d0ef4bdf70e | |
2517 | (hidden revision '0d0ef4bdf70e' is pruned) |
|
2517 | (hidden revision '0d0ef4bdf70e' is pruned) | |
2518 |
|
2518 | |||
2519 | $ hg fatelog --hidden |
|
2519 | $ hg fatelog --hidden | |
2520 | @ 0d0ef4bdf70e |
|
2520 | @ 0d0ef4bdf70e | |
2521 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |
|
2521 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); | |
2522 | o 617adc3a144c |
|
2522 | o 617adc3a144c | |
2523 | | |
|
2523 | | | |
2524 | | x 471597cad322 |
|
2524 | | x 471597cad322 | |
2525 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000); |
|
2525 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000); | |
2526 | o ea207398892e |
|
2526 | o ea207398892e | |
2527 |
|
2527 | |||
2528 |
|
2528 | |||
2529 | Check other fatelog implementations |
|
2529 | Check other fatelog implementations | |
2530 | ----------------------------------- |
|
2530 | ----------------------------------- | |
2531 |
|
2531 | |||
2532 | $ hg fatelogkw --hidden -q |
|
2532 | $ hg fatelogkw --hidden -q | |
2533 | @ 0d0ef4bdf70e |
|
2533 | @ 0d0ef4bdf70e | |
2534 | | Obsfate: pruned |
|
2534 | | Obsfate: pruned | |
2535 | o 617adc3a144c |
|
2535 | o 617adc3a144c | |
2536 | | |
|
2536 | | | |
2537 | | x 471597cad322 |
|
2537 | | x 471597cad322 | |
2538 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e |
|
2538 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e | |
2539 | o ea207398892e |
|
2539 | o ea207398892e | |
2540 |
|
2540 | |||
2541 | $ hg fatelogkw --hidden |
|
2541 | $ hg fatelogkw --hidden | |
2542 | @ 0d0ef4bdf70e |
|
2542 | @ 0d0ef4bdf70e | |
2543 | | Obsfate: pruned |
|
2543 | | Obsfate: pruned | |
2544 | o 617adc3a144c |
|
2544 | o 617adc3a144c | |
2545 | | |
|
2545 | | | |
2546 | | x 471597cad322 |
|
2546 | | x 471597cad322 | |
2547 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e |
|
2547 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e | |
2548 | o ea207398892e |
|
2548 | o ea207398892e | |
2549 |
|
2549 | |||
2550 | $ hg fatelogkw --hidden -v |
|
2550 | $ hg fatelogkw --hidden -v | |
2551 | @ 0d0ef4bdf70e |
|
2551 | @ 0d0ef4bdf70e | |
2552 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) |
|
2552 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) | |
2553 | o 617adc3a144c |
|
2553 | o 617adc3a144c | |
2554 | | |
|
2554 | | | |
2555 | | x 471597cad322 |
|
2555 | | x 471597cad322 | |
2556 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000) |
|
2556 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000) | |
2557 | o ea207398892e |
|
2557 | o ea207398892e | |
2558 |
|
2558 | |||
2559 | $ hg log -G -T "default" --hidden |
|
2559 | $ hg log -G -T "default" --hidden | |
2560 | @ changeset: 3:0d0ef4bdf70e |
|
2560 | @ changeset: 3:0d0ef4bdf70e | |
2561 | | tag: tip |
|
2561 | | tag: tip | |
2562 | | user: test |
|
2562 | | user: test | |
2563 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2563 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2564 | | obsolete: pruned |
|
2564 | | obsolete: pruned | |
2565 | | summary: A2 |
|
2565 | | summary: A2 | |
2566 | | |
|
2566 | | | |
2567 | o changeset: 2:617adc3a144c |
|
2567 | o changeset: 2:617adc3a144c | |
2568 | | parent: 0:ea207398892e |
|
2568 | | parent: 0:ea207398892e | |
2569 | | user: test |
|
2569 | | user: test | |
2570 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2570 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2571 | | summary: A1 |
|
2571 | | summary: A1 | |
2572 | | |
|
2572 | | | |
2573 | | x changeset: 1:471597cad322 |
|
2573 | | x changeset: 1:471597cad322 | |
2574 | |/ user: test |
|
2574 | |/ user: test | |
2575 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2575 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
2576 | | obsolete: split as 2:617adc3a144c, 3:0d0ef4bdf70e |
|
2576 | | obsolete: split as 2:617adc3a144c, 3:0d0ef4bdf70e | |
2577 | | summary: A0 |
|
2577 | | summary: A0 | |
2578 | | |
|
2578 | | | |
2579 | o changeset: 0:ea207398892e |
|
2579 | o changeset: 0:ea207398892e | |
2580 | user: test |
|
2580 | user: test | |
2581 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2581 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2582 | summary: ROOT |
|
2582 | summary: ROOT | |
2583 |
|
2583 | |||
2584 |
|
2584 | |||
2585 | Test metadata encoding (issue5754) |
|
2585 | Test metadata encoding (issue5754) | |
2586 | ================================== |
|
2586 | ================================== | |
2587 |
|
2587 | |||
2588 | $ hg init $TESTTMP/metadata-encoding |
|
2588 | $ hg init $TESTTMP/metadata-encoding | |
2589 | $ cd $TESTTMP/metadata-encoding |
|
2589 | $ cd $TESTTMP/metadata-encoding | |
2590 | $ cat <<'EOF' >> .hg/hgrc |
|
2590 | $ cat <<'EOF' >> .hg/hgrc | |
2591 | > [extensions] |
|
2591 | > [extensions] | |
2592 | > amend = |
|
2592 | > amend = | |
2593 | > EOF |
|
2593 | > EOF | |
2594 | $ $PYTHON <<'EOF' |
|
2594 | $ $PYTHON <<'EOF' | |
2595 | > with open('test1', 'wb') as f: |
|
2595 | > with open('test1', 'wb') as f: | |
2596 | > f.write(b't\xe8st1') and None |
|
2596 | > f.write(b't\xe8st1') and None | |
2597 | > with open('test2', 'wb') as f: |
|
2597 | > with open('test2', 'wb') as f: | |
2598 | > f.write(b't\xe8st2') and None |
|
2598 | > f.write(b't\xe8st2') and None | |
2599 | > EOF |
|
2599 | > EOF | |
2600 | $ mkcommit ROOT |
|
2600 | $ mkcommit ROOT | |
2601 | $ HGENCODING=latin-1 HGUSER="`cat test1`" mkcommit A0 |
|
2601 | $ ( HGENCODING=latin-1 HGUSER="`cat test1`" mkcommit A0 ) | |
2602 | $ echo 42 >> A0 |
|
2602 | $ echo 42 >> A0 | |
2603 | $ HGENCODING=latin-1 hg amend -m "A1" --note "`cat test2`" |
|
2603 | $ HGENCODING=latin-1 hg amend -m "A1" --note "`cat test2`" | |
2604 | $ HGENCODING=latin-1 hg amend -m "A2" \ |
|
2604 | $ HGENCODING=latin-1 hg amend -m "A2" \ | |
2605 | > --config devel.user.obsmarker="`cat test2`" |
|
2605 | > --config devel.user.obsmarker="`cat test2`" | |
2606 | $ mkcommit B0 |
|
2606 | $ mkcommit B0 | |
2607 | $ HGENCODING=latin-1 hg debugobsolete -u "`cat test2`" "`getid 'desc(B0)'`" |
|
2607 | $ HGENCODING=latin-1 hg debugobsolete -u "`cat test2`" "`getid 'desc(B0)'`" | |
2608 | obsoleted 1 changesets |
|
2608 | obsoleted 1 changesets | |
2609 |
|
2609 | |||
2610 | metadata should be stored in UTF-8, and debugobsolete doesn't decode it to |
|
2610 | metadata should be stored in UTF-8, and debugobsolete doesn't decode it to | |
2611 | local encoding since the command is supposed to show unmodified content: |
|
2611 | local encoding since the command is supposed to show unmodified content: | |
2612 |
|
2612 | |||
2613 | $ HGENCODING=latin-1 hg debugobsolete |
|
2613 | $ HGENCODING=latin-1 hg debugobsolete | |
2614 |
5f66a482f0bb2fcaccfc215554ad5eb9f40b50f5 718c0d00cee1429bdb73064e0d88908c601507a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'note': 't\xc3\xa8st2', 'operation': 'amend', 'user': 't |
|
2614 | 5f66a482f0bb2fcaccfc215554ad5eb9f40b50f5 718c0d00cee1429bdb73064e0d88908c601507a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'note': 't\xc3\xa8st2', 'operation': 'amend', 'user': 'test'} | |
2615 | 718c0d00cee1429bdb73064e0d88908c601507a8 1132562159b35bb27e1d6b80c80ee94a1659a4da 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 't\xc3\xa8st2'} |
|
2615 | 718c0d00cee1429bdb73064e0d88908c601507a8 1132562159b35bb27e1d6b80c80ee94a1659a4da 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 't\xc3\xa8st2'} | |
2616 |
|
|
2616 | 8f82db6f991db367fdbb3b6dba5e187ecc3ebd96 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 't\xc3\xa8st2'} | |
2617 |
|
2617 | |||
2618 | metadata should be converted back to local encoding when displaying: |
|
2618 | metadata should be converted back to local encoding when displaying: | |
2619 |
|
2619 | |||
2620 | $ HGENCODING=latin-1 hg fatelog --hidden |
|
2620 | $ HGENCODING=latin-1 hg fatelog --hidden | |
2621 | @ e1724525bc3b |
|
2621 | @ 8f82db6f991d | |
2622 | | Obsfate: pruned by t\xe8st2 (at 1970-01-01 00:00 +0000); (esc) |
|
2622 | | Obsfate: pruned by t\xe8st2 (at 1970-01-01 00:00 +0000); (esc) | |
2623 | o 1132562159b3 |
|
2623 | o 1132562159b3 | |
2624 | | |
|
2624 | | | |
2625 | | x 718c0d00cee1 |
|
2625 | | x 718c0d00cee1 | |
2626 | |/ Obsfate: rewritten using amend as 3:1132562159b3 by t\xe8st2 (at 1970-01-01 00:00 +0000); (esc) |
|
2626 | |/ Obsfate: rewritten using amend as 3:1132562159b3 by t\xe8st2 (at 1970-01-01 00:00 +0000); (esc) | |
2627 | | x 5f66a482f0bb |
|
2627 | | x 5f66a482f0bb | |
2628 |
|/ Obsfate: rewritten using amend as 2:718c0d00cee1 by t |
|
2628 | |/ Obsfate: rewritten using amend as 2:718c0d00cee1 by test (at 1970-01-01 00:00 +0000); | |
2629 | o ea207398892e |
|
2629 | o ea207398892e | |
2630 |
|
2630 | |||
2631 | $ HGENCODING=utf-8 hg fatelog --hidden |
|
2631 | $ HGENCODING=utf-8 hg fatelog --hidden | |
2632 | @ e1724525bc3b |
|
2632 | @ 8f82db6f991d | |
2633 | | Obsfate: pruned by t\xc3\xa8st2 (at 1970-01-01 00:00 +0000); (esc) |
|
2633 | | Obsfate: pruned by t\xc3\xa8st2 (at 1970-01-01 00:00 +0000); (esc) | |
2634 | o 1132562159b3 |
|
2634 | o 1132562159b3 | |
2635 | | |
|
2635 | | | |
2636 | | x 718c0d00cee1 |
|
2636 | | x 718c0d00cee1 | |
2637 | |/ Obsfate: rewritten using amend as 3:1132562159b3 by t\xc3\xa8st2 (at 1970-01-01 00:00 +0000); (esc) |
|
2637 | |/ Obsfate: rewritten using amend as 3:1132562159b3 by t\xc3\xa8st2 (at 1970-01-01 00:00 +0000); (esc) | |
2638 | | x 5f66a482f0bb |
|
2638 | | x 5f66a482f0bb | |
2639 |
|/ Obsfate: rewritten using amend as 2:718c0d00cee1 by t |
|
2639 | |/ Obsfate: rewritten using amend as 2:718c0d00cee1 by test (at 1970-01-01 00:00 +0000); | |
2640 | o ea207398892e |
|
2640 | o ea207398892e | |
2641 |
|
2641 |
General Comments 0
You need to be logged in to leave comments.
Login now