Mercurial > evolve

comparison tests/test-evolve-obshistory-content-divergent.t @ 5301:e8660b28bfee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obslog: makes --origin flag the default Test change have been carefully validated.
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 07 May 2020 01:29:48 +0200
parents 258c0a99c5b0
children 88f9bbba392d 6ea05c9744de
comparison
equal deleted inserted replaced
5300:a9f9edb168a1 5301:e8660b28bfee
77 77
78 Actual test 78 Actual test
79 ----------- 79 -----------
80 80
81 Check that obslog on the divergent revision shows both destinations 81 Check that obslog on the divergent revision shows both destinations
82 $ hg obslog --hidden 471f378eab4c --patch 82 $ hg obslog --hidden 471f378eab4c --patch --no-origin
83 x 471f378eab4c (1) A0 83 x 471f378eab4c (1) A0
84 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 84 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
85 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 85 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
86 --- a/changeset-description 86 --- a/changeset-description
87 +++ b/changeset-description 87 +++ b/changeset-description
100 100
101 101
102 Check that with all option, every changeset is shown 102 Check that with all option, every changeset is shown
103 $ hg obslog --hidden --all 471f378eab4c --patch 103 $ hg obslog --hidden --all 471f378eab4c --patch
104 @ 65b757b745b9 (3) A2 104 @ 65b757b745b9 (3) A2
105 | reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
106 | diff -r 471f378eab4c -r 65b757b745b9 changeset-description
107 | --- a/changeset-description
108 | +++ b/changeset-description
109 | @@ -1,1 +1,1 @@
110 | -A0
111 | +A2
112 |
105 | 113 |
106 | * fdf9bde5129a (2) A1 114 | * fdf9bde5129a (2) A1
107 |/ 115 |/ reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
108 x 471f378eab4c (1) A0 116 | diff -r 471f378eab4c -r fdf9bde5129a changeset-description
109 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 117 | --- a/changeset-description
110 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 118 | +++ b/changeset-description
111 --- a/changeset-description 119 | @@ -1,1 +1,1 @@
112 +++ b/changeset-description 120 | -A0
113 @@ -1,1 +1,1 @@ 121 | +A1
114 -A0 122 |
115 +A2 123 |
116 124 x 471f378eab4c (1) A0
117 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 125
118 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 126 $ hg obslog --hidden 471f378eab4c --no-graph --no-origin -Tjson | python -m json.tool
119 --- a/changeset-description
120 +++ b/changeset-description
121 @@ -1,1 +1,1 @@
122 -A0
123 +A1
124
125
126 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool
127 [ 127 [
128 { 128 {
129 "markers": [ 129 "markers": [
130 { 130 {
131 "dates": [ 131 "dates": [
172 ], 172 ],
173 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", 173 "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
174 "shortdescription": "A0" 174 "shortdescription": "A0"
175 } 175 }
176 ] 176 ]
177 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool
178 [
179 {
180 "markers": [],
181 "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
182 "shortdescription": "A0"
183 }
184 ]
177 Check that obslog on the first diverged revision shows the revision and the 185 Check that obslog on the first diverged revision shows the revision and the
178 divergent one 186 divergent one
179 $ hg obslog fdf9bde5129a --patch 187 $ hg obslog fdf9bde5129a --patch --no-origin
180 * fdf9bde5129a (2) A1 188 * fdf9bde5129a (2) A1
181 | 189 |
182 x 471f378eab4c (1) A0 190 x 471f378eab4c (1) A0
183 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 191 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
184 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 192 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
199 207
200 208
201 Check that all option shows all of them 209 Check that all option shows all of them
202 $ hg obslog fdf9bde5129a -a --patch 210 $ hg obslog fdf9bde5129a -a --patch
203 @ 65b757b745b9 (3) A2 211 @ 65b757b745b9 (3) A2
212 | reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
213 | diff -r 471f378eab4c -r 65b757b745b9 changeset-description
214 | --- a/changeset-description
215 | +++ b/changeset-description
216 | @@ -1,1 +1,1 @@
217 | -A0
218 | +A2
219 |
204 | 220 |
205 | * fdf9bde5129a (2) A1 221 | * fdf9bde5129a (2) A1
206 |/ 222 |/ reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
207 x 471f378eab4c (1) A0 223 | diff -r 471f378eab4c -r fdf9bde5129a changeset-description
208 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 224 | --- a/changeset-description
209 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 225 | +++ b/changeset-description
210 --- a/changeset-description 226 | @@ -1,1 +1,1 @@
211 +++ b/changeset-description 227 | -A0
212 @@ -1,1 +1,1 @@ 228 | +A1
213 -A0 229 |
214 +A2 230 |
215 231 x 471f378eab4c (1) A0
216 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
217 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
218 --- a/changeset-description
219 +++ b/changeset-description
220 @@ -1,1 +1,1 @@
221 -A0
222 +A1
223
224 232
225 Check that obslog on the second diverged revision shows the revision and the 233 Check that obslog on the second diverged revision shows the revision and the
226 divergent one 234 divergent one
227 $ hg obslog 65b757b745b9 --patch 235 $ hg obslog 65b757b745b9 --patch --no-origin
228 @ 65b757b745b9 (3) A2 236 @ 65b757b745b9 (3) A2
229 | 237 |
230 x 471f378eab4c (1) A0 238 x 471f378eab4c (1) A0
231 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 239 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
232 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 240 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
246 254
247 255
248 Check that all option shows all of them 256 Check that all option shows all of them
249 $ hg obslog 65b757b745b9 -a --patch 257 $ hg obslog 65b757b745b9 -a --patch
250 @ 65b757b745b9 (3) A2 258 @ 65b757b745b9 (3) A2
259 | reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
260 | diff -r 471f378eab4c -r 65b757b745b9 changeset-description
261 | --- a/changeset-description
262 | +++ b/changeset-description
263 | @@ -1,1 +1,1 @@
264 | -A0
265 | +A2
266 |
251 | 267 |
252 | * fdf9bde5129a (2) A1 268 | * fdf9bde5129a (2) A1
253 |/ 269 |/ reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
254 x 471f378eab4c (1) A0 270 | diff -r 471f378eab4c -r fdf9bde5129a changeset-description
255 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 271 | --- a/changeset-description
256 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 272 | +++ b/changeset-description
257 --- a/changeset-description 273 | @@ -1,1 +1,1 @@
258 +++ b/changeset-description 274 | -A0
259 @@ -1,1 +1,1 @@ 275 | +A1
260 -A0 276 |
261 +A2 277 |
262 278 x 471f378eab4c (1) A0
263 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
264 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
265 --- a/changeset-description
266 +++ b/changeset-description
267 @@ -1,1 +1,1 @@
268 -A0
269 +A1
270
271 279
272 Check that obslog on the both diverged revision shows a coherent graph 280 Check that obslog on the both diverged revision shows a coherent graph
273 $ hg obslog '65b757b745b9+fdf9bde5129a' --patch 281 $ hg obslog '65b757b745b9+fdf9bde5129a' --patch
274 @ 65b757b745b9 (3) A2 282 @ 65b757b745b9 (3) A2
283 | reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
284 | diff -r 471f378eab4c -r 65b757b745b9 changeset-description
285 | --- a/changeset-description
286 | +++ b/changeset-description
287 | @@ -1,1 +1,1 @@
288 | -A0
289 | +A2
290 |
275 | 291 |
276 | * fdf9bde5129a (2) A1 292 | * fdf9bde5129a (2) A1
277 |/ 293 |/ reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
278 x 471f378eab4c (1) A0 294 | diff -r 471f378eab4c -r fdf9bde5129a changeset-description
279 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 295 | --- a/changeset-description
280 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 296 | +++ b/changeset-description
281 --- a/changeset-description 297 | @@ -1,1 +1,1 @@
282 +++ b/changeset-description 298 | -A0
283 @@ -1,1 +1,1 @@ 299 | +A1
284 -A0 300 |
285 +A2 301 |
286 302 x 471f378eab4c (1) A0
287 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 303
288 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 304 $ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph --no-origin -Tjson | python -m json.tool
289 --- a/changeset-description
290 +++ b/changeset-description
291 @@ -1,1 +1,1 @@
292 -A0
293 +A1
294
295
296 $ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool
297 [ 305 [
298 { 306 {
299 "markers": [], 307 "markers": [],
300 "node": "65b757b745b935093c87a2bccd877521cccffcbd", 308 "node": "65b757b745b935093c87a2bccd877521cccffcbd",
301 "shortdescription": "A2" 309 "shortdescription": "A2"
348 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", 356 "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
349 "shortdescription": "A0" 357 "shortdescription": "A0"
350 }, 358 },
351 { 359 {
352 "markers": [], 360 "markers": [],
361 "node": "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e",
362 "shortdescription": "A1"
363 }
364 ]
365 $ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool
366 [
367 {
368 "markers": [
369 {
370 "dates": [
371 [
372 0.0,
373 0
374 ]
375 ],
376 "effects": [
377 "description"
378 ],
379 "operations": [
380 "amend"
381 ],
382 "prednodes": [
383 "471f378eab4c5e25f6c77f785b27c936efb22874"
384 ],
385 "users": [
386 "test"
387 ],
388 "verb": "reworded"
389 }
390 ],
391 "node": "65b757b745b935093c87a2bccd877521cccffcbd",
392 "shortdescription": "A2"
393 },
394 {
395 "markers": [],
396 "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
397 "shortdescription": "A0"
398 },
399 {
400 "markers": [
401 {
402 "dates": [
403 [
404 *, (glob)
405 0
406 ]
407 ],
408 "effects": [
409 "description"
410 ],
411 "operations": [
412 "amend"
413 ],
414 "prednodes": [
415 "471f378eab4c5e25f6c77f785b27c936efb22874"
416 ],
417 "users": [
418 "test"
419 ],
420 "verb": "reworded"
421 }
422 ],
353 "node": "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", 423 "node": "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e",
354 "shortdescription": "A1" 424 "shortdescription": "A1"
355 } 425 }
356 ] 426 ]
357 $ hg update 471f378eab4c 427 $ hg update 471f378eab4c