##// END OF EJS Templates
test: rename obsfate template alias...
Boris Feld -
r34577:50b46054 default
parent child Browse files
Show More
@@ -1,1766 +1,1766 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 > stabilization=all
13 > stabilization=all
14 > [templates]
14 > [templates]
15 > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"
15 > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"
16 > obsfateverb = "{obsfateverb(successors)}"
16 > obsfateverb = "{obsfateverb(successors)}"
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 > obsfate = "{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 % "{obsfate}"} \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 > EOF
32 > EOF
33
33
34 Test templates on amended commit
34 Test templates on amended commit
35 ================================
35 ================================
36
36
37 Test setup
37 Test setup
38 ----------
38 ----------
39
39
40 $ hg init $TESTTMP/templates-local-amend
40 $ hg init $TESTTMP/templates-local-amend
41 $ cd $TESTTMP/templates-local-amend
41 $ cd $TESTTMP/templates-local-amend
42 $ mkcommit ROOT
42 $ mkcommit ROOT
43 $ mkcommit A0
43 $ mkcommit A0
44 $ echo 42 >> A0
44 $ echo 42 >> A0
45 $ hg commit --amend -m "A1" --config devel.default-date="1234567890 0" --config devel.user.obsmarker=test1
45 $ hg commit --amend -m "A1" --config devel.default-date="1234567890 0" --config devel.user.obsmarker=test1
46 $ hg commit --amend -m "A2" --config devel.default-date="987654321 0" --config devel.user.obsmarker=test2
46 $ hg commit --amend -m "A2" --config devel.default-date="987654321 0" --config devel.user.obsmarker=test2
47
47
48 $ hg log --hidden -G
48 $ hg log --hidden -G
49 @ changeset: 3:d004c8f274b9
49 @ changeset: 3:d004c8f274b9
50 | tag: tip
50 | tag: tip
51 | parent: 0:ea207398892e
51 | parent: 0:ea207398892e
52 | user: test
52 | user: test
53 | date: Thu Jan 01 00:00:00 1970 +0000
53 | date: Thu Jan 01 00:00:00 1970 +0000
54 | summary: A2
54 | summary: A2
55 |
55 |
56 | x changeset: 2:a468dc9b3633
56 | x changeset: 2:a468dc9b3633
57 |/ parent: 0:ea207398892e
57 |/ parent: 0:ea207398892e
58 | user: test
58 | user: test
59 | date: Thu Jan 01 00:00:00 1970 +0000
59 | date: Thu Jan 01 00:00:00 1970 +0000
60 | summary: A1
60 | summary: A1
61 |
61 |
62 | x changeset: 1:471f378eab4c
62 | x changeset: 1:471f378eab4c
63 |/ user: test
63 |/ user: test
64 | date: Thu Jan 01 00:00:00 1970 +0000
64 | date: Thu Jan 01 00:00:00 1970 +0000
65 | summary: A0
65 | summary: A0
66 |
66 |
67 o changeset: 0:ea207398892e
67 o changeset: 0:ea207398892e
68 user: test
68 user: test
69 date: Thu Jan 01 00:00:00 1970 +0000
69 date: Thu Jan 01 00:00:00 1970 +0000
70 summary: ROOT
70 summary: ROOT
71
71
72 Check templates
72 Check templates
73 ---------------
73 ---------------
74 $ hg up 'desc(A0)' --hidden
74 $ hg up 'desc(A0)' --hidden
75 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
75 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
76
76
77 Predecessors template should show current revision as it is the working copy
77 Predecessors template should show current revision as it is the working copy
78 $ hg tlog
78 $ hg tlog
79 o d004c8f274b9
79 o d004c8f274b9
80 | Predecessors: 1:471f378eab4c
80 | Predecessors: 1:471f378eab4c
81 | semi-colon: 1:471f378eab4c
81 | semi-colon: 1:471f378eab4c
82 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
82 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
83 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
83 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
84 | @ 471f378eab4c
84 | @ 471f378eab4c
85 |/ Successors: 3:d004c8f274b9
85 |/ Successors: 3:d004c8f274b9
86 | multi-line: 3:d004c8f274b9
86 | multi-line: 3:d004c8f274b9
87 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
87 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
88 o ea207398892e
88 o ea207398892e
89
89
90 $ hg fatelog -q --traceback
90 $ hg fatelog -q --traceback
91 o d004c8f274b9
91 o d004c8f274b9
92 |
92 |
93 | @ 471f378eab4c
93 | @ 471f378eab4c
94 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
94 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
95 o ea207398892e
95 o ea207398892e
96
96
97 $ hg fatelog
97 $ hg fatelog
98 o d004c8f274b9
98 o d004c8f274b9
99 |
99 |
100 | @ 471f378eab4c
100 | @ 471f378eab4c
101 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
101 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
102 o ea207398892e
102 o ea207398892e
103
103
104 $ hg fatelog -v
104 $ hg fatelog -v
105 o d004c8f274b9
105 o d004c8f274b9
106 |
106 |
107 | @ 471f378eab4c
107 | @ 471f378eab4c
108 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
108 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
109 o ea207398892e
109 o ea207398892e
110
110
111 $ hg up 'desc(A1)' --hidden
111 $ hg up 'desc(A1)' --hidden
112 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
112 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
113
113
114 Predecessors template should show current revision as it is the working copy
114 Predecessors template should show current revision as it is the working copy
115 $ hg tlog
115 $ hg tlog
116 o d004c8f274b9
116 o d004c8f274b9
117 | Predecessors: 2:a468dc9b3633
117 | Predecessors: 2:a468dc9b3633
118 | semi-colon: 2:a468dc9b3633
118 | semi-colon: 2:a468dc9b3633
119 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
119 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
120 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
120 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
121 | @ a468dc9b3633
121 | @ a468dc9b3633
122 |/ Successors: 3:d004c8f274b9
122 |/ Successors: 3:d004c8f274b9
123 | multi-line: 3:d004c8f274b9
123 | multi-line: 3:d004c8f274b9
124 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
124 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
125 o ea207398892e
125 o ea207398892e
126
126
127 $ hg fatelog -v
127 $ hg fatelog -v
128 o d004c8f274b9
128 o d004c8f274b9
129 |
129 |
130 | @ a468dc9b3633
130 | @ a468dc9b3633
131 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
131 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
132 o ea207398892e
132 o ea207398892e
133
133
134 Predecessors template should show all the predecessors as we force their display
134 Predecessors template should show all the predecessors as we force their display
135 with --hidden
135 with --hidden
136 $ hg tlog --hidden
136 $ hg tlog --hidden
137 o d004c8f274b9
137 o d004c8f274b9
138 | Predecessors: 2:a468dc9b3633
138 | Predecessors: 2:a468dc9b3633
139 | semi-colon: 2:a468dc9b3633
139 | semi-colon: 2:a468dc9b3633
140 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
140 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
141 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
141 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
142 | @ a468dc9b3633
142 | @ a468dc9b3633
143 |/ Predecessors: 1:471f378eab4c
143 |/ Predecessors: 1:471f378eab4c
144 | semi-colon: 1:471f378eab4c
144 | semi-colon: 1:471f378eab4c
145 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
145 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
146 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
146 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
147 | Successors: 3:d004c8f274b9
147 | Successors: 3:d004c8f274b9
148 | multi-line: 3:d004c8f274b9
148 | multi-line: 3:d004c8f274b9
149 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
149 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
150 | x 471f378eab4c
150 | x 471f378eab4c
151 |/ Successors: 2:a468dc9b3633
151 |/ Successors: 2:a468dc9b3633
152 | multi-line: 2:a468dc9b3633
152 | multi-line: 2:a468dc9b3633
153 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
153 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
154 o ea207398892e
154 o ea207398892e
155
155
156 $ hg fatelog --hidden -q
156 $ hg fatelog --hidden -q
157 o d004c8f274b9
157 o d004c8f274b9
158 |
158 |
159 | @ a468dc9b3633
159 | @ a468dc9b3633
160 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
160 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
161 | x 471f378eab4c
161 | x 471f378eab4c
162 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000);
162 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000);
163 o ea207398892e
163 o ea207398892e
164
164
165
165
166 Predecessors template shouldn't show anything as all obsolete commit are not
166 Predecessors template shouldn't show anything as all obsolete commit are not
167 visible.
167 visible.
168 $ hg up 'desc(A2)'
168 $ hg up 'desc(A2)'
169 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
169 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
170 $ hg tlog
170 $ hg tlog
171 @ d004c8f274b9
171 @ d004c8f274b9
172 |
172 |
173 o ea207398892e
173 o ea207398892e
174
174
175 $ hg tlog --hidden
175 $ hg tlog --hidden
176 @ d004c8f274b9
176 @ d004c8f274b9
177 | Predecessors: 2:a468dc9b3633
177 | Predecessors: 2:a468dc9b3633
178 | semi-colon: 2:a468dc9b3633
178 | semi-colon: 2:a468dc9b3633
179 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
179 | json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
180 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
180 | map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
181 | x a468dc9b3633
181 | x a468dc9b3633
182 |/ Predecessors: 1:471f378eab4c
182 |/ Predecessors: 1:471f378eab4c
183 | semi-colon: 1:471f378eab4c
183 | semi-colon: 1:471f378eab4c
184 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
184 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
185 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
185 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
186 | Successors: 3:d004c8f274b9
186 | Successors: 3:d004c8f274b9
187 | multi-line: 3:d004c8f274b9
187 | multi-line: 3:d004c8f274b9
188 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
188 | json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
189 | x 471f378eab4c
189 | x 471f378eab4c
190 |/ Successors: 2:a468dc9b3633
190 |/ Successors: 2:a468dc9b3633
191 | multi-line: 2:a468dc9b3633
191 | multi-line: 2:a468dc9b3633
192 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
192 | json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
193 o ea207398892e
193 o ea207398892e
194
194
195 $ hg fatelog -v
195 $ hg fatelog -v
196 @ d004c8f274b9
196 @ d004c8f274b9
197 |
197 |
198 o ea207398892e
198 o ea207398892e
199
199
200
200
201 $ hg fatelog -v --hidden
201 $ hg fatelog -v --hidden
202 @ d004c8f274b9
202 @ d004c8f274b9
203 |
203 |
204 | x a468dc9b3633
204 | x a468dc9b3633
205 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
205 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
206 | x 471f378eab4c
206 | x 471f378eab4c
207 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000);
207 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000);
208 o ea207398892e
208 o ea207398892e
209
209
210 $ hg fatelogjson --hidden
210 $ hg fatelogjson --hidden
211 @ d004c8f274b9
211 @ d004c8f274b9
212 |
212 |
213 | x a468dc9b3633
213 | x a468dc9b3633
214 |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}]
214 |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}]
215 | x 471f378eab4c
215 | x 471f378eab4c
216 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["operation", "amend"], ["user", "test1"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}]
216 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["operation", "amend"], ["user", "test1"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}]
217 o ea207398892e
217 o ea207398892e
218
218
219 Test templates with splitted commit
219 Test templates with splitted commit
220 ===================================
220 ===================================
221
221
222 $ hg init $TESTTMP/templates-local-split
222 $ hg init $TESTTMP/templates-local-split
223 $ cd $TESTTMP/templates-local-split
223 $ cd $TESTTMP/templates-local-split
224 $ mkcommit ROOT
224 $ mkcommit ROOT
225 $ echo 42 >> a
225 $ echo 42 >> a
226 $ echo 43 >> b
226 $ echo 43 >> b
227 $ hg commit -A -m "A0"
227 $ hg commit -A -m "A0"
228 adding a
228 adding a
229 adding b
229 adding b
230 $ hg log --hidden -G
230 $ hg log --hidden -G
231 @ changeset: 1:471597cad322
231 @ changeset: 1:471597cad322
232 | tag: tip
232 | tag: tip
233 | user: test
233 | user: test
234 | date: Thu Jan 01 00:00:00 1970 +0000
234 | date: Thu Jan 01 00:00:00 1970 +0000
235 | summary: A0
235 | summary: A0
236 |
236 |
237 o changeset: 0:ea207398892e
237 o changeset: 0:ea207398892e
238 user: test
238 user: test
239 date: Thu Jan 01 00:00:00 1970 +0000
239 date: Thu Jan 01 00:00:00 1970 +0000
240 summary: ROOT
240 summary: ROOT
241
241
242 # Simulate split
242 # Simulate split
243 $ hg up -r "desc(ROOT)"
243 $ hg up -r "desc(ROOT)"
244 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
244 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
245 $ echo 42 >> a
245 $ echo 42 >> a
246 $ hg commit -A -m "A0"
246 $ hg commit -A -m "A0"
247 adding a
247 adding a
248 created new head
248 created new head
249 $ echo 43 >> b
249 $ echo 43 >> b
250 $ hg commit -A -m "A0"
250 $ hg commit -A -m "A0"
251 adding b
251 adding b
252 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
252 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
253 obsoleted 1 changesets
253 obsoleted 1 changesets
254
254
255 $ hg log --hidden -G
255 $ hg log --hidden -G
256 @ changeset: 3:f257fde29c7a
256 @ changeset: 3:f257fde29c7a
257 | tag: tip
257 | tag: tip
258 | user: test
258 | user: test
259 | date: Thu Jan 01 00:00:00 1970 +0000
259 | date: Thu Jan 01 00:00:00 1970 +0000
260 | summary: A0
260 | summary: A0
261 |
261 |
262 o changeset: 2:337fec4d2edc
262 o changeset: 2:337fec4d2edc
263 | parent: 0:ea207398892e
263 | parent: 0:ea207398892e
264 | user: test
264 | user: test
265 | date: Thu Jan 01 00:00:00 1970 +0000
265 | date: Thu Jan 01 00:00:00 1970 +0000
266 | summary: A0
266 | summary: A0
267 |
267 |
268 | x changeset: 1:471597cad322
268 | x changeset: 1:471597cad322
269 |/ user: test
269 |/ user: test
270 | date: Thu Jan 01 00:00:00 1970 +0000
270 | date: Thu Jan 01 00:00:00 1970 +0000
271 | summary: A0
271 | summary: A0
272 |
272 |
273 o changeset: 0:ea207398892e
273 o changeset: 0:ea207398892e
274 user: test
274 user: test
275 date: Thu Jan 01 00:00:00 1970 +0000
275 date: Thu Jan 01 00:00:00 1970 +0000
276 summary: ROOT
276 summary: ROOT
277
277
278 Check templates
278 Check templates
279 ---------------
279 ---------------
280
280
281 $ hg up 'obsolete()' --hidden
281 $ hg up 'obsolete()' --hidden
282 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
282 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
283
283
284 Predecessors template should show current revision as it is the working copy
284 Predecessors template should show current revision as it is the working copy
285 $ hg tlog
285 $ hg tlog
286 o f257fde29c7a
286 o f257fde29c7a
287 | Predecessors: 1:471597cad322
287 | Predecessors: 1:471597cad322
288 | semi-colon: 1:471597cad322
288 | semi-colon: 1:471597cad322
289 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
289 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
290 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
290 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
291 o 337fec4d2edc
291 o 337fec4d2edc
292 | Predecessors: 1:471597cad322
292 | Predecessors: 1:471597cad322
293 | semi-colon: 1:471597cad322
293 | semi-colon: 1:471597cad322
294 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
294 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
295 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
295 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
296 | @ 471597cad322
296 | @ 471597cad322
297 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a
297 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a
298 | multi-line: 2:337fec4d2edc 3:f257fde29c7a
298 | multi-line: 2:337fec4d2edc 3:f257fde29c7a
299 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
299 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
300 o ea207398892e
300 o ea207398892e
301
301
302
302
303 $ hg fatelog
303 $ hg fatelog
304 o f257fde29c7a
304 o f257fde29c7a
305 |
305 |
306 o 337fec4d2edc
306 o 337fec4d2edc
307 |
307 |
308 | @ 471597cad322
308 | @ 471597cad322
309 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000);
309 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000);
310 o ea207398892e
310 o ea207398892e
311
311
312 $ hg up f257fde29c7a
312 $ hg up f257fde29c7a
313 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
313 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
314
314
315 Predecessors template should not show a predecessor as it's not displayed in
315 Predecessors template should not show a predecessor as it's not displayed in
316 the log
316 the log
317 $ hg tlog
317 $ hg tlog
318 @ f257fde29c7a
318 @ f257fde29c7a
319 |
319 |
320 o 337fec4d2edc
320 o 337fec4d2edc
321 |
321 |
322 o ea207398892e
322 o ea207398892e
323
323
324 Predecessors template should show both predecessors as we force their display
324 Predecessors template should show both predecessors as we force their display
325 with --hidden
325 with --hidden
326 $ hg tlog --hidden
326 $ hg tlog --hidden
327 @ f257fde29c7a
327 @ f257fde29c7a
328 | Predecessors: 1:471597cad322
328 | Predecessors: 1:471597cad322
329 | semi-colon: 1:471597cad322
329 | semi-colon: 1:471597cad322
330 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
330 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
331 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
331 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
332 o 337fec4d2edc
332 o 337fec4d2edc
333 | Predecessors: 1:471597cad322
333 | Predecessors: 1:471597cad322
334 | semi-colon: 1:471597cad322
334 | semi-colon: 1:471597cad322
335 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
335 | json: ["471597cad322d1f659bb169751be9133dad92ef3"]
336 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
336 | map: 1:471597cad322d1f659bb169751be9133dad92ef3
337 | x 471597cad322
337 | x 471597cad322
338 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a
338 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a
339 | multi-line: 2:337fec4d2edc 3:f257fde29c7a
339 | multi-line: 2:337fec4d2edc 3:f257fde29c7a
340 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
340 | json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
341 o ea207398892e
341 o ea207398892e
342
342
343
343
344 $ hg fatelog --hidden
344 $ hg fatelog --hidden
345 @ f257fde29c7a
345 @ f257fde29c7a
346 |
346 |
347 o 337fec4d2edc
347 o 337fec4d2edc
348 |
348 |
349 | x 471597cad322
349 | x 471597cad322
350 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000);
350 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000);
351 o ea207398892e
351 o ea207398892e
352
352
353 $ hg fatelogjson --hidden
353 $ hg fatelogjson --hidden
354 @ f257fde29c7a
354 @ f257fde29c7a
355 |
355 |
356 o 337fec4d2edc
356 o 337fec4d2edc
357 |
357 |
358 | x 471597cad322
358 | x 471597cad322
359 |/ Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}]
359 |/ Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}]
360 o ea207398892e
360 o ea207398892e
361
361
362 Test templates with folded commit
362 Test templates with folded commit
363 =================================
363 =================================
364
364
365 Test setup
365 Test setup
366 ----------
366 ----------
367
367
368 $ hg init $TESTTMP/templates-local-fold
368 $ hg init $TESTTMP/templates-local-fold
369 $ cd $TESTTMP/templates-local-fold
369 $ cd $TESTTMP/templates-local-fold
370 $ mkcommit ROOT
370 $ mkcommit ROOT
371 $ mkcommit A0
371 $ mkcommit A0
372 $ mkcommit B0
372 $ mkcommit B0
373 $ hg log --hidden -G
373 $ hg log --hidden -G
374 @ changeset: 2:0dec01379d3b
374 @ changeset: 2:0dec01379d3b
375 | tag: tip
375 | tag: tip
376 | user: test
376 | user: test
377 | date: Thu Jan 01 00:00:00 1970 +0000
377 | date: Thu Jan 01 00:00:00 1970 +0000
378 | summary: B0
378 | summary: B0
379 |
379 |
380 o changeset: 1:471f378eab4c
380 o changeset: 1:471f378eab4c
381 | user: test
381 | user: test
382 | date: Thu Jan 01 00:00:00 1970 +0000
382 | date: Thu Jan 01 00:00:00 1970 +0000
383 | summary: A0
383 | summary: A0
384 |
384 |
385 o changeset: 0:ea207398892e
385 o changeset: 0:ea207398892e
386 user: test
386 user: test
387 date: Thu Jan 01 00:00:00 1970 +0000
387 date: Thu Jan 01 00:00:00 1970 +0000
388 summary: ROOT
388 summary: ROOT
389
389
390 Simulate a fold
390 Simulate a fold
391 $ hg up -r "desc(ROOT)"
391 $ hg up -r "desc(ROOT)"
392 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
392 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
393 $ echo "A0" > A0
393 $ echo "A0" > A0
394 $ echo "B0" > B0
394 $ echo "B0" > B0
395 $ hg commit -A -m "C0"
395 $ hg commit -A -m "C0"
396 adding A0
396 adding A0
397 adding B0
397 adding B0
398 created new head
398 created new head
399 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
399 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
400 obsoleted 1 changesets
400 obsoleted 1 changesets
401 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
401 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
402 obsoleted 1 changesets
402 obsoleted 1 changesets
403
403
404 $ hg log --hidden -G
404 $ hg log --hidden -G
405 @ changeset: 3:eb5a0daa2192
405 @ changeset: 3:eb5a0daa2192
406 | tag: tip
406 | tag: tip
407 | parent: 0:ea207398892e
407 | parent: 0:ea207398892e
408 | user: test
408 | user: test
409 | date: Thu Jan 01 00:00:00 1970 +0000
409 | date: Thu Jan 01 00:00:00 1970 +0000
410 | summary: C0
410 | summary: C0
411 |
411 |
412 | x changeset: 2:0dec01379d3b
412 | x changeset: 2:0dec01379d3b
413 | | user: test
413 | | user: test
414 | | date: Thu Jan 01 00:00:00 1970 +0000
414 | | date: Thu Jan 01 00:00:00 1970 +0000
415 | | summary: B0
415 | | summary: B0
416 | |
416 | |
417 | x changeset: 1:471f378eab4c
417 | x changeset: 1:471f378eab4c
418 |/ user: test
418 |/ user: test
419 | date: Thu Jan 01 00:00:00 1970 +0000
419 | date: Thu Jan 01 00:00:00 1970 +0000
420 | summary: A0
420 | summary: A0
421 |
421 |
422 o changeset: 0:ea207398892e
422 o changeset: 0:ea207398892e
423 user: test
423 user: test
424 date: Thu Jan 01 00:00:00 1970 +0000
424 date: Thu Jan 01 00:00:00 1970 +0000
425 summary: ROOT
425 summary: ROOT
426
426
427 Check templates
427 Check templates
428 ---------------
428 ---------------
429
429
430 $ hg up 'desc(A0)' --hidden
430 $ hg up 'desc(A0)' --hidden
431 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
431 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
432
432
433 Predecessors template should show current revision as it is the working copy
433 Predecessors template should show current revision as it is the working copy
434 $ hg tlog
434 $ hg tlog
435 o eb5a0daa2192
435 o eb5a0daa2192
436 | Predecessors: 1:471f378eab4c
436 | Predecessors: 1:471f378eab4c
437 | semi-colon: 1:471f378eab4c
437 | semi-colon: 1:471f378eab4c
438 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
438 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
439 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
439 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
440 | @ 471f378eab4c
440 | @ 471f378eab4c
441 |/ Successors: 3:eb5a0daa2192
441 |/ Successors: 3:eb5a0daa2192
442 | multi-line: 3:eb5a0daa2192
442 | multi-line: 3:eb5a0daa2192
443 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
443 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
444 o ea207398892e
444 o ea207398892e
445
445
446
446
447 $ hg fatelog
447 $ hg fatelog
448 o eb5a0daa2192
448 o eb5a0daa2192
449 |
449 |
450 | @ 471f378eab4c
450 | @ 471f378eab4c
451 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
451 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
452 o ea207398892e
452 o ea207398892e
453
453
454 $ hg up 'desc(B0)' --hidden
454 $ hg up 'desc(B0)' --hidden
455 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
455 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
456
456
457 Predecessors template should show both predecessors as they should be both
457 Predecessors template should show both predecessors as they should be both
458 displayed
458 displayed
459 $ hg tlog
459 $ hg tlog
460 o eb5a0daa2192
460 o eb5a0daa2192
461 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
461 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
462 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
462 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
463 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
463 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
464 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
464 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
465 | @ 0dec01379d3b
465 | @ 0dec01379d3b
466 | | Successors: 3:eb5a0daa2192
466 | | Successors: 3:eb5a0daa2192
467 | | multi-line: 3:eb5a0daa2192
467 | | multi-line: 3:eb5a0daa2192
468 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
468 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
469 | x 471f378eab4c
469 | x 471f378eab4c
470 |/ Successors: 3:eb5a0daa2192
470 |/ Successors: 3:eb5a0daa2192
471 | multi-line: 3:eb5a0daa2192
471 | multi-line: 3:eb5a0daa2192
472 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
472 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
473 o ea207398892e
473 o ea207398892e
474
474
475
475
476 $ hg fatelog
476 $ hg fatelog
477 o eb5a0daa2192
477 o eb5a0daa2192
478 |
478 |
479 | @ 0dec01379d3b
479 | @ 0dec01379d3b
480 | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
480 | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
481 | x 471f378eab4c
481 | x 471f378eab4c
482 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
482 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
483 o ea207398892e
483 o ea207398892e
484
484
485 $ hg up 'desc(C0)'
485 $ hg up 'desc(C0)'
486 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
486 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
487
487
488 Predecessors template should not show predecessors as they are not displayed in
488 Predecessors template should not show predecessors as they are not displayed in
489 the log
489 the log
490 $ hg tlog
490 $ hg tlog
491 @ eb5a0daa2192
491 @ eb5a0daa2192
492 |
492 |
493 o ea207398892e
493 o ea207398892e
494
494
495 Predecessors template should show both predecessors as we force their display
495 Predecessors template should show both predecessors as we force their display
496 with --hidden
496 with --hidden
497 $ hg tlog --hidden
497 $ hg tlog --hidden
498 @ eb5a0daa2192
498 @ eb5a0daa2192
499 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
499 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
500 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
500 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
501 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
501 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
502 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
502 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
503 | x 0dec01379d3b
503 | x 0dec01379d3b
504 | | Successors: 3:eb5a0daa2192
504 | | Successors: 3:eb5a0daa2192
505 | | multi-line: 3:eb5a0daa2192
505 | | multi-line: 3:eb5a0daa2192
506 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
506 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
507 | x 471f378eab4c
507 | x 471f378eab4c
508 |/ Successors: 3:eb5a0daa2192
508 |/ Successors: 3:eb5a0daa2192
509 | multi-line: 3:eb5a0daa2192
509 | multi-line: 3:eb5a0daa2192
510 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
510 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
511 o ea207398892e
511 o ea207398892e
512
512
513
513
514 $ hg fatelog --hidden
514 $ hg fatelog --hidden
515 @ eb5a0daa2192
515 @ eb5a0daa2192
516 |
516 |
517 | x 0dec01379d3b
517 | x 0dec01379d3b
518 | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
518 | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
519 | x 471f378eab4c
519 | x 471f378eab4c
520 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
520 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
521 o ea207398892e
521 o ea207398892e
522
522
523
523
524 $ hg fatelogjson --hidden
524 $ hg fatelogjson --hidden
525 @ eb5a0daa2192
525 @ eb5a0daa2192
526 |
526 |
527 | x 0dec01379d3b
527 | x 0dec01379d3b
528 | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
528 | | Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
529 | x 471f378eab4c
529 | x 471f378eab4c
530 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
530 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
531 o ea207398892e
531 o ea207398892e
532
532
533
533
534 Test templates with divergence
534 Test templates with divergence
535 ==============================
535 ==============================
536
536
537 Test setup
537 Test setup
538 ----------
538 ----------
539
539
540 $ hg init $TESTTMP/templates-local-divergence
540 $ hg init $TESTTMP/templates-local-divergence
541 $ cd $TESTTMP/templates-local-divergence
541 $ cd $TESTTMP/templates-local-divergence
542 $ mkcommit ROOT
542 $ mkcommit ROOT
543 $ mkcommit A0
543 $ mkcommit A0
544 $ hg commit --amend -m "A1"
544 $ hg commit --amend -m "A1"
545 $ hg log --hidden -G
545 $ hg log --hidden -G
546 @ changeset: 2:fdf9bde5129a
546 @ changeset: 2:fdf9bde5129a
547 | tag: tip
547 | tag: tip
548 | parent: 0:ea207398892e
548 | parent: 0:ea207398892e
549 | user: test
549 | user: test
550 | date: Thu Jan 01 00:00:00 1970 +0000
550 | date: Thu Jan 01 00:00:00 1970 +0000
551 | summary: A1
551 | summary: A1
552 |
552 |
553 | x changeset: 1:471f378eab4c
553 | x changeset: 1:471f378eab4c
554 |/ user: test
554 |/ user: test
555 | date: Thu Jan 01 00:00:00 1970 +0000
555 | date: Thu Jan 01 00:00:00 1970 +0000
556 | summary: A0
556 | summary: A0
557 |
557 |
558 o changeset: 0:ea207398892e
558 o changeset: 0:ea207398892e
559 user: test
559 user: test
560 date: Thu Jan 01 00:00:00 1970 +0000
560 date: Thu Jan 01 00:00:00 1970 +0000
561 summary: ROOT
561 summary: ROOT
562
562
563 $ hg update --hidden 'desc(A0)'
563 $ hg update --hidden 'desc(A0)'
564 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
564 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
565 $ hg commit --amend -m "A2"
565 $ hg commit --amend -m "A2"
566 $ hg log --hidden -G
566 $ hg log --hidden -G
567 @ changeset: 3:65b757b745b9
567 @ changeset: 3:65b757b745b9
568 | tag: tip
568 | tag: tip
569 | parent: 0:ea207398892e
569 | parent: 0:ea207398892e
570 | user: test
570 | user: test
571 | date: Thu Jan 01 00:00:00 1970 +0000
571 | date: Thu Jan 01 00:00:00 1970 +0000
572 | instability: content-divergent
572 | instability: content-divergent
573 | summary: A2
573 | summary: A2
574 |
574 |
575 | o changeset: 2:fdf9bde5129a
575 | o changeset: 2:fdf9bde5129a
576 |/ parent: 0:ea207398892e
576 |/ parent: 0:ea207398892e
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 | instability: content-divergent
579 | instability: content-divergent
580 | summary: A1
580 | summary: A1
581 |
581 |
582 | x changeset: 1:471f378eab4c
582 | x changeset: 1:471f378eab4c
583 |/ user: test
583 |/ user: test
584 | date: Thu Jan 01 00:00:00 1970 +0000
584 | date: Thu Jan 01 00:00:00 1970 +0000
585 | summary: A0
585 | summary: A0
586 |
586 |
587 o changeset: 0:ea207398892e
587 o changeset: 0:ea207398892e
588 user: test
588 user: test
589 date: Thu Jan 01 00:00:00 1970 +0000
589 date: Thu Jan 01 00:00:00 1970 +0000
590 summary: ROOT
590 summary: ROOT
591
591
592 $ hg commit --amend -m 'A3'
592 $ hg commit --amend -m 'A3'
593 $ hg log --hidden -G
593 $ hg log --hidden -G
594 @ changeset: 4:019fadeab383
594 @ changeset: 4:019fadeab383
595 | tag: tip
595 | tag: tip
596 | parent: 0:ea207398892e
596 | parent: 0:ea207398892e
597 | user: test
597 | user: test
598 | date: Thu Jan 01 00:00:00 1970 +0000
598 | date: Thu Jan 01 00:00:00 1970 +0000
599 | instability: content-divergent
599 | instability: content-divergent
600 | summary: A3
600 | summary: A3
601 |
601 |
602 | x changeset: 3:65b757b745b9
602 | x changeset: 3:65b757b745b9
603 |/ parent: 0:ea207398892e
603 |/ parent: 0:ea207398892e
604 | user: test
604 | user: test
605 | date: Thu Jan 01 00:00:00 1970 +0000
605 | date: Thu Jan 01 00:00:00 1970 +0000
606 | summary: A2
606 | summary: A2
607 |
607 |
608 | o changeset: 2:fdf9bde5129a
608 | o changeset: 2:fdf9bde5129a
609 |/ parent: 0:ea207398892e
609 |/ parent: 0:ea207398892e
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 | instability: content-divergent
612 | instability: content-divergent
613 | summary: A1
613 | summary: A1
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 | summary: A0
618 | summary: A0
619 |
619 |
620 o changeset: 0:ea207398892e
620 o changeset: 0:ea207398892e
621 user: test
621 user: test
622 date: Thu Jan 01 00:00:00 1970 +0000
622 date: Thu Jan 01 00:00:00 1970 +0000
623 summary: ROOT
623 summary: ROOT
624
624
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, 0 files removed, 0 files unresolved
630 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
631
631
632 Predecessors template should show current revision as it is the working copy
632 Predecessors template should show current revision as it is the working copy
633 $ hg tlog
633 $ hg tlog
634 o 019fadeab383
634 o 019fadeab383
635 | Predecessors: 1:471f378eab4c
635 | Predecessors: 1:471f378eab4c
636 | semi-colon: 1:471f378eab4c
636 | semi-colon: 1:471f378eab4c
637 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
637 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
638 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
638 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
639 | o fdf9bde5129a
639 | o fdf9bde5129a
640 |/ Predecessors: 1:471f378eab4c
640 |/ Predecessors: 1:471f378eab4c
641 | semi-colon: 1:471f378eab4c
641 | semi-colon: 1:471f378eab4c
642 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
642 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
643 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
643 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
644 | @ 471f378eab4c
644 | @ 471f378eab4c
645 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383
645 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383
646 | multi-line: 2:fdf9bde5129a
646 | multi-line: 2:fdf9bde5129a
647 | multi-line: 4:019fadeab383
647 | multi-line: 4:019fadeab383
648 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
648 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
649 o ea207398892e
649 o ea207398892e
650
650
651 $ hg fatelog
651 $ hg fatelog
652 o 019fadeab383
652 o 019fadeab383
653 |
653 |
654 | o fdf9bde5129a
654 | o fdf9bde5129a
655 |/
655 |/
656 | @ 471f378eab4c
656 | @ 471f378eab4c
657 |/ 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);
657 |/ 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);
658 o ea207398892e
658 o ea207398892e
659
659
660 $ hg up 'desc(A1)'
660 $ hg up 'desc(A1)'
661 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
661 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
662
662
663 Predecessors template should not show predecessors as they are not displayed in
663 Predecessors template should not show predecessors as they are not displayed in
664 the log
664 the log
665 $ hg tlog
665 $ hg tlog
666 o 019fadeab383
666 o 019fadeab383
667 |
667 |
668 | @ fdf9bde5129a
668 | @ fdf9bde5129a
669 |/
669 |/
670 o ea207398892e
670 o ea207398892e
671
671
672
672
673 $ hg fatelog
673 $ hg fatelog
674 o 019fadeab383
674 o 019fadeab383
675 |
675 |
676 | @ fdf9bde5129a
676 | @ fdf9bde5129a
677 |/
677 |/
678 o ea207398892e
678 o ea207398892e
679
679
680 Predecessors template should the predecessors as we force their display with
680 Predecessors template should the predecessors as we force their display with
681 --hidden
681 --hidden
682 $ hg tlog --hidden
682 $ hg tlog --hidden
683 o 019fadeab383
683 o 019fadeab383
684 | Predecessors: 3:65b757b745b9
684 | Predecessors: 3:65b757b745b9
685 | semi-colon: 3:65b757b745b9
685 | semi-colon: 3:65b757b745b9
686 | json: ["65b757b745b935093c87a2bccd877521cccffcbd"]
686 | json: ["65b757b745b935093c87a2bccd877521cccffcbd"]
687 | map: 3:65b757b745b935093c87a2bccd877521cccffcbd
687 | map: 3:65b757b745b935093c87a2bccd877521cccffcbd
688 | x 65b757b745b9
688 | x 65b757b745b9
689 |/ Predecessors: 1:471f378eab4c
689 |/ Predecessors: 1:471f378eab4c
690 | semi-colon: 1:471f378eab4c
690 | semi-colon: 1:471f378eab4c
691 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
691 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
692 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
692 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
693 | Successors: 4:019fadeab383
693 | Successors: 4:019fadeab383
694 | multi-line: 4:019fadeab383
694 | multi-line: 4:019fadeab383
695 | json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
695 | json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
696 | @ fdf9bde5129a
696 | @ fdf9bde5129a
697 |/ Predecessors: 1:471f378eab4c
697 |/ Predecessors: 1:471f378eab4c
698 | semi-colon: 1:471f378eab4c
698 | semi-colon: 1:471f378eab4c
699 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
699 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
700 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
700 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
701 | x 471f378eab4c
701 | x 471f378eab4c
702 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9
702 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9
703 | multi-line: 2:fdf9bde5129a
703 | multi-line: 2:fdf9bde5129a
704 | multi-line: 3:65b757b745b9
704 | multi-line: 3:65b757b745b9
705 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]]
705 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]]
706 o ea207398892e
706 o ea207398892e
707
707
708
708
709 $ hg fatelog --hidden
709 $ hg fatelog --hidden
710 o 019fadeab383
710 o 019fadeab383
711 |
711 |
712 | x 65b757b745b9
712 | x 65b757b745b9
713 |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
713 |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
714 | @ fdf9bde5129a
714 | @ fdf9bde5129a
715 |/
715 |/
716 | x 471f378eab4c
716 | x 471f378eab4c
717 |/ 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);
717 |/ 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);
718 o ea207398892e
718 o ea207398892e
719
719
720
720
721 $ hg fatelogjson --hidden
721 $ hg fatelogjson --hidden
722 o 019fadeab383
722 o 019fadeab383
723 |
723 |
724 | x 65b757b745b9
724 | x 65b757b745b9
725 |/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}]
725 |/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}]
726 | @ fdf9bde5129a
726 | @ fdf9bde5129a
727 |/
727 |/
728 | x 471f378eab4c
728 | x 471f378eab4c
729 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"]}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"]}]
729 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"]}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"]}]
730 o ea207398892e
730 o ea207398892e
731
731
732
732
733 Test templates with amended + folded commit
733 Test templates with amended + folded commit
734 ===========================================
734 ===========================================
735
735
736 Test setup
736 Test setup
737 ----------
737 ----------
738
738
739 $ hg init $TESTTMP/templates-local-amend-fold
739 $ hg init $TESTTMP/templates-local-amend-fold
740 $ cd $TESTTMP/templates-local-amend-fold
740 $ cd $TESTTMP/templates-local-amend-fold
741 $ mkcommit ROOT
741 $ mkcommit ROOT
742 $ mkcommit A0
742 $ mkcommit A0
743 $ mkcommit B0
743 $ mkcommit B0
744 $ hg commit --amend -m "B1"
744 $ hg commit --amend -m "B1"
745 $ hg log --hidden -G
745 $ hg log --hidden -G
746 @ changeset: 3:b7ea6d14e664
746 @ changeset: 3:b7ea6d14e664
747 | tag: tip
747 | tag: tip
748 | parent: 1:471f378eab4c
748 | parent: 1:471f378eab4c
749 | user: test
749 | user: test
750 | date: Thu Jan 01 00:00:00 1970 +0000
750 | date: Thu Jan 01 00:00:00 1970 +0000
751 | summary: B1
751 | summary: B1
752 |
752 |
753 | x changeset: 2:0dec01379d3b
753 | x changeset: 2:0dec01379d3b
754 |/ user: test
754 |/ user: test
755 | date: Thu Jan 01 00:00:00 1970 +0000
755 | date: Thu Jan 01 00:00:00 1970 +0000
756 | summary: B0
756 | summary: B0
757 |
757 |
758 o changeset: 1:471f378eab4c
758 o changeset: 1:471f378eab4c
759 | user: test
759 | user: test
760 | date: Thu Jan 01 00:00:00 1970 +0000
760 | date: Thu Jan 01 00:00:00 1970 +0000
761 | summary: A0
761 | summary: A0
762 |
762 |
763 o changeset: 0:ea207398892e
763 o changeset: 0:ea207398892e
764 user: test
764 user: test
765 date: Thu Jan 01 00:00:00 1970 +0000
765 date: Thu Jan 01 00:00:00 1970 +0000
766 summary: ROOT
766 summary: ROOT
767
767
768 # Simulate a fold
768 # Simulate a fold
769 $ hg up -r "desc(ROOT)"
769 $ hg up -r "desc(ROOT)"
770 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
770 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
771 $ echo "A0" > A0
771 $ echo "A0" > A0
772 $ echo "B0" > B0
772 $ echo "B0" > B0
773 $ hg commit -A -m "C0"
773 $ hg commit -A -m "C0"
774 adding A0
774 adding A0
775 adding B0
775 adding B0
776 created new head
776 created new head
777 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
777 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
778 obsoleted 1 changesets
778 obsoleted 1 changesets
779 $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"`
779 $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"`
780 obsoleted 1 changesets
780 obsoleted 1 changesets
781
781
782 $ hg log --hidden -G
782 $ hg log --hidden -G
783 @ changeset: 4:eb5a0daa2192
783 @ changeset: 4:eb5a0daa2192
784 | tag: tip
784 | tag: tip
785 | parent: 0:ea207398892e
785 | parent: 0:ea207398892e
786 | user: test
786 | user: test
787 | date: Thu Jan 01 00:00:00 1970 +0000
787 | date: Thu Jan 01 00:00:00 1970 +0000
788 | summary: C0
788 | summary: C0
789 |
789 |
790 | x changeset: 3:b7ea6d14e664
790 | x changeset: 3:b7ea6d14e664
791 | | parent: 1:471f378eab4c
791 | | parent: 1:471f378eab4c
792 | | user: test
792 | | user: test
793 | | date: Thu Jan 01 00:00:00 1970 +0000
793 | | date: Thu Jan 01 00:00:00 1970 +0000
794 | | summary: B1
794 | | summary: B1
795 | |
795 | |
796 | | x changeset: 2:0dec01379d3b
796 | | x changeset: 2:0dec01379d3b
797 | |/ user: test
797 | |/ user: test
798 | | date: Thu Jan 01 00:00:00 1970 +0000
798 | | date: Thu Jan 01 00:00:00 1970 +0000
799 | | summary: B0
799 | | summary: B0
800 | |
800 | |
801 | x changeset: 1:471f378eab4c
801 | x changeset: 1:471f378eab4c
802 |/ user: test
802 |/ user: test
803 | date: Thu Jan 01 00:00:00 1970 +0000
803 | date: Thu Jan 01 00:00:00 1970 +0000
804 | summary: A0
804 | summary: A0
805 |
805 |
806 o changeset: 0:ea207398892e
806 o changeset: 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: ROOT
809 summary: ROOT
810
810
811 Check templates
811 Check templates
812 ---------------
812 ---------------
813
813
814 $ hg up 'desc(A0)' --hidden
814 $ hg up 'desc(A0)' --hidden
815 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
815 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
816
816
817 Predecessors template should show current revision as it is the working copy
817 Predecessors template should show current revision as it is the working copy
818 $ hg tlog
818 $ hg tlog
819 o eb5a0daa2192
819 o eb5a0daa2192
820 | Predecessors: 1:471f378eab4c
820 | Predecessors: 1:471f378eab4c
821 | semi-colon: 1:471f378eab4c
821 | semi-colon: 1:471f378eab4c
822 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
822 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
823 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
823 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
824 | @ 471f378eab4c
824 | @ 471f378eab4c
825 |/ Successors: 4:eb5a0daa2192
825 |/ Successors: 4:eb5a0daa2192
826 | multi-line: 4:eb5a0daa2192
826 | multi-line: 4:eb5a0daa2192
827 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
827 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
828 o ea207398892e
828 o ea207398892e
829
829
830
830
831 $ hg fatelog
831 $ hg fatelog
832 o eb5a0daa2192
832 o eb5a0daa2192
833 |
833 |
834 | @ 471f378eab4c
834 | @ 471f378eab4c
835 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
835 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
836 o ea207398892e
836 o ea207398892e
837
837
838 $ hg up 'desc(B0)' --hidden
838 $ hg up 'desc(B0)' --hidden
839 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
839 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
840
840
841 Predecessors template should both predecessors as they are visible
841 Predecessors template should both predecessors as they are visible
842 $ hg tlog
842 $ hg tlog
843 o eb5a0daa2192
843 o eb5a0daa2192
844 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
844 | Predecessors: 2:0dec01379d3b 1:471f378eab4c
845 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
845 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c
846 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
846 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
847 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
847 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
848 | @ 0dec01379d3b
848 | @ 0dec01379d3b
849 | | Successors: 4:eb5a0daa2192
849 | | Successors: 4:eb5a0daa2192
850 | | multi-line: 4:eb5a0daa2192
850 | | multi-line: 4:eb5a0daa2192
851 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
851 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
852 | x 471f378eab4c
852 | x 471f378eab4c
853 |/ Successors: 4:eb5a0daa2192
853 |/ Successors: 4:eb5a0daa2192
854 | multi-line: 4:eb5a0daa2192
854 | multi-line: 4:eb5a0daa2192
855 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
855 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
856 o ea207398892e
856 o ea207398892e
857
857
858
858
859 $ hg fatelog
859 $ hg fatelog
860 o eb5a0daa2192
860 o eb5a0daa2192
861 |
861 |
862 | @ 0dec01379d3b
862 | @ 0dec01379d3b
863 | | Obsfate: rewritten using amend as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
863 | | Obsfate: rewritten using amend as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
864 | x 471f378eab4c
864 | x 471f378eab4c
865 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
865 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
866 o ea207398892e
866 o ea207398892e
867
867
868 $ hg up 'desc(B1)' --hidden
868 $ hg up 'desc(B1)' --hidden
869 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
869 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
870
870
871 Predecessors template should both predecessors as they are visible
871 Predecessors template should both predecessors as they are visible
872 $ hg tlog
872 $ hg tlog
873 o eb5a0daa2192
873 o eb5a0daa2192
874 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664
874 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664
875 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
875 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
876 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
876 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
877 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
877 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
878 | @ b7ea6d14e664
878 | @ b7ea6d14e664
879 | | Successors: 4:eb5a0daa2192
879 | | Successors: 4:eb5a0daa2192
880 | | multi-line: 4:eb5a0daa2192
880 | | multi-line: 4:eb5a0daa2192
881 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
881 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
882 | x 471f378eab4c
882 | x 471f378eab4c
883 |/ Successors: 4:eb5a0daa2192
883 |/ Successors: 4:eb5a0daa2192
884 | multi-line: 4:eb5a0daa2192
884 | multi-line: 4:eb5a0daa2192
885 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
885 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
886 o ea207398892e
886 o ea207398892e
887
887
888
888
889 $ hg fatelog
889 $ hg fatelog
890 o eb5a0daa2192
890 o eb5a0daa2192
891 |
891 |
892 | @ b7ea6d14e664
892 | @ b7ea6d14e664
893 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
893 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
894 | x 471f378eab4c
894 | x 471f378eab4c
895 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
895 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
896 o ea207398892e
896 o ea207398892e
897
897
898 $ hg up 'desc(C0)'
898 $ hg up 'desc(C0)'
899 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
899 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
900
900
901 Predecessors template should show no predecessors as they are both non visible
901 Predecessors template should show no predecessors as they are both non visible
902 $ hg tlog
902 $ hg tlog
903 @ eb5a0daa2192
903 @ eb5a0daa2192
904 |
904 |
905 o ea207398892e
905 o ea207398892e
906
906
907
907
908 $ hg fatelog
908 $ hg fatelog
909 @ eb5a0daa2192
909 @ eb5a0daa2192
910 |
910 |
911 o ea207398892e
911 o ea207398892e
912
912
913 Predecessors template should show all predecessors as we force their display
913 Predecessors template should show all predecessors as we force their display
914 with --hidden
914 with --hidden
915 $ hg tlog --hidden
915 $ hg tlog --hidden
916 @ eb5a0daa2192
916 @ eb5a0daa2192
917 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664
917 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664
918 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
918 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
919 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
919 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
920 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
920 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
921 | x b7ea6d14e664
921 | x b7ea6d14e664
922 | | Predecessors: 2:0dec01379d3b
922 | | Predecessors: 2:0dec01379d3b
923 | | semi-colon: 2:0dec01379d3b
923 | | semi-colon: 2:0dec01379d3b
924 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
924 | | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
925 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
925 | | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
926 | | Successors: 4:eb5a0daa2192
926 | | Successors: 4:eb5a0daa2192
927 | | multi-line: 4:eb5a0daa2192
927 | | multi-line: 4:eb5a0daa2192
928 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
928 | | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
929 | | x 0dec01379d3b
929 | | x 0dec01379d3b
930 | |/ Successors: 3:b7ea6d14e664
930 | |/ Successors: 3:b7ea6d14e664
931 | | multi-line: 3:b7ea6d14e664
931 | | multi-line: 3:b7ea6d14e664
932 | | json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]]
932 | | json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]]
933 | x 471f378eab4c
933 | x 471f378eab4c
934 |/ Successors: 4:eb5a0daa2192
934 |/ Successors: 4:eb5a0daa2192
935 | multi-line: 4:eb5a0daa2192
935 | multi-line: 4:eb5a0daa2192
936 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
936 | json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
937 o ea207398892e
937 o ea207398892e
938
938
939
939
940 $ hg fatelog --hidden
940 $ hg fatelog --hidden
941 @ eb5a0daa2192
941 @ eb5a0daa2192
942 |
942 |
943 | x b7ea6d14e664
943 | x b7ea6d14e664
944 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
944 | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
945 | | x 0dec01379d3b
945 | | x 0dec01379d3b
946 | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000);
946 | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000);
947 | x 471f378eab4c
947 | x 471f378eab4c
948 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
948 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
949 o ea207398892e
949 o ea207398892e
950
950
951
951
952 $ hg fatelogjson --hidden
952 $ hg fatelogjson --hidden
953 @ eb5a0daa2192
953 @ eb5a0daa2192
954 |
954 |
955 | x b7ea6d14e664
955 | x b7ea6d14e664
956 | | Obsfate: [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
956 | | Obsfate: [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
957 | | x 0dec01379d3b
957 | | x 0dec01379d3b
958 | |/ Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"]}]
958 | |/ Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"]}]
959 | x 471f378eab4c
959 | x 471f378eab4c
960 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
960 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
961 o ea207398892e
961 o ea207398892e
962
962
963
963
964 Test template with pushed and pulled obs markers
964 Test template with pushed and pulled obs markers
965 ================================================
965 ================================================
966
966
967 Test setup
967 Test setup
968 ----------
968 ----------
969
969
970 $ hg init $TESTTMP/templates-local-remote-markers-1
970 $ hg init $TESTTMP/templates-local-remote-markers-1
971 $ cd $TESTTMP/templates-local-remote-markers-1
971 $ cd $TESTTMP/templates-local-remote-markers-1
972 $ mkcommit ROOT
972 $ mkcommit ROOT
973 $ mkcommit A0
973 $ mkcommit A0
974 $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2
974 $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2
975 updating to branch default
975 updating to branch default
976 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
976 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
977 $ cd $TESTTMP/templates-local-remote-markers-2
977 $ cd $TESTTMP/templates-local-remote-markers-2
978 $ hg log --hidden -G
978 $ hg log --hidden -G
979 @ changeset: 1:471f378eab4c
979 @ changeset: 1:471f378eab4c
980 | tag: tip
980 | tag: tip
981 | user: test
981 | user: test
982 | date: Thu Jan 01 00:00:00 1970 +0000
982 | date: Thu Jan 01 00:00:00 1970 +0000
983 | summary: A0
983 | summary: A0
984 |
984 |
985 o changeset: 0:ea207398892e
985 o changeset: 0:ea207398892e
986 user: test
986 user: test
987 date: Thu Jan 01 00:00:00 1970 +0000
987 date: Thu Jan 01 00:00:00 1970 +0000
988 summary: ROOT
988 summary: ROOT
989
989
990 $ cd $TESTTMP/templates-local-remote-markers-1
990 $ cd $TESTTMP/templates-local-remote-markers-1
991 $ hg commit --amend -m "A1"
991 $ hg commit --amend -m "A1"
992 $ hg commit --amend -m "A2"
992 $ hg commit --amend -m "A2"
993 $ hg log --hidden -G
993 $ hg log --hidden -G
994 @ changeset: 3:7a230b46bf61
994 @ changeset: 3:7a230b46bf61
995 | tag: tip
995 | tag: tip
996 | parent: 0:ea207398892e
996 | parent: 0:ea207398892e
997 | user: test
997 | user: test
998 | date: Thu Jan 01 00:00:00 1970 +0000
998 | date: Thu Jan 01 00:00:00 1970 +0000
999 | summary: A2
999 | summary: A2
1000 |
1000 |
1001 | x changeset: 2:fdf9bde5129a
1001 | x changeset: 2:fdf9bde5129a
1002 |/ parent: 0:ea207398892e
1002 |/ parent: 0:ea207398892e
1003 | user: test
1003 | user: test
1004 | date: Thu Jan 01 00:00:00 1970 +0000
1004 | date: Thu Jan 01 00:00:00 1970 +0000
1005 | summary: A1
1005 | summary: A1
1006 |
1006 |
1007 | x changeset: 1:471f378eab4c
1007 | x changeset: 1:471f378eab4c
1008 |/ user: test
1008 |/ user: test
1009 | date: Thu Jan 01 00:00:00 1970 +0000
1009 | date: Thu Jan 01 00:00:00 1970 +0000
1010 | summary: A0
1010 | summary: A0
1011 |
1011 |
1012 o changeset: 0:ea207398892e
1012 o changeset: 0:ea207398892e
1013 user: test
1013 user: test
1014 date: Thu Jan 01 00:00:00 1970 +0000
1014 date: Thu Jan 01 00:00:00 1970 +0000
1015 summary: ROOT
1015 summary: ROOT
1016
1016
1017 $ cd $TESTTMP/templates-local-remote-markers-2
1017 $ cd $TESTTMP/templates-local-remote-markers-2
1018 $ hg pull
1018 $ hg pull
1019 pulling from $TESTTMP/templates-local-remote-markers-1 (glob)
1019 pulling from $TESTTMP/templates-local-remote-markers-1 (glob)
1020 searching for changes
1020 searching for changes
1021 adding changesets
1021 adding changesets
1022 adding manifests
1022 adding manifests
1023 adding file changes
1023 adding file changes
1024 added 1 changesets with 0 changes to 1 files (+1 heads)
1024 added 1 changesets with 0 changes to 1 files (+1 heads)
1025 2 new obsolescence markers
1025 2 new obsolescence markers
1026 obsoleted 1 changesets
1026 obsoleted 1 changesets
1027 (run 'hg heads' to see heads, 'hg merge' to merge)
1027 (run 'hg heads' to see heads, 'hg merge' to merge)
1028 $ hg log --hidden -G
1028 $ hg log --hidden -G
1029 o changeset: 2:7a230b46bf61
1029 o changeset: 2:7a230b46bf61
1030 | tag: tip
1030 | tag: tip
1031 | parent: 0:ea207398892e
1031 | parent: 0:ea207398892e
1032 | user: test
1032 | user: test
1033 | date: Thu Jan 01 00:00:00 1970 +0000
1033 | date: Thu Jan 01 00:00:00 1970 +0000
1034 | summary: A2
1034 | summary: A2
1035 |
1035 |
1036 | @ changeset: 1:471f378eab4c
1036 | @ changeset: 1:471f378eab4c
1037 |/ user: test
1037 |/ user: test
1038 | date: Thu Jan 01 00:00:00 1970 +0000
1038 | date: Thu Jan 01 00:00:00 1970 +0000
1039 | summary: A0
1039 | summary: A0
1040 |
1040 |
1041 o changeset: 0:ea207398892e
1041 o changeset: 0:ea207398892e
1042 user: test
1042 user: test
1043 date: Thu Jan 01 00:00:00 1970 +0000
1043 date: Thu Jan 01 00:00:00 1970 +0000
1044 summary: ROOT
1044 summary: ROOT
1045
1045
1046
1046
1047 $ hg debugobsolete
1047 $ hg debugobsolete
1048 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
1048 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
1049 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 7a230b46bf61e50b30308c6cfd7bd1269ef54702 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
1049 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 7a230b46bf61e50b30308c6cfd7bd1269ef54702 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
1050
1050
1051 Check templates
1051 Check templates
1052 ---------------
1052 ---------------
1053
1053
1054 Predecessors template should show current revision as it is the working copy
1054 Predecessors template should show current revision as it is the working copy
1055 $ hg tlog
1055 $ hg tlog
1056 o 7a230b46bf61
1056 o 7a230b46bf61
1057 | Predecessors: 1:471f378eab4c
1057 | Predecessors: 1:471f378eab4c
1058 | semi-colon: 1:471f378eab4c
1058 | semi-colon: 1:471f378eab4c
1059 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1059 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1060 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1060 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1061 | @ 471f378eab4c
1061 | @ 471f378eab4c
1062 |/ Successors: 2:7a230b46bf61
1062 |/ Successors: 2:7a230b46bf61
1063 | multi-line: 2:7a230b46bf61
1063 | multi-line: 2:7a230b46bf61
1064 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
1064 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
1065 o ea207398892e
1065 o ea207398892e
1066
1066
1067
1067
1068 $ hg fatelog
1068 $ hg fatelog
1069 o 7a230b46bf61
1069 o 7a230b46bf61
1070 |
1070 |
1071 | @ 471f378eab4c
1071 | @ 471f378eab4c
1072 |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000);
1072 |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000);
1073 o ea207398892e
1073 o ea207398892e
1074
1074
1075 $ hg up 'desc(A2)'
1075 $ hg up 'desc(A2)'
1076 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1076 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1077
1077
1078 Predecessors template should show no predecessors as they are non visible
1078 Predecessors template should show no predecessors as they are non visible
1079 $ hg tlog
1079 $ hg tlog
1080 @ 7a230b46bf61
1080 @ 7a230b46bf61
1081 |
1081 |
1082 o ea207398892e
1082 o ea207398892e
1083
1083
1084
1084
1085 $ hg fatelog
1085 $ hg fatelog
1086 @ 7a230b46bf61
1086 @ 7a230b46bf61
1087 |
1087 |
1088 o ea207398892e
1088 o ea207398892e
1089
1089
1090 Predecessors template should show all predecessors as we force their display
1090 Predecessors template should show all predecessors as we force their display
1091 with --hidden
1091 with --hidden
1092 $ hg tlog --hidden
1092 $ hg tlog --hidden
1093 @ 7a230b46bf61
1093 @ 7a230b46bf61
1094 | Predecessors: 1:471f378eab4c
1094 | Predecessors: 1:471f378eab4c
1095 | semi-colon: 1:471f378eab4c
1095 | semi-colon: 1:471f378eab4c
1096 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1096 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1097 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1097 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1098 | x 471f378eab4c
1098 | x 471f378eab4c
1099 |/ Successors: 2:7a230b46bf61
1099 |/ Successors: 2:7a230b46bf61
1100 | multi-line: 2:7a230b46bf61
1100 | multi-line: 2:7a230b46bf61
1101 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
1101 | json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
1102 o ea207398892e
1102 o ea207398892e
1103
1103
1104
1104
1105 $ hg fatelog --hidden
1105 $ hg fatelog --hidden
1106 @ 7a230b46bf61
1106 @ 7a230b46bf61
1107 |
1107 |
1108 | x 471f378eab4c
1108 | x 471f378eab4c
1109 |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000);
1109 |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000);
1110 o ea207398892e
1110 o ea207398892e
1111
1111
1112
1112
1113 Test template with obsmarkers cycle
1113 Test template with obsmarkers cycle
1114 ===================================
1114 ===================================
1115
1115
1116 Test setup
1116 Test setup
1117 ----------
1117 ----------
1118
1118
1119 $ hg init $TESTTMP/templates-local-cycle
1119 $ hg init $TESTTMP/templates-local-cycle
1120 $ cd $TESTTMP/templates-local-cycle
1120 $ cd $TESTTMP/templates-local-cycle
1121 $ mkcommit ROOT
1121 $ mkcommit ROOT
1122 $ mkcommit A0
1122 $ mkcommit A0
1123 $ mkcommit B0
1123 $ mkcommit B0
1124 $ hg up -r 0
1124 $ hg up -r 0
1125 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1125 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1126 $ mkcommit C0
1126 $ mkcommit C0
1127 created new head
1127 created new head
1128
1128
1129 Create the cycle
1129 Create the cycle
1130
1130
1131 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
1131 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
1132 obsoleted 1 changesets
1132 obsoleted 1 changesets
1133 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
1133 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
1134 obsoleted 1 changesets
1134 obsoleted 1 changesets
1135 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
1135 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
1136
1136
1137 Check templates
1137 Check templates
1138 ---------------
1138 ---------------
1139
1139
1140 $ hg tlog
1140 $ hg tlog
1141 @ f897c6137566
1141 @ f897c6137566
1142 |
1142 |
1143 o ea207398892e
1143 o ea207398892e
1144
1144
1145
1145
1146 $ hg fatelog
1146 $ hg fatelog
1147 @ f897c6137566
1147 @ f897c6137566
1148 |
1148 |
1149 o ea207398892e
1149 o ea207398892e
1150
1150
1151
1151
1152 $ hg up -r "desc(B0)" --hidden
1152 $ hg up -r "desc(B0)" --hidden
1153 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1153 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1154 $ hg tlog
1154 $ hg tlog
1155 o f897c6137566
1155 o f897c6137566
1156 | Predecessors: 2:0dec01379d3b
1156 | Predecessors: 2:0dec01379d3b
1157 | semi-colon: 2:0dec01379d3b
1157 | semi-colon: 2:0dec01379d3b
1158 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1158 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1159 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1159 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1160 | @ 0dec01379d3b
1160 | @ 0dec01379d3b
1161 | | Predecessors: 1:471f378eab4c
1161 | | Predecessors: 1:471f378eab4c
1162 | | semi-colon: 1:471f378eab4c
1162 | | semi-colon: 1:471f378eab4c
1163 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1163 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1164 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1164 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1165 | | Successors: 3:f897c6137566; 1:471f378eab4c
1165 | | Successors: 3:f897c6137566; 1:471f378eab4c
1166 | | multi-line: 3:f897c6137566
1166 | | multi-line: 3:f897c6137566
1167 | | multi-line: 1:471f378eab4c
1167 | | multi-line: 1:471f378eab4c
1168 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
1168 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
1169 | x 471f378eab4c
1169 | x 471f378eab4c
1170 |/ Predecessors: 2:0dec01379d3b
1170 |/ Predecessors: 2:0dec01379d3b
1171 | semi-colon: 2:0dec01379d3b
1171 | semi-colon: 2:0dec01379d3b
1172 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1172 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1173 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1173 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1174 | Successors: 2:0dec01379d3b
1174 | Successors: 2:0dec01379d3b
1175 | multi-line: 2:0dec01379d3b
1175 | multi-line: 2:0dec01379d3b
1176 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
1176 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
1177 o ea207398892e
1177 o ea207398892e
1178
1178
1179
1179
1180 $ hg fatelog
1180 $ hg fatelog
1181 o f897c6137566
1181 o f897c6137566
1182 |
1182 |
1183 | @ 0dec01379d3b
1183 | @ 0dec01379d3b
1184 | | 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);
1184 | | 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);
1185 | x 471f378eab4c
1185 | x 471f378eab4c
1186 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000);
1186 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000);
1187 o ea207398892e
1187 o ea207398892e
1188
1188
1189
1189
1190 $ hg up -r "desc(A0)" --hidden
1190 $ hg up -r "desc(A0)" --hidden
1191 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1191 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1192 $ hg tlog
1192 $ hg tlog
1193 o f897c6137566
1193 o f897c6137566
1194 | Predecessors: 1:471f378eab4c
1194 | Predecessors: 1:471f378eab4c
1195 | semi-colon: 1:471f378eab4c
1195 | semi-colon: 1:471f378eab4c
1196 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1196 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1197 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1197 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1198 | @ 471f378eab4c
1198 | @ 471f378eab4c
1199 |/
1199 |/
1200 o ea207398892e
1200 o ea207398892e
1201
1201
1202
1202
1203 $ hg fatelog
1203 $ hg fatelog
1204 o f897c6137566
1204 o f897c6137566
1205 |
1205 |
1206 | @ 471f378eab4c
1206 | @ 471f378eab4c
1207 |/ Obsfate: pruned;
1207 |/ Obsfate: pruned;
1208 o ea207398892e
1208 o ea207398892e
1209
1209
1210
1210
1211 $ hg up -r "desc(ROOT)" --hidden
1211 $ hg up -r "desc(ROOT)" --hidden
1212 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1212 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1213 $ hg tlog
1213 $ hg tlog
1214 o f897c6137566
1214 o f897c6137566
1215 |
1215 |
1216 @ ea207398892e
1216 @ ea207398892e
1217
1217
1218
1218
1219 $ hg fatelog
1219 $ hg fatelog
1220 o f897c6137566
1220 o f897c6137566
1221 |
1221 |
1222 @ ea207398892e
1222 @ ea207398892e
1223
1223
1224
1224
1225 $ hg tlog --hidden
1225 $ hg tlog --hidden
1226 o f897c6137566
1226 o f897c6137566
1227 | Predecessors: 2:0dec01379d3b
1227 | Predecessors: 2:0dec01379d3b
1228 | semi-colon: 2:0dec01379d3b
1228 | semi-colon: 2:0dec01379d3b
1229 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1229 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1230 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1230 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1231 | x 0dec01379d3b
1231 | x 0dec01379d3b
1232 | | Predecessors: 1:471f378eab4c
1232 | | Predecessors: 1:471f378eab4c
1233 | | semi-colon: 1:471f378eab4c
1233 | | semi-colon: 1:471f378eab4c
1234 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1234 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1235 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1235 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1236 | | Successors: 3:f897c6137566; 1:471f378eab4c
1236 | | Successors: 3:f897c6137566; 1:471f378eab4c
1237 | | multi-line: 3:f897c6137566
1237 | | multi-line: 3:f897c6137566
1238 | | multi-line: 1:471f378eab4c
1238 | | multi-line: 1:471f378eab4c
1239 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
1239 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
1240 | x 471f378eab4c
1240 | x 471f378eab4c
1241 |/ Predecessors: 2:0dec01379d3b
1241 |/ Predecessors: 2:0dec01379d3b
1242 | semi-colon: 2:0dec01379d3b
1242 | semi-colon: 2:0dec01379d3b
1243 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1243 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1244 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1244 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1245 | Successors: 2:0dec01379d3b
1245 | Successors: 2:0dec01379d3b
1246 | multi-line: 2:0dec01379d3b
1246 | multi-line: 2:0dec01379d3b
1247 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
1247 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
1248 @ ea207398892e
1248 @ ea207398892e
1249
1249
1250 Test template with split + divergence with cycles
1250 Test template with split + divergence with cycles
1251 =================================================
1251 =================================================
1252
1252
1253 $ hg log -G
1253 $ hg log -G
1254 o changeset: 3:f897c6137566
1254 o changeset: 3:f897c6137566
1255 | tag: tip
1255 | tag: tip
1256 | parent: 0:ea207398892e
1256 | parent: 0:ea207398892e
1257 | user: test
1257 | user: test
1258 | date: Thu Jan 01 00:00:00 1970 +0000
1258 | date: Thu Jan 01 00:00:00 1970 +0000
1259 | summary: C0
1259 | summary: C0
1260 |
1260 |
1261 @ changeset: 0:ea207398892e
1261 @ changeset: 0:ea207398892e
1262 user: test
1262 user: test
1263 date: Thu Jan 01 00:00:00 1970 +0000
1263 date: Thu Jan 01 00:00:00 1970 +0000
1264 summary: ROOT
1264 summary: ROOT
1265
1265
1266 $ hg up
1266 $ hg up
1267 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1267 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1268
1268
1269 Create a commit with three files
1269 Create a commit with three files
1270 $ touch A B C
1270 $ touch A B C
1271 $ hg commit -A -m "Add A,B,C" A B C
1271 $ hg commit -A -m "Add A,B,C" A B C
1272
1272
1273 Split it
1273 Split it
1274 $ hg up 3
1274 $ hg up 3
1275 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
1275 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
1276 $ touch A
1276 $ touch A
1277 $ hg commit -A -m "Add A,B,C" A
1277 $ hg commit -A -m "Add A,B,C" A
1278 created new head
1278 created new head
1279
1279
1280 $ touch B
1280 $ touch B
1281 $ hg commit -A -m "Add A,B,C" B
1281 $ hg commit -A -m "Add A,B,C" B
1282
1282
1283 $ touch C
1283 $ touch C
1284 $ hg commit -A -m "Add A,B,C" C
1284 $ hg commit -A -m "Add A,B,C" C
1285
1285
1286 $ hg log -G
1286 $ hg log -G
1287 @ changeset: 7:ba2ed02b0c9a
1287 @ changeset: 7:ba2ed02b0c9a
1288 | tag: tip
1288 | tag: tip
1289 | user: test
1289 | user: test
1290 | date: Thu Jan 01 00:00:00 1970 +0000
1290 | date: Thu Jan 01 00:00:00 1970 +0000
1291 | summary: Add A,B,C
1291 | summary: Add A,B,C
1292 |
1292 |
1293 o changeset: 6:4a004186e638
1293 o changeset: 6:4a004186e638
1294 | user: test
1294 | user: test
1295 | date: Thu Jan 01 00:00:00 1970 +0000
1295 | date: Thu Jan 01 00:00:00 1970 +0000
1296 | summary: Add A,B,C
1296 | summary: Add A,B,C
1297 |
1297 |
1298 o changeset: 5:dd800401bd8c
1298 o changeset: 5:dd800401bd8c
1299 | parent: 3:f897c6137566
1299 | parent: 3:f897c6137566
1300 | user: test
1300 | user: test
1301 | date: Thu Jan 01 00:00:00 1970 +0000
1301 | date: Thu Jan 01 00:00:00 1970 +0000
1302 | summary: Add A,B,C
1302 | summary: Add A,B,C
1303 |
1303 |
1304 | o changeset: 4:9bd10a0775e4
1304 | o changeset: 4:9bd10a0775e4
1305 |/ user: test
1305 |/ user: test
1306 | date: Thu Jan 01 00:00:00 1970 +0000
1306 | date: Thu Jan 01 00:00:00 1970 +0000
1307 | summary: Add A,B,C
1307 | summary: Add A,B,C
1308 |
1308 |
1309 o changeset: 3:f897c6137566
1309 o changeset: 3:f897c6137566
1310 | parent: 0:ea207398892e
1310 | parent: 0:ea207398892e
1311 | user: test
1311 | user: test
1312 | date: Thu Jan 01 00:00:00 1970 +0000
1312 | date: Thu Jan 01 00:00:00 1970 +0000
1313 | summary: C0
1313 | summary: C0
1314 |
1314 |
1315 o changeset: 0:ea207398892e
1315 o changeset: 0:ea207398892e
1316 user: test
1316 user: test
1317 date: Thu Jan 01 00:00:00 1970 +0000
1317 date: Thu Jan 01 00:00:00 1970 +0000
1318 summary: ROOT
1318 summary: ROOT
1319
1319
1320 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"`
1320 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"`
1321 obsoleted 1 changesets
1321 obsoleted 1 changesets
1322 $ hg log -G
1322 $ hg log -G
1323 @ changeset: 7:ba2ed02b0c9a
1323 @ changeset: 7:ba2ed02b0c9a
1324 | tag: tip
1324 | tag: tip
1325 | user: test
1325 | user: test
1326 | date: Thu Jan 01 00:00:00 1970 +0000
1326 | date: Thu Jan 01 00:00:00 1970 +0000
1327 | summary: Add A,B,C
1327 | summary: Add A,B,C
1328 |
1328 |
1329 o changeset: 6:4a004186e638
1329 o changeset: 6:4a004186e638
1330 | user: test
1330 | user: test
1331 | date: Thu Jan 01 00:00:00 1970 +0000
1331 | date: Thu Jan 01 00:00:00 1970 +0000
1332 | summary: Add A,B,C
1332 | summary: Add A,B,C
1333 |
1333 |
1334 o changeset: 5:dd800401bd8c
1334 o changeset: 5:dd800401bd8c
1335 | parent: 3:f897c6137566
1335 | parent: 3:f897c6137566
1336 | user: test
1336 | user: test
1337 | date: Thu Jan 01 00:00:00 1970 +0000
1337 | date: Thu Jan 01 00:00:00 1970 +0000
1338 | summary: Add A,B,C
1338 | summary: Add A,B,C
1339 |
1339 |
1340 o changeset: 3:f897c6137566
1340 o changeset: 3:f897c6137566
1341 | parent: 0:ea207398892e
1341 | parent: 0:ea207398892e
1342 | user: test
1342 | user: test
1343 | date: Thu Jan 01 00:00:00 1970 +0000
1343 | date: Thu Jan 01 00:00:00 1970 +0000
1344 | summary: C0
1344 | summary: C0
1345 |
1345 |
1346 o changeset: 0:ea207398892e
1346 o changeset: 0:ea207398892e
1347 user: test
1347 user: test
1348 date: Thu Jan 01 00:00:00 1970 +0000
1348 date: Thu Jan 01 00:00:00 1970 +0000
1349 summary: ROOT
1349 summary: ROOT
1350
1350
1351 Diverge one of the splitted commit
1351 Diverge one of the splitted commit
1352
1352
1353 $ hg up 6
1353 $ hg up 6
1354 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1354 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1355 $ hg commit --amend -m "Add only B"
1355 $ hg commit --amend -m "Add only B"
1356
1356
1357 $ hg up 6 --hidden
1357 $ hg up 6 --hidden
1358 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1358 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1359 $ hg commit --amend -m "Add B only"
1359 $ hg commit --amend -m "Add B only"
1360
1360
1361 $ hg log -G
1361 $ hg log -G
1362 @ changeset: 9:0b997eb7ceee
1362 @ changeset: 9:0b997eb7ceee
1363 | tag: tip
1363 | tag: tip
1364 | parent: 5:dd800401bd8c
1364 | parent: 5:dd800401bd8c
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 | instability: content-divergent
1367 | instability: content-divergent
1368 | summary: Add B only
1368 | summary: Add B only
1369 |
1369 |
1370 | o changeset: 8:b18bc8331526
1370 | o changeset: 8:b18bc8331526
1371 |/ parent: 5:dd800401bd8c
1371 |/ parent: 5:dd800401bd8c
1372 | user: test
1372 | user: test
1373 | date: Thu Jan 01 00:00:00 1970 +0000
1373 | date: Thu Jan 01 00:00:00 1970 +0000
1374 | instability: content-divergent
1374 | instability: content-divergent
1375 | summary: Add only B
1375 | summary: Add only B
1376 |
1376 |
1377 | o changeset: 7:ba2ed02b0c9a
1377 | o changeset: 7:ba2ed02b0c9a
1378 | | user: test
1378 | | user: test
1379 | | date: Thu Jan 01 00:00:00 1970 +0000
1379 | | date: Thu Jan 01 00:00:00 1970 +0000
1380 | | instability: orphan, content-divergent
1380 | | instability: orphan, content-divergent
1381 | | summary: Add A,B,C
1381 | | summary: Add A,B,C
1382 | |
1382 | |
1383 | x changeset: 6:4a004186e638
1383 | x changeset: 6:4a004186e638
1384 |/ user: test
1384 |/ user: test
1385 | date: Thu Jan 01 00:00:00 1970 +0000
1385 | date: Thu Jan 01 00:00:00 1970 +0000
1386 | summary: Add A,B,C
1386 | summary: Add A,B,C
1387 |
1387 |
1388 o changeset: 5:dd800401bd8c
1388 o changeset: 5:dd800401bd8c
1389 | parent: 3:f897c6137566
1389 | parent: 3:f897c6137566
1390 | user: test
1390 | user: test
1391 | date: Thu Jan 01 00:00:00 1970 +0000
1391 | date: Thu Jan 01 00:00:00 1970 +0000
1392 | instability: content-divergent
1392 | instability: content-divergent
1393 | summary: Add A,B,C
1393 | summary: Add A,B,C
1394 |
1394 |
1395 o changeset: 3:f897c6137566
1395 o changeset: 3:f897c6137566
1396 | parent: 0:ea207398892e
1396 | parent: 0:ea207398892e
1397 | user: test
1397 | user: test
1398 | date: Thu Jan 01 00:00:00 1970 +0000
1398 | date: Thu Jan 01 00:00:00 1970 +0000
1399 | summary: C0
1399 | summary: C0
1400 |
1400 |
1401 o changeset: 0:ea207398892e
1401 o changeset: 0:ea207398892e
1402 user: test
1402 user: test
1403 date: Thu Jan 01 00:00:00 1970 +0000
1403 date: Thu Jan 01 00:00:00 1970 +0000
1404 summary: ROOT
1404 summary: ROOT
1405
1405
1406
1406
1407 Check templates
1407 Check templates
1408 ---------------
1408 ---------------
1409
1409
1410 $ hg tlog
1410 $ hg tlog
1411 @ 0b997eb7ceee
1411 @ 0b997eb7ceee
1412 | Predecessors: 6:4a004186e638
1412 | Predecessors: 6:4a004186e638
1413 | semi-colon: 6:4a004186e638
1413 | semi-colon: 6:4a004186e638
1414 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1414 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1415 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
1415 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
1416 | o b18bc8331526
1416 | o b18bc8331526
1417 |/ Predecessors: 6:4a004186e638
1417 |/ Predecessors: 6:4a004186e638
1418 | semi-colon: 6:4a004186e638
1418 | semi-colon: 6:4a004186e638
1419 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1419 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1420 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
1420 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
1421 | o ba2ed02b0c9a
1421 | o ba2ed02b0c9a
1422 | |
1422 | |
1423 | x 4a004186e638
1423 | x 4a004186e638
1424 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
1424 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
1425 | multi-line: 8:b18bc8331526
1425 | multi-line: 8:b18bc8331526
1426 | multi-line: 9:0b997eb7ceee
1426 | multi-line: 9:0b997eb7ceee
1427 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
1427 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
1428 o dd800401bd8c
1428 o dd800401bd8c
1429 |
1429 |
1430 o f897c6137566
1430 o f897c6137566
1431 |
1431 |
1432 o ea207398892e
1432 o ea207398892e
1433
1433
1434 $ hg fatelog
1434 $ hg fatelog
1435 @ 0b997eb7ceee
1435 @ 0b997eb7ceee
1436 |
1436 |
1437 | o b18bc8331526
1437 | o b18bc8331526
1438 |/
1438 |/
1439 | o ba2ed02b0c9a
1439 | o ba2ed02b0c9a
1440 | |
1440 | |
1441 | x 4a004186e638
1441 | x 4a004186e638
1442 |/ 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);
1442 |/ 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);
1443 o dd800401bd8c
1443 o dd800401bd8c
1444 |
1444 |
1445 o f897c6137566
1445 o f897c6137566
1446 |
1446 |
1447 o ea207398892e
1447 o ea207398892e
1448
1448
1449 $ hg tlog --hidden
1449 $ hg tlog --hidden
1450 @ 0b997eb7ceee
1450 @ 0b997eb7ceee
1451 | Predecessors: 6:4a004186e638
1451 | Predecessors: 6:4a004186e638
1452 | semi-colon: 6:4a004186e638
1452 | semi-colon: 6:4a004186e638
1453 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1453 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1454 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
1454 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
1455 | o b18bc8331526
1455 | o b18bc8331526
1456 |/ Predecessors: 6:4a004186e638
1456 |/ Predecessors: 6:4a004186e638
1457 | semi-colon: 6:4a004186e638
1457 | semi-colon: 6:4a004186e638
1458 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1458 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
1459 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
1459 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
1460 | o ba2ed02b0c9a
1460 | o ba2ed02b0c9a
1461 | | Predecessors: 4:9bd10a0775e4
1461 | | Predecessors: 4:9bd10a0775e4
1462 | | semi-colon: 4:9bd10a0775e4
1462 | | semi-colon: 4:9bd10a0775e4
1463 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1463 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1464 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1464 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1465 | x 4a004186e638
1465 | x 4a004186e638
1466 |/ Predecessors: 4:9bd10a0775e4
1466 |/ Predecessors: 4:9bd10a0775e4
1467 | semi-colon: 4:9bd10a0775e4
1467 | semi-colon: 4:9bd10a0775e4
1468 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1468 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1469 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1469 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1470 | Successors: 8:b18bc8331526; 9:0b997eb7ceee
1470 | Successors: 8:b18bc8331526; 9:0b997eb7ceee
1471 | multi-line: 8:b18bc8331526
1471 | multi-line: 8:b18bc8331526
1472 | multi-line: 9:0b997eb7ceee
1472 | multi-line: 9:0b997eb7ceee
1473 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
1473 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
1474 o dd800401bd8c
1474 o dd800401bd8c
1475 | Predecessors: 4:9bd10a0775e4
1475 | Predecessors: 4:9bd10a0775e4
1476 | semi-colon: 4:9bd10a0775e4
1476 | semi-colon: 4:9bd10a0775e4
1477 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1477 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1478 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1478 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1479 | x 9bd10a0775e4
1479 | x 9bd10a0775e4
1480 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
1480 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
1481 | multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
1481 | multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
1482 | json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]]
1482 | json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]]
1483 o f897c6137566
1483 o f897c6137566
1484 | Predecessors: 2:0dec01379d3b
1484 | Predecessors: 2:0dec01379d3b
1485 | semi-colon: 2:0dec01379d3b
1485 | semi-colon: 2:0dec01379d3b
1486 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1486 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1487 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1487 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1488 | x 0dec01379d3b
1488 | x 0dec01379d3b
1489 | | Predecessors: 1:471f378eab4c
1489 | | Predecessors: 1:471f378eab4c
1490 | | semi-colon: 1:471f378eab4c
1490 | | semi-colon: 1:471f378eab4c
1491 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1491 | | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
1492 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1492 | | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
1493 | | Successors: 3:f897c6137566; 1:471f378eab4c
1493 | | Successors: 3:f897c6137566; 1:471f378eab4c
1494 | | multi-line: 3:f897c6137566
1494 | | multi-line: 3:f897c6137566
1495 | | multi-line: 1:471f378eab4c
1495 | | multi-line: 1:471f378eab4c
1496 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
1496 | | json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
1497 | x 471f378eab4c
1497 | x 471f378eab4c
1498 |/ Predecessors: 2:0dec01379d3b
1498 |/ Predecessors: 2:0dec01379d3b
1499 | semi-colon: 2:0dec01379d3b
1499 | semi-colon: 2:0dec01379d3b
1500 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1500 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
1501 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1501 | map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
1502 | Successors: 2:0dec01379d3b
1502 | Successors: 2:0dec01379d3b
1503 | multi-line: 2:0dec01379d3b
1503 | multi-line: 2:0dec01379d3b
1504 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
1504 | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
1505 o ea207398892e
1505 o ea207398892e
1506
1506
1507 $ hg fatelog --hidden
1507 $ hg fatelog --hidden
1508 @ 0b997eb7ceee
1508 @ 0b997eb7ceee
1509 |
1509 |
1510 | o b18bc8331526
1510 | o b18bc8331526
1511 |/
1511 |/
1512 | o ba2ed02b0c9a
1512 | o ba2ed02b0c9a
1513 | |
1513 | |
1514 | x 4a004186e638
1514 | x 4a004186e638
1515 |/ 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);
1515 |/ 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);
1516 o dd800401bd8c
1516 o dd800401bd8c
1517 |
1517 |
1518 | x 9bd10a0775e4
1518 | x 9bd10a0775e4
1519 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000);
1519 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000);
1520 o f897c6137566
1520 o f897c6137566
1521 |
1521 |
1522 | x 0dec01379d3b
1522 | x 0dec01379d3b
1523 | | 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);
1523 | | 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);
1524 | x 471f378eab4c
1524 | x 471f378eab4c
1525 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000);
1525 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000);
1526 o ea207398892e
1526 o ea207398892e
1527
1527
1528 $ hg fatelogjson --hidden
1528 $ hg fatelogjson --hidden
1529 @ 0b997eb7ceee
1529 @ 0b997eb7ceee
1530 |
1530 |
1531 | o b18bc8331526
1531 | o b18bc8331526
1532 |/
1532 |/
1533 | o ba2ed02b0c9a
1533 | o ba2ed02b0c9a
1534 | |
1534 | |
1535 | x 4a004186e638
1535 | x 4a004186e638
1536 |/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}]
1536 |/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}]
1537 o dd800401bd8c
1537 o dd800401bd8c
1538 |
1538 |
1539 | x 9bd10a0775e4
1539 | x 9bd10a0775e4
1540 |/ Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}]
1540 |/ Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}]
1541 o f897c6137566
1541 o f897c6137566
1542 |
1542 |
1543 | x 0dec01379d3b
1543 | x 0dec01379d3b
1544 | | 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"]}]
1544 | | 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"]}]
1545 | x 471f378eab4c
1545 | x 471f378eab4c
1546 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}]
1546 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}]
1547 o ea207398892e
1547 o ea207398892e
1548
1548
1549 $ hg up --hidden 4
1549 $ hg up --hidden 4
1550 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1550 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1551 $ hg rebase -r 7 -d 8 --config extensions.rebase=
1551 $ hg rebase -r 7 -d 8 --config extensions.rebase=
1552 rebasing 7:ba2ed02b0c9a "Add A,B,C"
1552 rebasing 7:ba2ed02b0c9a "Add A,B,C"
1553 $ hg tlog
1553 $ hg tlog
1554 o eceed8f98ffc
1554 o eceed8f98ffc
1555 | Predecessors: 4:9bd10a0775e4
1555 | Predecessors: 4:9bd10a0775e4
1556 | semi-colon: 4:9bd10a0775e4
1556 | semi-colon: 4:9bd10a0775e4
1557 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1557 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1558 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1558 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1559 | o 0b997eb7ceee
1559 | o 0b997eb7ceee
1560 | | Predecessors: 4:9bd10a0775e4
1560 | | Predecessors: 4:9bd10a0775e4
1561 | | semi-colon: 4:9bd10a0775e4
1561 | | semi-colon: 4:9bd10a0775e4
1562 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1562 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1563 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1563 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1564 o | b18bc8331526
1564 o | b18bc8331526
1565 |/ Predecessors: 4:9bd10a0775e4
1565 |/ Predecessors: 4:9bd10a0775e4
1566 | semi-colon: 4:9bd10a0775e4
1566 | semi-colon: 4:9bd10a0775e4
1567 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1567 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1568 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1568 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1569 o dd800401bd8c
1569 o dd800401bd8c
1570 | Predecessors: 4:9bd10a0775e4
1570 | Predecessors: 4:9bd10a0775e4
1571 | semi-colon: 4:9bd10a0775e4
1571 | semi-colon: 4:9bd10a0775e4
1572 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1572 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
1573 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1573 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
1574 | @ 9bd10a0775e4
1574 | @ 9bd10a0775e4
1575 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
1575 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
1576 | multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc
1576 | multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc
1577 | multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
1577 | multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
1578 | json: [["dd800401bd8c79d815329277739e433e883f784e", "0b997eb7ceeee06200a02f8aab185979092d514e", "eceed8f98ffc4186032e29a6542ab98888ebf68d"], ["dd800401bd8c79d815329277739e433e883f784e", "b18bc8331526a22cbb1801022bd1555bf291c48b", "eceed8f98ffc4186032e29a6542ab98888ebf68d"]]
1578 | json: [["dd800401bd8c79d815329277739e433e883f784e", "0b997eb7ceeee06200a02f8aab185979092d514e", "eceed8f98ffc4186032e29a6542ab98888ebf68d"], ["dd800401bd8c79d815329277739e433e883f784e", "b18bc8331526a22cbb1801022bd1555bf291c48b", "eceed8f98ffc4186032e29a6542ab98888ebf68d"]]
1579 o f897c6137566
1579 o f897c6137566
1580 |
1580 |
1581 o ea207398892e
1581 o ea207398892e
1582
1582
1583
1583
1584 $ hg fatelog
1584 $ hg fatelog
1585 o eceed8f98ffc
1585 o eceed8f98ffc
1586 |
1586 |
1587 | o 0b997eb7ceee
1587 | o 0b997eb7ceee
1588 | |
1588 | |
1589 o | b18bc8331526
1589 o | b18bc8331526
1590 |/
1590 |/
1591 o dd800401bd8c
1591 o dd800401bd8c
1592 |
1592 |
1593 | @ 9bd10a0775e4
1593 | @ 9bd10a0775e4
1594 |/ 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);
1594 |/ 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);
1595 o f897c6137566
1595 o f897c6137566
1596 |
1596 |
1597 o ea207398892e
1597 o ea207398892e
1598
1598
1599 Test templates with pruned commits
1599 Test templates with pruned commits
1600 ==================================
1600 ==================================
1601
1601
1602 Test setup
1602 Test setup
1603 ----------
1603 ----------
1604
1604
1605 $ hg init $TESTTMP/templates-local-prune
1605 $ hg init $TESTTMP/templates-local-prune
1606 $ cd $TESTTMP/templates-local-prune
1606 $ cd $TESTTMP/templates-local-prune
1607 $ mkcommit ROOT
1607 $ mkcommit ROOT
1608 $ mkcommit A0
1608 $ mkcommit A0
1609 $ hg debugobsolete --record-parent `getid "."`
1609 $ hg debugobsolete --record-parent `getid "."`
1610 obsoleted 1 changesets
1610 obsoleted 1 changesets
1611
1611
1612 Check output
1612 Check output
1613 ------------
1613 ------------
1614
1614
1615 $ hg up "desc(A0)" --hidden
1615 $ hg up "desc(A0)" --hidden
1616 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1616 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1617 $ hg tlog
1617 $ hg tlog
1618 @ 471f378eab4c
1618 @ 471f378eab4c
1619 |
1619 |
1620 o ea207398892e
1620 o ea207398892e
1621
1621
1622 $ hg fatelog
1622 $ hg fatelog
1623 @ 471f378eab4c
1623 @ 471f378eab4c
1624 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1624 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1625 o ea207398892e
1625 o ea207398892e
1626
1626
1627 $ hg fatelog -v
1627 $ hg fatelog -v
1628 @ 471f378eab4c
1628 @ 471f378eab4c
1629 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1629 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1630 o ea207398892e
1630 o ea207398892e
1631
1631
1632 Test templates with multiple pruned commits
1632 Test templates with multiple pruned commits
1633 ===========================================
1633 ===========================================
1634
1634
1635 Test setup
1635 Test setup
1636 ----------
1636 ----------
1637
1637
1638 $ hg init $TESTTMP/multiple-local-prune
1638 $ hg init $TESTTMP/multiple-local-prune
1639 $ cd $TESTTMP/multiple-local-prune
1639 $ cd $TESTTMP/multiple-local-prune
1640 $ mkcommit ROOT
1640 $ mkcommit ROOT
1641 $ mkcommit A0
1641 $ mkcommit A0
1642 $ hg commit --amend -m "A1"
1642 $ hg commit --amend -m "A1"
1643 $ hg debugobsolete --record-parent `getid "."`
1643 $ hg debugobsolete --record-parent `getid "."`
1644 obsoleted 1 changesets
1644 obsoleted 1 changesets
1645
1645
1646 $ hg up -r "desc(A0)" --hidden
1646 $ hg up -r "desc(A0)" --hidden
1647 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1647 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1648 $ hg commit --amend -m "A2"
1648 $ hg commit --amend -m "A2"
1649 $ hg debugobsolete --record-parent `getid "."`
1649 $ hg debugobsolete --record-parent `getid "."`
1650 obsoleted 1 changesets
1650 obsoleted 1 changesets
1651
1651
1652 Check output
1652 Check output
1653 ------------
1653 ------------
1654
1654
1655 $ hg up "desc(A0)" --hidden
1655 $ hg up "desc(A0)" --hidden
1656 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1656 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1657 $ hg tlog
1657 $ hg tlog
1658 @ 471f378eab4c
1658 @ 471f378eab4c
1659 |
1659 |
1660 o ea207398892e
1660 o ea207398892e
1661
1661
1662 # todo: the obsfate output is not ideal
1662 # todo: the obsfate output is not ideal
1663 $ hg fatelog
1663 $ hg fatelog
1664 @ 471f378eab4c
1664 @ 471f378eab4c
1665 | Obsfate: pruned;
1665 | Obsfate: pruned;
1666 o ea207398892e
1666 o ea207398892e
1667
1667
1668 $ hg fatelog -v --hidden
1668 $ hg fatelog -v --hidden
1669 x 65b757b745b9
1669 x 65b757b745b9
1670 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1670 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1671 | x fdf9bde5129a
1671 | x fdf9bde5129a
1672 |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1672 |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1673 | @ 471f378eab4c
1673 | @ 471f378eab4c
1674 |/ 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);
1674 |/ 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);
1675 o ea207398892e
1675 o ea207398892e
1676
1676
1677
1677
1678 Test templates with splitted and pruned commit
1678 Test templates with splitted and pruned commit
1679 ==============================================
1679 ==============================================
1680
1680
1681 $ hg init $TESTTMP/templates-local-split-prune
1681 $ hg init $TESTTMP/templates-local-split-prune
1682 $ cd $TESTTMP/templates-local-split-prune
1682 $ cd $TESTTMP/templates-local-split-prune
1683 $ mkcommit ROOT
1683 $ mkcommit ROOT
1684 $ echo 42 >> a
1684 $ echo 42 >> a
1685 $ echo 43 >> b
1685 $ echo 43 >> b
1686 $ hg commit -A -m "A0"
1686 $ hg commit -A -m "A0"
1687 adding a
1687 adding a
1688 adding b
1688 adding b
1689 $ hg log --hidden -G
1689 $ hg log --hidden -G
1690 @ changeset: 1:471597cad322
1690 @ changeset: 1:471597cad322
1691 | tag: tip
1691 | tag: tip
1692 | user: test
1692 | user: test
1693 | date: Thu Jan 01 00:00:00 1970 +0000
1693 | date: Thu Jan 01 00:00:00 1970 +0000
1694 | summary: A0
1694 | summary: A0
1695 |
1695 |
1696 o changeset: 0:ea207398892e
1696 o changeset: 0:ea207398892e
1697 user: test
1697 user: test
1698 date: Thu Jan 01 00:00:00 1970 +0000
1698 date: Thu Jan 01 00:00:00 1970 +0000
1699 summary: ROOT
1699 summary: ROOT
1700
1700
1701 # Simulate split
1701 # Simulate split
1702 $ hg up -r "desc(ROOT)"
1702 $ hg up -r "desc(ROOT)"
1703 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1703 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1704 $ echo 42 >> a
1704 $ echo 42 >> a
1705 $ hg commit -A -m "A1"
1705 $ hg commit -A -m "A1"
1706 adding a
1706 adding a
1707 created new head
1707 created new head
1708 $ echo 43 >> b
1708 $ echo 43 >> b
1709 $ hg commit -A -m "A2"
1709 $ hg commit -A -m "A2"
1710 adding b
1710 adding b
1711 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
1711 $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
1712 obsoleted 1 changesets
1712 obsoleted 1 changesets
1713
1713
1714 # Simulate prune
1714 # Simulate prune
1715 $ hg debugobsolete --record-parent `getid "."`
1715 $ hg debugobsolete --record-parent `getid "."`
1716 obsoleted 1 changesets
1716 obsoleted 1 changesets
1717
1717
1718 $ hg log --hidden -G
1718 $ hg log --hidden -G
1719 @ changeset: 3:0d0ef4bdf70e
1719 @ changeset: 3:0d0ef4bdf70e
1720 | tag: tip
1720 | tag: tip
1721 | user: test
1721 | user: test
1722 | date: Thu Jan 01 00:00:00 1970 +0000
1722 | date: Thu Jan 01 00:00:00 1970 +0000
1723 | summary: A2
1723 | summary: A2
1724 |
1724 |
1725 o changeset: 2:617adc3a144c
1725 o changeset: 2:617adc3a144c
1726 | parent: 0:ea207398892e
1726 | parent: 0:ea207398892e
1727 | user: test
1727 | user: test
1728 | date: Thu Jan 01 00:00:00 1970 +0000
1728 | date: Thu Jan 01 00:00:00 1970 +0000
1729 | summary: A1
1729 | summary: A1
1730 |
1730 |
1731 | x changeset: 1:471597cad322
1731 | x changeset: 1:471597cad322
1732 |/ user: test
1732 |/ user: test
1733 | date: Thu Jan 01 00:00:00 1970 +0000
1733 | date: Thu Jan 01 00:00:00 1970 +0000
1734 | summary: A0
1734 | summary: A0
1735 |
1735 |
1736 o changeset: 0:ea207398892e
1736 o changeset: 0:ea207398892e
1737 user: test
1737 user: test
1738 date: Thu Jan 01 00:00:00 1970 +0000
1738 date: Thu Jan 01 00:00:00 1970 +0000
1739 summary: ROOT
1739 summary: ROOT
1740
1740
1741 Check templates
1741 Check templates
1742 ---------------
1742 ---------------
1743
1743
1744 $ hg up 'desc("A0")' --hidden
1744 $ hg up 'desc("A0")' --hidden
1745 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1745 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1746
1746
1747 # todo: the obsfate output is not ideal
1747 # todo: the obsfate output is not ideal
1748 $ hg fatelog
1748 $ hg fatelog
1749 o 617adc3a144c
1749 o 617adc3a144c
1750 |
1750 |
1751 | @ 471597cad322
1751 | @ 471597cad322
1752 |/ Obsfate: pruned;
1752 |/ Obsfate: pruned;
1753 o ea207398892e
1753 o ea207398892e
1754
1754
1755 $ hg up -r 'desc("A2")' --hidden
1755 $ hg up -r 'desc("A2")' --hidden
1756 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1756 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1757
1757
1758 $ hg fatelog --hidden
1758 $ hg fatelog --hidden
1759 @ 0d0ef4bdf70e
1759 @ 0d0ef4bdf70e
1760 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1760 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
1761 o 617adc3a144c
1761 o 617adc3a144c
1762 |
1762 |
1763 | x 471597cad322
1763 | x 471597cad322
1764 |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000);
1764 |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000);
1765 o ea207398892e
1765 o ea207398892e
1766
1766
General Comments 0
You need to be logged in to leave comments. Login now