##// END OF EJS Templates
tests: defines aliases for `hg log` calls in test-copytrace-heuristics.t...
Martin von Zweigbergk -
r42358:1afd9d1e default
parent child Browse files
Show More
@@ -16,6 +16,9 b' Test for the heuristic copytracing algor'
16 > [extensions]
16 > [extensions]
17 > rebase=
17 > rebase=
18 > shelve=
18 > shelve=
19 > [alias]
20 > l = log -G -T 'changeset: {node}\n desc: {desc}\n'
21 > pl = log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
19 > EOF
22 > EOF
20
23
21 NOTE: calling initclient() set copytrace.sourcecommitlimit=-1 as we want to
24 NOTE: calling initclient() set copytrace.sourcecommitlimit=-1 as we want to
@@ -43,7 +46,7 b' Check filename heuristics (same dirname '
43 $ echo b > dir/file.txt
46 $ echo b > dir/file.txt
44 $ hg ci -qm 'mod a, mod dir/file.txt'
47 $ hg ci -qm 'mod a, mod dir/file.txt'
45
48
46 $ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
49 $ hg l
47 @ changeset: 557f403c0afd2a3cf15d7e2fb1f1001a8b85e081
50 @ changeset: 557f403c0afd2a3cf15d7e2fb1f1001a8b85e081
48 | desc: mod a, mod dir/file.txt
51 | desc: mod a, mod dir/file.txt
49 | o changeset: 928d74bc9110681920854d845c06959f6dfc9547
52 | o changeset: 928d74bc9110681920854d845c06959f6dfc9547
@@ -76,7 +79,7 b' Make sure filename heuristics do not whe'
76 $ printf 'somecontent\nmoarcontent' > a
79 $ printf 'somecontent\nmoarcontent' > a
77 $ hg ci -qm 'mode a'
80 $ hg ci -qm 'mode a'
78
81
79 $ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
82 $ hg l
80 @ changeset: d526312210b9e8f795d576a77dc643796384d86e
83 @ changeset: d526312210b9e8f795d576a77dc643796384d86e
81 | desc: mode a
84 | desc: mode a
82 | o changeset: 46985f76c7e5e5123433527f5c8526806145650b
85 | o changeset: 46985f76c7e5e5123433527f5c8526806145650b
@@ -113,7 +116,7 b" Test when lca didn't modified the file t"
113 $ echo b > a
116 $ echo b > a
114 $ hg ci -qm 'mod a'
117 $ hg ci -qm 'mod a'
115
118
116 $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
119 $ hg pl
117 @ changeset: 9d5cf99c3d9f8e8b05ba55421f7f56530cfcf3bc
120 @ changeset: 9d5cf99c3d9f8e8b05ba55421f7f56530cfcf3bc
118 | desc: mod a, phase: draft
121 | desc: mod a, phase: draft
119 | o changeset: d760186dd240fc47b91eb9f0b58b0002aaeef95d
122 | o changeset: d760186dd240fc47b91eb9f0b58b0002aaeef95d
@@ -148,7 +151,7 b' Rebase "backwards"'
148 $ echo b > b
151 $ echo b > b
149 $ hg ci -qm 'mod b'
152 $ hg ci -qm 'mod b'
150
153
151 $ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
154 $ hg l
152 @ changeset: fbe97126b3969056795c462a67d93faf13e4d298
155 @ changeset: fbe97126b3969056795c462a67d93faf13e4d298
153 | desc: mod b
156 | desc: mod b
154 o changeset: d760186dd240fc47b91eb9f0b58b0002aaeef95d
157 o changeset: d760186dd240fc47b91eb9f0b58b0002aaeef95d
@@ -185,7 +188,7 b' Check a few potential move candidates'
185 $ echo b > dir/a
188 $ echo b > dir/a
186 $ hg ci -qm 'mod dir/a'
189 $ hg ci -qm 'mod dir/a'
187
190
188 $ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
191 $ hg l
189 @ changeset: 6b2f4cece40fd320f41229f23821256ffc08efea
192 @ changeset: 6b2f4cece40fd320f41229f23821256ffc08efea
190 | desc: mod dir/a
193 | desc: mod dir/a
191 | o changeset: 4494bf7efd2e0dfdd388e767fb913a8a3731e3fa
194 | o changeset: 4494bf7efd2e0dfdd388e767fb913a8a3731e3fa
@@ -230,7 +233,7 b' Test the copytrace.movecandidateslimit w'
230 $ hg ci -m 'mod a'
233 $ hg ci -m 'mod a'
231 created new head
234 created new head
232
235
233 $ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
236 $ hg l
234 @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e
237 @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e
235 | desc: mod a
238 | desc: mod a
236 | o changeset: 8329d5c6bf479ec5ca59b9864f3f45d07213f5a4
239 | o changeset: 8329d5c6bf479ec5ca59b9864f3f45d07213f5a4
@@ -278,7 +281,7 b' Move file in one branch and delete it in'
278 $ hg ci -m 'del a'
281 $ hg ci -m 'del a'
279 created new head
282 created new head
280
283
281 $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
284 $ hg pl
282 @ changeset: 7d61ee3b1e48577891a072024968428ba465c47b
285 @ changeset: 7d61ee3b1e48577891a072024968428ba465c47b
283 | desc: del a, phase: draft
286 | desc: del a, phase: draft
284 | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22
287 | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22
@@ -311,7 +314,7 b' Move a directory in draft branch'
311 $ hg mv -q dir/ dir2
314 $ hg mv -q dir/ dir2
312 $ hg ci -qm 'mv dir/ dir2/'
315 $ hg ci -qm 'mv dir/ dir2/'
313
316
314 $ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
317 $ hg l
315 @ changeset: a33d80b6e352591dfd82784e1ad6cdd86b25a239
318 @ changeset: a33d80b6e352591dfd82784e1ad6cdd86b25a239
316 | desc: mv dir/ dir2/
319 | desc: mv dir/ dir2/
317 | o changeset: 6b2f4cece40fd320f41229f23821256ffc08efea
320 | o changeset: 6b2f4cece40fd320f41229f23821256ffc08efea
@@ -345,7 +348,7 b' Move file twice and rebase mod on top of'
345 $ hg ci -m 'mod a'
348 $ hg ci -m 'mod a'
346 created new head
349 created new head
347
350
348 $ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
351 $ hg l
349 @ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3
352 @ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3
350 | desc: mod a
353 | desc: mod a
351 | o changeset: d3efd280421d24f9f229997c19e654761c942a71
354 | o changeset: d3efd280421d24f9f229997c19e654761c942a71
@@ -379,7 +382,7 b' Move file twice and rebase moves on top '
379 $ echo c > a
382 $ echo c > a
380 $ hg ci -m 'mod a'
383 $ hg ci -m 'mod a'
381 created new head
384 created new head
382 $ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
385 $ hg l
383 @ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3
386 @ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3
384 | desc: mod a
387 | desc: mod a
385 | o changeset: d3efd280421d24f9f229997c19e654761c942a71
388 | o changeset: d3efd280421d24f9f229997c19e654761c942a71
@@ -417,7 +420,7 b' Move one file and add another file in th'
417 $ hg ci -m 'mod a'
420 $ hg ci -m 'mod a'
418 created new head
421 created new head
419
422
420 $ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
423 $ hg l
421 @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e
424 @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e
422 | desc: mod a
425 | desc: mod a
423 | o changeset: b1a6187e79fbce851bb584eadcb0cc4a80290fd9
426 | o changeset: b1a6187e79fbce851bb584eadcb0cc4a80290fd9
@@ -455,7 +458,7 b' Merge test'
455 created new head
458 created new head
456 $ hg up -q 2
459 $ hg up -q 2
457
460
458 $ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
461 $ hg l
459 @ changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22
462 @ changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22
460 | desc: mv a b
463 | desc: mv a b
461 | o changeset: b0357b07f79129a3d08a68621271ca1352ae8a09
464 | o changeset: b0357b07f79129a3d08a68621271ca1352ae8a09
@@ -490,7 +493,7 b' Copy and move file'
490 $ hg ci -m 'mod a'
493 $ hg ci -m 'mod a'
491 created new head
494 created new head
492
495
493 $ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
496 $ hg l
494 @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e
497 @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e
495 | desc: mod a
498 | desc: mod a
496 | o changeset: 4fc3fd13fbdb89ada6b75bfcef3911a689a0dde8
499 | o changeset: 4fc3fd13fbdb89ada6b75bfcef3911a689a0dde8
@@ -530,7 +533,7 b' Do a merge commit with many consequent m'
530 $ hg mv b c
533 $ hg mv b c
531 $ hg ci -qm 'mv b c'
534 $ hg ci -qm 'mv b c'
532 $ hg up -q 1
535 $ hg up -q 1
533 $ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
536 $ hg l
534 o changeset: d3efd280421d24f9f229997c19e654761c942a71
537 o changeset: d3efd280421d24f9f229997c19e654761c942a71
535 | desc: mv b c
538 | desc: mv b c
536 o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22
539 o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22
@@ -545,7 +548,7 b' Do a merge commit with many consequent m'
545 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
548 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
546 (branch merge, don't forget to commit)
549 (branch merge, don't forget to commit)
547 $ hg ci -qm 'merge'
550 $ hg ci -qm 'merge'
548 $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
551 $ hg pl
549 @ changeset: cd29b0d08c0f39bfed4cde1b40e30f419db0c825
552 @ changeset: cd29b0d08c0f39bfed4cde1b40e30f419db0c825
550 |\ desc: merge, phase: draft
553 |\ desc: merge, phase: draft
551 | o changeset: d3efd280421d24f9f229997c19e654761c942a71
554 | o changeset: d3efd280421d24f9f229997c19e654761c942a71
@@ -577,7 +580,7 b' Test shelve/unshelve'
577 $ hg mv a b
580 $ hg mv a b
578 $ hg ci -m 'mv a b'
581 $ hg ci -m 'mv a b'
579
582
580 $ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
583 $ hg l
581 @ changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22
584 @ changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22
582 | desc: mv a b
585 | desc: mv a b
583 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
586 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
@@ -614,13 +617,13 b' File directory and base name changed in '
614 $ cd ..
617 $ cd ..
615 $ hg ci -qm 'mod a'
618 $ hg ci -qm 'mod a'
616
619
617 $ hg log -G -T 'changeset {node}\n desc {desc}, phase: {phase}\n'
620 $ hg pl
618 @ changeset 6207d2d318e710b882e3d5ada2a89770efc42c96
621 @ changeset: 6207d2d318e710b882e3d5ada2a89770efc42c96
619 | desc mod a, phase: draft
622 | desc: mod a, phase: draft
620 | o changeset abffdd4e3dfc04bc375034b970299b2a309a1cce
623 | o changeset: abffdd4e3dfc04bc375034b970299b2a309a1cce
621 |/ desc mv a b; mv dir1 dir2, phase: draft
624 |/ desc: mv a b; mv dir1 dir2, phase: draft
622 o changeset 81973cd24b58db2fdf18ce3d64fb2cc3284e9ab3
625 o changeset: 81973cd24b58db2fdf18ce3d64fb2cc3284e9ab3
623 desc initial, phase: draft
626 desc: initial, phase: draft
624
627
625 $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100
628 $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100
626 rebasing 2:6207d2d318e7 "mod a" (tip)
629 rebasing 2:6207d2d318e7 "mod a" (tip)
@@ -652,13 +655,13 b' in other merge parent. File moved on reb'
652 $ hg mv -q dir1 dir2
655 $ hg mv -q dir1 dir2
653 $ hg ci -qm 'mv dir1 dir2'
656 $ hg ci -qm 'mv dir1 dir2'
654
657
655 $ hg log -G -T 'changeset {node}\n desc {desc}, phase: {phase}\n'
658 $ hg pl
656 @ changeset e8919e7df8d036e07b906045eddcd4a42ff1915f
659 @ changeset: e8919e7df8d036e07b906045eddcd4a42ff1915f
657 | desc mv dir1 dir2, phase: draft
660 | desc: mv dir1 dir2, phase: draft
658 | o changeset 7c7c6f339be00f849c3cb2df738ca91db78b32c8
661 | o changeset: 7c7c6f339be00f849c3cb2df738ca91db78b32c8
659 |/ desc hg add dir1/a, phase: draft
662 |/ desc: hg add dir1/a, phase: draft
660 o changeset a235dcce55dcf42034c4e374cb200662d0bb4a13
663 o changeset: a235dcce55dcf42034c4e374cb200662d0bb4a13
661 desc initial, phase: draft
664 desc: initial, phase: draft
662
665
663 $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100
666 $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100
664 rebasing 2:e8919e7df8d0 "mv dir1 dir2" (tip)
667 rebasing 2:e8919e7df8d0 "mv dir1 dir2" (tip)
@@ -685,15 +688,15 b' Testing the sourcecommitlimit config'
685 $ mkdir foo
688 $ mkdir foo
686 $ hg mv a foo/bar
689 $ hg mv a foo/bar
687 $ hg ci -m "Moved a to foo/bar"
690 $ hg ci -m "Moved a to foo/bar"
688 $ hg log -G -T 'changeset {node}\n desc {desc}, phase: {phase}\n'
691 $ hg pl
689 @ changeset b4b0f7880e500b5c364a5f07b4a2b167de7a6fb0
692 @ changeset: b4b0f7880e500b5c364a5f07b4a2b167de7a6fb0
690 | desc Moved a to foo/bar, phase: draft
693 | desc: Moved a to foo/bar, phase: draft
691 o changeset 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d
694 o changeset: 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d
692 | desc added b, phase: draft
695 | desc: added b, phase: draft
693 | o changeset 8b6e13696c38e8445a759516474640c2f8dddef6
696 | o changeset: 8b6e13696c38e8445a759516474640c2f8dddef6
694 |/ desc added more things to a, phase: draft
697 |/ desc: added more things to a, phase: draft
695 o changeset 9092f1db7931481f93b37d5c9fbcfc341bcd7318
698 o changeset: 9092f1db7931481f93b37d5c9fbcfc341bcd7318
696 desc added a, phase: draft
699 desc: added a, phase: draft
697
700
698 When the sourcecommitlimit is small and we have more drafts, we use heuristics only
701 When the sourcecommitlimit is small and we have more drafts, we use heuristics only
699
702
General Comments 0
You need to be logged in to leave comments. Login now