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