Test for the heuristic copytracing algorithm

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

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

  > initclient() {

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

  > [experimental]

  > copytrace = heuristics

  > EOF

  > }

  > __EOF__

  $ . "$TESTTMP/copytrace.sh"

  $ cat >> $HGRCPATH << EOF

  > [extensions]

  > rebase=

  > shelve=

  > EOF

Check filename heuristics (same dirname and same basename)

  $ 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'

  @  changeset: 557f403c0afd2a3cf15d7e2fb1f1001a8b85e081

  | o  changeset: 928d74bc9110681920854d845c06959f6dfc9547

  o  changeset: 3c482b16e54596fed340d05ffaf155f156cda7ee

  $ 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 (glob)

  $ cd ..

  $ rm -rf repo

Make sure filename heuristics do not when they are not related

  $ 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'

  @  changeset: d526312210b9e8f795d576a77dc643796384d86e

  | o  changeset: 46985f76c7e5e5123433527f5c8526806145650b

  o  changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0

  $ hg rebase -s . -d 1

  rebasing 2:d526312210b9 "mode a" (tip)

  other [source] changed a which local [dest] deleted

  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u

  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

  $ 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'

  $ cd ..

  $ initclient repo

  $ cd repo

  $ hg up -q 2

  $ echo b > b

  $ hg ci -qm 'mod b'

  @  changeset: fbe97126b3969056795c462a67d93faf13e4d298

  o  changeset: d760186dd240fc47b91eb9f0b58b0002aaeef95d

  o  changeset: 48e1b6ba639d5d7fb313fa7989eebabf99c9eb83

  o  changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0

  $ 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 (glob)

  $ cd ..

  $ rm -rf repo

  $ 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'

  @  changeset: 6b2f4cece40fd320f41229f23821256ffc08efea

  | o  changeset: 4494bf7efd2e0dfdd388e767fb913a8a3731e3fa

  | o  changeset: b1784dfab6ea6bfafeb11c0ac50a2981b0fe6ade

  o  changeset: 36859b8907c513a3a87ae34ba5b1e7eea8c20944

  $ 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 (glob)

  $ cd ..

  $ rm -rf repo

Move file in one branch and delete it in another

  $ 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 log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'

  @  changeset: 7d61ee3b1e48577891a072024968428ba465c47b

  |   desc: del a, phase: draft

  | o  changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22

  |/    desc: mv a b, phase: draft

  o  changeset: 1451231c87572a7d3f92fc210b4b35711c949a98

  $ 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 (glob)

  $ hg up -q c492ed3c7e35dcd1dc938053b8adf56e2cfbd062

  $ ls

  b

  $ cd ..

  $ rm -rf repo

Move a directory in draft branch

  $ 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/'

  @  changeset: a33d80b6e352591dfd82784e1ad6cdd86b25a239

  | o  changeset: 6b2f4cece40fd320f41229f23821256ffc08efea

  o  changeset: 36859b8907c513a3a87ae34ba5b1e7eea8c20944

  $ 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 (glob)

  $ cd ..

  $ rm -rf server

  $ rm -rf repo

Move file twice and rebase mod on top of moves

  $ 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

  @  changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3

  | o  changeset: d3efd280421d24f9f229997c19e654761c942a71

  | o  changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22

  o  changeset: 1451231c87572a7d3f92fc210b4b35711c949a98

  $ 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 (glob)

  $ cd ..

  $ rm -rf repo

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

  $ 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

  @  changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e

  | o  changeset: b1a6187e79fbce851bb584eadcb0cc4a80290fd9

  | o  changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22

  o  changeset: 1451231c87572a7d3f92fc210b4b35711c949a98

  $ 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 (glob)

  $ ls

  b

  c

  $ cat b

  b

Merge test

  $ echo a > a

  $ hg add a

  $ hg ci -m initial

  $ echo b > a

  $ hg ci -m 'modify a'

  $ hg up -q 0

  $ hg mv a b

  $ hg ci -m 'mv a b'

  created new head

  $ hg up -q 2

  @  changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22

  | o  changeset: b0357b07f79129a3d08a68621271ca1352ae8a09

  o  changeset: 1451231c87572a7d3f92fc210b4b35711c949a98

  $ hg merge 1

  merging b and a to b

  0 files updated, 1 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg ci -m merge

  $ ls

  b

  $ cd ..

  $ rm -rf repo

Copy and move file

  $ echo a > a

  $ hg add a

  $ hg ci -m initial

  $ hg cp a c

  $ hg mv a b

  $ hg ci -m 'cp a c, mv a b'

  $ hg up -q 0

  $ echo b > a

  $ hg ci -m 'mod a'

  created new head

  @  changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e