Mercurial > evolve

comparison tests/test-evolve-obshistory-amend.t @ 3936:537fd9a86c06 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.4 into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 03 Aug 2018 00:22:50 +0200
parents d00f0c369bc7
children
comparison
equal deleted inserted replaced
3935:9af0e2b0bdd7 3936:537fd9a86c06
23 $ hg amend -m "A1 23 $ hg amend -m "A1
24 > 24 >
25 > Better commit message" 25 > Better commit message"
26 $ sync 26 $ sync
27 $ hg log --hidden -G 27 $ hg log --hidden -G
28 @ changeset: 2:4ae3a4151de9 28 @ changeset: 3:4ae3a4151de9
29 | tag: tip 29 | tag: tip
30 | parent: 0:ea207398892e 30 | parent: 0:ea207398892e
31 | user: test 31 | user: test
32 | date: Thu Jan 01 00:00:00 1970 +0000 32 | date: Thu Jan 01 00:00:00 1970 +0000
33 | summary: A1 33 | summary: A1
34 | 34 |
35 | x changeset: 2:f137d23bb3e1
36 | | user: test
37 | | date: Thu Jan 01 00:00:00 1970 +0000
38 | | obsolete: pruned
39 | | summary: temporary amend commit for 471f378eab4c
40 | |
35 | x changeset: 1:471f378eab4c 41 | x changeset: 1:471f378eab4c
36 |/ user: test 42 |/ user: test
37 | date: Thu Jan 01 00:00:00 1970 +0000 43 | date: Thu Jan 01 00:00:00 1970 +0000
38 | obsolete: rewritten using amend as 2:4ae3a4151de9 44 | obsolete: rewritten as 4ae3a4151de9
39 | summary: A0 45 | summary: A0
40 | 46 |
41 o changeset: 0:ea207398892e 47 o changeset: 0:ea207398892e
42 user: test 48 user: test
43 date: Thu Jan 01 00:00:00 1970 +0000 49 date: Thu Jan 01 00:00:00 1970 +0000
44 summary: ROOT 50 summary: ROOT
45 51
46 Check output on the client side 52 Check output on the client side
47 ------------------------------- 53 -------------------------------
48 $ hg obslog --patch 4ae3a4151de9 54 $ hg obslog --patch 4ae3a4151de9
49 @ 4ae3a4151de9 (2) A1 55 @ 4ae3a4151de9 (3) A1
50 | 56 |
51 x 471f378eab4c (1) A0 57 x 471f378eab4c (1) A0
52 rewritten(description, content) as 4ae3a4151de9 using amend by test (*) (glob) 58 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
53 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description 59 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
54 --- a/changeset-description 60 --- a/changeset-description
55 +++ b/changeset-description 61 +++ b/changeset-description
56 @@ -1,1 +1,3 @@ 62 @@ -1,1 +1,3 @@
57 -A0 63 -A0
66 A0 72 A0
67 +42 73 +42
68 74
69 75
70 $ hg obslog --patch --color debug 76 $ hg obslog --patch --color debug
71 @ [evolve.node|4ae3a4151de9] [evolve.rev|(2)] [evolve.short_description|A1] 77 @ [evolve.node|4ae3a4151de9] [evolve.rev|(3)] [evolve.short_description|A1]
72 | 78 |
73 x [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] 79 x [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
74 [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)] 80 [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
75 [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description] 81 [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description]
76 [diff.file_a|--- a/changeset-description] 82 [diff.file_a|--- a/changeset-description]
77 [diff.file_b|+++ b/changeset-description] 83 [diff.file_b|+++ b/changeset-description]
78 [diff.hunk|@@ -1,1 +1,3 @@] 84 [diff.hunk|@@ -1,1 +1,3 @@]
79 [diff.deleted|-A0] 85 [diff.deleted|-A0]
89 [diff.inserted|+42] 95 [diff.inserted|+42]
90 96
91 97
92 98
93 $ hg obslog --no-graph --patch 4ae3a4151de9 99 $ hg obslog --no-graph --patch 4ae3a4151de9
94 4ae3a4151de9 (2) A1 100 4ae3a4151de9 (3) A1
95 471f378eab4c (1) A0 101 471f378eab4c (1) A0
96 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 102 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
97 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description 103 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
98 --- a/changeset-description 104 --- a/changeset-description
99 +++ b/changeset-description 105 +++ b/changeset-description
100 @@ -1,1 +1,3 @@ 106 @@ -1,1 +1,3 @@
101 -A0 107 -A0
119 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool 125 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
120 [ 126 [
121 { 127 {
122 "markers": [], 128 "markers": [],
123 "node": "4ae3a4151de9", 129 "node": "4ae3a4151de9",
124 "rev": 2, 130 "rev": 3,
125 "shortdescription": "A1" 131 "shortdescription": "A1"
126 }, 132 },
127 { 133 {
128 "markers": [ 134 "markers": [
129 { 135 {
133 ], 139 ],
134 "effect": [ 140 "effect": [
135 "description", 141 "description",
136 "content" 142 "content"
137 ], 143 ],
138 "operation": "amend",
139 "succnodes": [ 144 "succnodes": [
140 "4ae3a4151de9" 145 "4ae3a4151de9"
141 ], 146 ],
142 "user": "test", 147 "user": "test",
143 "verb": "rewritten" 148 "verb": "rewritten"
148 "shortdescription": "A0" 153 "shortdescription": "A0"
149 } 154 }
150 ] 155 ]
151 $ hg obslog --hidden --patch 471f378eab4c 156 $ hg obslog --hidden --patch 471f378eab4c
152 x 471f378eab4c (1) A0 157 x 471f378eab4c (1) A0
153 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 158 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
154 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description 159 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
155 --- a/changeset-description 160 --- a/changeset-description
156 +++ b/changeset-description 161 +++ b/changeset-description
157 @@ -1,1 +1,3 @@ 162 @@ -1,1 +1,3 @@
158 -A0 163 -A0
179 ], 184 ],
180 "effect": [ 185 "effect": [
181 *, (glob) 186 *, (glob)
182 "content" 187 "content"
183 ], 188 ],
184 "operation": "amend",
185 "succnodes": [ 189 "succnodes": [
186 "4ae3a4151de9" 190 "4ae3a4151de9"
187 ], 191 ],
188 "user": "test", 192 "user": "test",
189 "verb": "rewritten" 193 "verb": "rewritten"
208 212
209 $ hg obslog -R $TESTTMP/server --patch 4ae3a4151de9 213 $ hg obslog -R $TESTTMP/server --patch 4ae3a4151de9
210 o 4ae3a4151de9 (1) A1 214 o 4ae3a4151de9 (1) A1
211 | 215 |
212 x 471f378eab4c 216 x 471f378eab4c
213 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 217 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
214 (No patch available, context is not local) 218 (No patch available, context is not local)
215 219
216 $ hg obslog -R $TESTTMP/server -f --patch 4ae3a4151de9 220 $ hg obslog -R $TESTTMP/server -f --patch 4ae3a4151de9
217 o 4ae3a4151de9 (1) A1 221 o 4ae3a4151de9 (1) A1
218 222
219 $ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9 223 $ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9
220 4ae3a4151de9 (1) A1 224 4ae3a4151de9 (1) A1
221 471f378eab4c 225 471f378eab4c
222 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 226 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
223 (No patch available, context is not local) 227 (No patch available, context is not local)
224 228
225 $ hg obslog -R $TESTTMP/server --no-graph -f --patch 4ae3a4151de9 229 $ hg obslog -R $TESTTMP/server --no-graph -f --patch 4ae3a4151de9
226 4ae3a4151de9 (1) A1 230 4ae3a4151de9 (1) A1
227 471f378eab4c 231 471f378eab4c
228 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 232 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
229 (No patch available, context is not local) 233 (No patch available, context is not local)
230 234
231 Amend two more times 235 Amend two more times
232 ==================== 236 ====================
233 237
234 Amend again 238 Amend again
235 ----------- 239 -----------
236 $ hg log --hidden -G 240 $ hg log --hidden -G
237 o changeset: 2:4ae3a4151de9 241 o changeset: 3:4ae3a4151de9
238 | tag: tip 242 | tag: tip
239 | parent: 0:ea207398892e 243 | parent: 0:ea207398892e
240 | user: test 244 | user: test
241 | date: Thu Jan 01 00:00:00 1970 +0000 245 | date: Thu Jan 01 00:00:00 1970 +0000
242 | summary: A1 246 | summary: A1
243 | 247 |
248 | x changeset: 2:f137d23bb3e1
249 | | user: test
250 | | date: Thu Jan 01 00:00:00 1970 +0000
251 | | obsolete: pruned
252 | | summary: temporary amend commit for 471f378eab4c
253 | |
244 | @ changeset: 1:471f378eab4c 254 | @ changeset: 1:471f378eab4c
245 |/ user: test 255 |/ user: test
246 | date: Thu Jan 01 00:00:00 1970 +0000 256 | date: Thu Jan 01 00:00:00 1970 +0000
247 | obsolete: rewritten using amend as 2:4ae3a4151de9 257 | obsolete: rewritten as 4ae3a4151de9
248 | summary: A0 258 | summary: A0
249 | 259 |
250 o changeset: 0:ea207398892e 260 o changeset: 0:ea207398892e
251 user: test 261 user: test
252 date: Thu Jan 01 00:00:00 1970 +0000 262 date: Thu Jan 01 00:00:00 1970 +0000
260 $ hg amend -m "A3 270 $ hg amend -m "A3
261 > 271 >
262 > Better better better commit message" 272 > Better better better commit message"
263 $ sync 273 $ sync
264 $ hg log --hidden -G 274 $ hg log --hidden -G
265 @ changeset: 4:92210308515b 275 @ changeset: 5:92210308515b
266 | tag: tip 276 | tag: tip
267 | parent: 0:ea207398892e 277 | parent: 0:ea207398892e
268 | user: test 278 | user: test
269 | date: Thu Jan 01 00:00:00 1970 +0000 279 | date: Thu Jan 01 00:00:00 1970 +0000
270 | summary: A3 280 | summary: A3
271 | 281 |
272 | x changeset: 3:4f1685185907 282 | x changeset: 4:4f1685185907
273 |/ parent: 0:ea207398892e 283 |/ parent: 0:ea207398892e
274 | user: test 284 | user: test
275 | date: Thu Jan 01 00:00:00 1970 +0000 285 | date: Thu Jan 01 00:00:00 1970 +0000
276 | obsolete: reworded using amend as 4:92210308515b 286 | obsolete: reworded as 92210308515b
277 | summary: A2 287 | summary: A2
278 | 288 |
279 | x changeset: 2:4ae3a4151de9 289 | x changeset: 3:4ae3a4151de9
280 |/ parent: 0:ea207398892e 290 |/ parent: 0:ea207398892e
281 | user: test 291 | user: test
282 | date: Thu Jan 01 00:00:00 1970 +0000 292 | date: Thu Jan 01 00:00:00 1970 +0000
283 | obsolete: reworded using amend as 3:4f1685185907 293 | obsolete: reworded as 4f1685185907
284 | summary: A1 294 | summary: A1
285 | 295 |
296 | x changeset: 2:f137d23bb3e1
297 | | user: test
298 | | date: Thu Jan 01 00:00:00 1970 +0000
299 | | obsolete: pruned
300 | | summary: temporary amend commit for 471f378eab4c
301 | |
286 | x changeset: 1:471f378eab4c 302 | x changeset: 1:471f378eab4c
287 |/ user: test 303 |/ user: test
288 | date: Thu Jan 01 00:00:00 1970 +0000 304 | date: Thu Jan 01 00:00:00 1970 +0000
289 | obsolete: rewritten using amend as 2:4ae3a4151de9 305 | obsolete: rewritten as 4ae3a4151de9
290 | summary: A0 306 | summary: A0
291 | 307 |
292 o changeset: 0:ea207398892e 308 o changeset: 0:ea207398892e
293 user: test 309 user: test
294 date: Thu Jan 01 00:00:00 1970 +0000 310 date: Thu Jan 01 00:00:00 1970 +0000
296 312
297 Check the output on the client 313 Check the output on the client
298 ------------------------------ 314 ------------------------------
299 315
300 $ hg obslog --patch 92210308515b 316 $ hg obslog --patch 92210308515b
301 @ 92210308515b (4) A3 317 @ 92210308515b (5) A3
302 | 318 |
303 x 4f1685185907 (3) A2 319 x 4f1685185907 (4) A2
304 | rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000) 320 | rewritten(description) as 92210308515b by test (Thu Jan 01 00:00:00 1970 +0000)
305 | diff -r 4f1685185907 -r 92210308515b changeset-description 321 | diff -r 4f1685185907 -r 92210308515b changeset-description
306 | --- a/changeset-description 322 | --- a/changeset-description
307 | +++ b/changeset-description 323 | +++ b/changeset-description
308 | @@ -1,3 +1,3 @@ 324 | @@ -1,3 +1,3 @@
309 | -A2 325 | -A2
311 | 327 |
312 | -Better better commit message 328 | -Better better commit message
313 | +Better better better commit message 329 | +Better better better commit message
314 | 330 |
315 | 331 |
316 x 4ae3a4151de9 (2) A1 332 x 4ae3a4151de9 (3) A1
317 | rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 333 | rewritten(description) as 4f1685185907 by test (Thu Jan 01 00:00:00 1970 +0000)
318 | diff -r 4ae3a4151de9 -r 4f1685185907 changeset-description 334 | diff -r 4ae3a4151de9 -r 4f1685185907 changeset-description
319 | --- a/changeset-description 335 | --- a/changeset-description
320 | +++ b/changeset-description 336 | +++ b/changeset-description
321 | @@ -1,3 +1,3 @@ 337 | @@ -1,3 +1,3 @@
322 | -A1 338 | -A1
325 | -Better commit message 341 | -Better commit message
326 | +Better better commit message 342 | +Better better commit message
327 | 343 |
328 | 344 |
329 x 471f378eab4c (1) A0 345 x 471f378eab4c (1) A0
330 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 346 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
331 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description 347 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
332 --- a/changeset-description 348 --- a/changeset-description
333 +++ b/changeset-description 349 +++ b/changeset-description
334 @@ -1,1 +1,3 @@ 350 @@ -1,1 +1,3 @@
335 -A0 351 -A0
350 366
351 $ hg obslog -R $TESTTMP/server --patch 92210308515b 367 $ hg obslog -R $TESTTMP/server --patch 92210308515b
352 o 92210308515b (2) A3 368 o 92210308515b (2) A3
353 | 369 |
354 x 4f1685185907 370 x 4f1685185907
355 | rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000) 371 | rewritten(description) as 92210308515b by test (Thu Jan 01 00:00:00 1970 +0000)
356 | (No patch available, context is not local) 372 | (No patch available, context is not local)
357 | 373 |
358 x 4ae3a4151de9 (1) A1 374 x 4ae3a4151de9 (1) A1
359 | rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 375 | rewritten(description) as 4f1685185907 by test (Thu Jan 01 00:00:00 1970 +0000)
360 | (No patch available, successor is unknown locally) 376 | (No patch available, successor is unknown locally)
361 | 377 |
362 x 471f378eab4c 378 x 471f378eab4c
363 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 379 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
364 (No patch available, context is not local) 380 (No patch available, context is not local)
365 381
366 $ hg obslog -R $TESTTMP/server -f --patch 92210308515b 382 $ hg obslog -R $TESTTMP/server -f --patch 92210308515b
367 o 92210308515b (2) A3 383 o 92210308515b (2) A3
368 | 384 |
369 x 4ae3a4151de9 (1) A1 385 x 4ae3a4151de9 (1) A1
370 reworded(description) as 92210308515b using amend by test (at Thu Jan 01 00:00:00 1970 +0000)
371 diff -r 4ae3a4151de9 -r 92210308515b changeset-description
372 --- a/changeset-description
373 +++ b/changeset-description
374 @@ -1,3 +1,3 @@
375 -A1
376 +A3
377
378 -Better commit message
379 +Better better better commit message
380
381 386
382 $ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b 387 $ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b
383 92210308515b (2) A3 388 92210308515b (2) A3
384 4f1685185907 389 4f1685185907
385 rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000) 390 rewritten(description) as 92210308515b by test (Thu Jan 01 00:00:00 1970 +0000)
386 (No patch available, context is not local) 391 (No patch available, context is not local)
387 4ae3a4151de9 (1) A1 392 4ae3a4151de9 (1) A1
388 rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 393 rewritten(description) as 4f1685185907 by test (Thu Jan 01 00:00:00 1970 +0000)
389 (No patch available, successor is unknown locally) 394 (No patch available, successor is unknown locally)
390 471f378eab4c 395 471f378eab4c
391 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 396 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
392 (No patch available, context is not local) 397 (No patch available, context is not local)
393 398
394 $ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b 399 $ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b
395 92210308515b (2) A3 400 92210308515b (2) A3
396 4f1685185907 401 4f1685185907
397 rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000) 402 rewritten(description) as 92210308515b by test (Thu Jan 01 00:00:00 1970 +0000)
398 (No patch available, context is not local) 403 (No patch available, context is not local)
399 4ae3a4151de9 (1) A1 404 4ae3a4151de9 (1) A1
400 rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 405 rewritten(description) as 4f1685185907 by test (Thu Jan 01 00:00:00 1970 +0000)
401 (No patch available, successor is unknown locally) 406 (No patch available, successor is unknown locally)
402 471f378eab4c 407 471f378eab4c
403 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 408 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
404 (No patch available, context is not local) 409 (No patch available, context is not local)