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