Test for the heuristic copytracing algorithm

============================================

  $ cat >> $TESTTMP/copytrace.sh << '__EOF__'

  > initclient() {

  > cat >> $1/.hg/hgrc <<EOF

  > [experimental]

  > copytrace = heuristics

  > copytrace.sourcecommitlimit = -1

  > EOF

  > }

  > __EOF__

  $ . "$TESTTMP/copytrace.sh"

  $ cat >> $HGRCPATH << EOF

  > [extensions]

  > rebase=

  > [alias]

  > l = log -G -T 'rev: {rev}\ndesc: {desc}\n'

  > pl = log -G -T 'rev: {rev}, phase: {phase}\ndesc: {desc}\n'

  > EOF

NOTE: calling initclient() set copytrace.sourcecommitlimit=-1 as we want to

prevent the full copytrace algorithm to run and test the heuristic algorithm

without complexing the test cases with public and draft commits.

Check filename heuristics (same dirname and same basename)

----------------------------------------------------------

  $ hg init repo

  $ initclient repo

  $ cd repo

  $ echo a > a

  $ mkdir dir

  $ echo a > dir/file.txt

  $ hg addremove

  adding a

  adding dir/file.txt

  $ hg ci -m initial

  $ hg mv a b

  $ hg mv -q dir dir2

  $ hg ci -m 'mv a b, mv dir/ dir2/'

  $ hg up -q 0

  $ echo b > a

  $ echo b > dir/file.txt

  $ hg ci -qm 'mod a, mod dir/file.txt'

  $ hg l

  @  rev: 2

  |  desc: mod a, mod dir/file.txt

  | o  rev: 1

  |/   desc: mv a b, mv dir/ dir2/

  o  rev: 0

     desc: initial

  $ hg rebase -s . -d 1

  rebasing 2:557f403c0afd "mod a, mod dir/file.txt" (tip)

  merging b and a to b

  merging dir2/file.txt and dir/file.txt to dir2/file.txt

  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/557f403c0afd-9926eeff-rebase.hg

  $ cd ..

  $ rm -rf repo

Make sure filename heuristics do not when they are not related

--------------------------------------------------------------

  $ hg init repo

  $ initclient repo

  $ cd repo

  $ echo 'somecontent' > a

  $ hg add a

  $ hg ci -m initial

  $ hg rm a

  $ echo 'completelydifferentcontext' > b

  $ hg add b

  $ hg ci -m 'rm a, add b'

  $ hg up -q 0

  $ printf 'somecontent\nmoarcontent' > a

  $ hg ci -qm 'mode a'

  $ hg l

  @  rev: 2

  |  desc: mode a

  | o  rev: 1

  |/   desc: rm a, add b

  o  rev: 0

     desc: initial

  $ hg rebase -s . -d 1

  rebasing 2:d526312210b9 "mode a" (tip)

  file 'a' was deleted in local [dest] but was modified in other [source].

  unresolved conflicts (see hg resolve, then hg rebase --continue)

  [1]

  $ cd ..

  $ rm -rf repo

Test when lca didn't modified the file that was moved

-----------------------------------------------------

  $ hg init repo

  $ initclient repo

  $ cd repo

  $ echo 'somecontent' > a

  $ hg add a

  $ hg ci -m initial

  $ echo c > c

  $ hg add c

  $ hg ci -m randomcommit

  $ hg mv a b

  $ hg ci -m 'mv a b'

  $ hg up -q 1

  $ echo b > a

  $ hg ci -qm 'mod a'

  $ hg pl

  @  rev: 3, phase: draft

  |  desc: mod a

  | o  rev: 2, phase: draft

  |/   desc: mv a b

  o  rev: 1, phase: draft

  |  desc: randomcommit

  o  rev: 0, phase: draft

     desc: initial

  $ hg rebase -s . -d 2

  rebasing 3:9d5cf99c3d9f "mod a" (tip)

  merging b and a to b

  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9d5cf99c3d9f-f02358cc-rebase.hg

  $ cd ..

  $ rm -rf repo

Rebase "backwards"

------------------

  $ hg init repo

  $ initclient repo

  $ cd repo

  $ echo 'somecontent' > a

  $ hg add a

  $ hg ci -m initial

  $ echo c > c

  $ hg add c

  $ hg ci -m randomcommit

  $ hg mv a b

  $ hg ci -m 'mv a b'

  $ hg up -q 2

  $ echo b > b

  $ hg ci -qm 'mod b'

  $ hg l

  @  rev: 3

  |  desc: mod b

  o  rev: 2

  |  desc: mv a b

  o  rev: 1

  |  desc: randomcommit

  o  rev: 0

     desc: initial

  $ hg rebase -s . -d 0

  rebasing 3:fbe97126b396 "mod b" (tip)

  merging a and b to a

  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fbe97126b396-cf5452a1-rebase.hg

  $ cd ..

  $ rm -rf repo

Check a few potential move candidates

-------------------------------------

  $ hg init repo

  $ initclient repo

  $ cd repo

  $ mkdir dir

  $ echo a > dir/a

  $ hg add dir/a

  $ hg ci -qm initial

  $ hg mv dir/a dir/b

  $ hg ci -qm 'mv dir/a dir/b'

  $ mkdir dir2

  $ echo b > dir2/a

  $ hg add dir2/a

  $ hg ci -qm 'create dir2/a'

  $ hg up -q 0

  $ echo b > dir/a

  $ hg ci -qm 'mod dir/a'

  $ hg l

  @  rev: 3

  |  desc: mod dir/a

  | o  rev: 2

  | |  desc: create dir2/a

  | o  rev: 1

  |/   desc: mv dir/a dir/b

  o  rev: 0

     desc: initial

  $ hg rebase -s . -d 2

  rebasing 3:6b2f4cece40f "mod dir/a" (tip)

  merging dir/b and dir/a to dir/b

  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-rebase.hg

  $ cd ..

  $ rm -rf repo

Test the copytrace.movecandidateslimit with many move candidates

----------------------------------------------------------------

  $ hg init repo

  $ initclient repo

  $ cd repo

  $ echo a > a

  $ hg add a

  $ hg ci -m initial

  $ hg mv a foo

  $ echo a > b

  $ echo a > c

  $ echo a > d

  $ echo a > e

  $ echo a > f

  $ echo a > g

  $ hg add b

  $ hg add c

  $ hg add d

  $ hg add e

  $ hg add f

  $ hg add g

  $ hg ci -m 'mv a foo, add many files'

  $ hg up -q ".^"

  $ echo b > a

  $ hg ci -m 'mod a'

  created new head

  $ hg l

  @  rev: 2

  |  desc: mod a

  | o  rev: 1

  |/   desc: mv a foo, add many files

  o  rev: 0

     desc: initial

With small limit

  $ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0

  rebasing 2:ef716627c70b "mod a" (tip)

  skipping copytracing for 'a', more candidates than the limit: 7

  file 'a' was deleted in local [dest] but was modified in other [source].

  unresolved conflicts (see hg resolve, then hg rebase --continue)

  [1]

  $ hg rebase --abort

  rebase aborted

With default limit which is 100

  $ hg rebase -s 2 -d 1

  rebasing 2:ef716627c70b "mod a" (tip)

  merging foo and a to foo

  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg

  $ cd ..

  $ rm -rf repo

Move file in one branch and delete it in another

-----------------------------------------------

  $ hg init repo

  $ initclient repo

  $ cd repo

  $ echo a > a

  $ hg add a

  $ hg ci -m initial

  $ hg mv a b

  $ hg ci -m 'mv a b'

  $ hg up -q ".^"

  $ hg rm a

  $ hg ci -m 'del a'

  created new head

  $ hg pl

  @  rev: 2, phase: draft

  |  desc: del a

  | o  rev: 1, phase: draft

  |/   desc: mv a b

  o  rev: 0, phase: draft

     desc: initial

  $ hg rebase -s 1 -d 2

  rebasing 1:472e38d57782 "mv a b"

  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-17d50e29-rebase.hg

  $ hg up -q c492ed3c7e35dcd1dc938053b8adf56e2cfbd062

  $ ls

  b

  $ cd ..

  $ rm -rf repo

Move a directory in draft branch

--------------------------------

  $ hg init repo

  $ initclient repo

  $ cd repo

  $ mkdir dir

  $ echo a > dir/a

  $ hg add dir/a

  $ hg ci -qm initial

  $ echo b > dir/a

  $ hg ci -qm 'mod dir/a'

  $ hg up -q ".^"

  $ hg mv -q dir/ dir2

  $ hg ci -qm 'mv dir/ dir2/'

  $ hg l

  @  rev: 2

  |  desc: mv dir/ dir2/

  | o  rev: 1

  |/   desc: mod dir/a

  o  rev: 0

     desc: initial

  $ hg rebase -s . -d 1

  rebasing 2:a33d80b6e352 "mv dir/ dir2/" (tip)

  merging dir/a and dir2/a to dir2/a

  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a33d80b6e352-fecb9ada-rebase.hg

  $ cd ..

  $ rm -rf server

  $ rm -rf repo

Move file twice and rebase mod on top of moves

----------------------------------------------

  $ hg init repo

  $ initclient repo

  $ cd repo

  $ echo a > a

  $ hg add a

  $ hg ci -m initial

  $ hg mv a b

  $ hg ci -m 'mv a b'

  $ hg mv b c

  $ hg ci -m 'mv b c'

  $ hg up -q 0

  $ echo c > a

  $ hg ci -m 'mod a'

  created new head

  $ hg l

  @  rev: 3

  |  desc: mod a

  | o  rev: 2

  | |  desc: mv b c

  | o  rev: 1

  |/   desc: mv a b

  o  rev: 0

     desc: initial

  $ hg rebase -s . -d 2

  rebasing 3:d41316942216 "mod a" (tip)

  merging c and a to c

  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d41316942216-2b5949bc-rebase.hg

  $ cd ..

  $ rm -rf repo

Move file twice and rebase moves on top of mods

-----------------------------------------------

  $ hg init repo

  $ initclient repo

  $ cd repo

  $ echo a > a

  $ hg add a

  $ hg ci -m initial

  $ hg mv a b

  $ hg ci -m 'mv a b'

  $ hg mv b c

  $ hg ci -m 'mv b c'

  $ hg up -q 0

  $ echo c > a

  $ hg ci -m 'mod a'

  created new head

  $ hg l

  @  rev: 3

  |  desc: mod a

  | o  rev: 2

  | |  desc: mv b c

  | o  rev: 1

  |/   desc: mv a b

  o  rev: 0

     desc: initial

  $ hg rebase -s 1 -d .

  rebasing 1:472e38d57782 "mv a b"

  merging a and b to b

  rebasing 2:d3efd280421d "mv b c"

  merging b and c to c

  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-ab8d3c58-rebase.hg

  $ cd ..

  $ rm -rf repo

Move one file and add another file in the same folder in one branch, modify file in another branch

--------------------------------------------------------------------------------------------------

  $ hg init repo

  $ initclient repo

  $ cd repo

  $ echo a > a

  $ hg add a

  $ hg ci -m initial

  $ hg mv a b

  $ hg ci -m 'mv a b'

  $ echo c > c

  $ hg add c

  $ hg ci -m 'add c'

  $ hg up -q 0

  $ echo b > a

  $ hg ci -m 'mod a'

  created new head

  $ hg l

  @  rev: 3

  |  desc: mod a

  | o  rev: 2

  | |  desc: add c

  | o  rev: 1

  |/   desc: mv a b

  o  rev: 0

     desc: initial

  $ hg rebase -s . -d 2

  rebasing 3:ef716627c70b "mod a" (tip)

  merging b and a to b

  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg

  $ ls

  b

  c

  $ cat b

  b

  $ rm -rf repo