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

Test Copy tracing for chain of copies involving merge

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

This test files covers copies/rename case for a chains of commit where merges

are involved. It cheks we do not have unwanted update of behavior and that the

different options to retrieve copies behave correctly.

Setup

=====

use git diff to see rename

  $ cat << EOF >> ./no-linkrev

  > #!$PYTHON

  > # filter out linkrev part of the debugindex command

  > import sys

  > for line in sys.stdin:

  >     if " linkrev " in line:

  >         print(line.rstrip())

  >     else:

  >         l = "%s       *%s" % (line[:6], line[14:].rstrip())

  >         print(l)

  > EOF

  $ chmod +x no-linkrev

  $ cat << EOF >> $HGRCPATH

  > [diff]

  > git=yes

  > [command-templates]

  > log={desc}\n

  > EOF

#if compatibility

  $ cat >> $HGRCPATH << EOF

  > [experimental]

  > copies.read-from = compatibility

  > EOF

#endif

#if changeset

  $ cat >> $HGRCPATH << EOF

  > [experimental]

  > copies.read-from = changeset-only

  > copies.write-to = changeset-only

  > EOF

#endif

#if sidedata

  $ cat >> $HGRCPATH << EOF

  > [format]

  > exp-use-side-data = yes

  > exp-use-copies-side-data-changeset = yes

  > EOF

#endif

  $ cat > same-content.txt << EOF

  > Here is some content that will be the same accros multiple file.

  > 

  > This is done on purpose so that we end up in some merge situation, were the

  > resulting content is the same as in the parent(s), but a new filenodes still

  > need to be created to record some file history information (especially

  > about copies).

  > EOF

  $ hg init repo-chain

  $ cd repo-chain

Add some linear rename initialy

  $ cp ../same-content.txt a

  $ cp ../same-content.txt b

  $ cp ../same-content.txt h

  $ echo "original content for P" > p

  $ echo "original content for Q" > q

  $ echo "original content for R" > r

  $ hg ci -Am 'i-0 initial commit: a b h p q r'

  adding a

  adding b

  adding h

  adding p

  adding q

  adding r

  $ hg mv a c

  $ hg mv p s

  $ hg ci -Am 'i-1: a -move-> c, p -move-> s'

  $ hg mv c d

  $ hg mv s t

  $ hg ci -Am 'i-2: c -move-> d, s -move-> t'

  $ hg log -G

  @  i-2: c -move-> d, s -move-> t

  |

  o  i-1: a -move-> c, p -move-> s

  |

  o  i-0 initial commit: a b h p q r

And having another branch with renames on the other side

  $ hg mv d e

  $ hg ci -Am 'a-1: d -move-> e'

  $ hg mv e f

  $ hg ci -Am 'a-2: e -move-> f'

  $ hg log -G --rev '::.'

  @  a-2: e -move-> f

  |

  o  a-1: d -move-> e

  |

  o  i-2: c -move-> d, s -move-> t

  |

  o  i-1: a -move-> c, p -move-> s

  |

  o  i-0 initial commit: a b h p q r

Have a branching with nothing on one side

  $ hg up 'desc("i-2")'

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

  $ echo foo > b

  $ hg ci -m 'b-1: b update'

  created new head

  $ hg log -G --rev '::.'

  @  b-1: b update

  |

  o  i-2: c -move-> d, s -move-> t

  |

  o  i-1: a -move-> c, p -move-> s

  |

  o  i-0 initial commit: a b h p q r

Create a branch that delete a file previous renamed

  $ hg up 'desc("i-2")'

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

  $ hg rm d

  $ hg ci -m 'c-1 delete d'

  created new head

  $ hg log -G --rev '::.'

  @  c-1 delete d

  |

  o  i-2: c -move-> d, s -move-> t

  |

  o  i-1: a -move-> c, p -move-> s

  |

  o  i-0 initial commit: a b h p q r

Create a branch that delete a file previous renamed and recreate it

  $ hg up 'desc("i-2")'

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

  $ hg rm d

  $ hg ci -m 'd-1 delete d'

  created new head

  $ echo bar > d

  $ hg add d

  $ hg ci -m 'd-2 re-add d'

  $ hg log -G --rev '::.'

  @  d-2 re-add d

  |

  o  d-1 delete d

  |

  o  i-2: c -move-> d, s -move-> t

  |

  o  i-1: a -move-> c, p -move-> s

  |

  o  i-0 initial commit: a b h p q r

Having another branch renaming a different file to the same filename as another

  $ hg up 'desc("i-2")'

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

  $ hg mv b g

  $ hg ci -m 'e-1 b -move-> g'

  created new head

  $ hg mv g f

  $ hg ci -m 'e-2 g -move-> f'

  $ hg log -G --rev '::.'

  @  e-2 g -move-> f

  |

  o  e-1 b -move-> g

  |

  o  i-2: c -move-> d, s -move-> t

  |

  o  i-1: a -move-> c, p -move-> s

  |

  o  i-0 initial commit: a b h p q r

  $ hg up -q null

Having a branch similar to the 'a' one, but moving the 'p' file around.

  $ hg up 'desc("i-2")'

  6 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg mv t u

  $ hg ci -Am 'p-1: t -move-> u'

  created new head

  $ hg mv u v

  $ hg ci -Am 'p-2: u -move-> v'

  $ hg log -G --rev '::.'

  @  p-2: u -move-> v

  |

  o  p-1: t -move-> u

  |

  o  i-2: c -move-> d, s -move-> t

  |

  o  i-1: a -move-> c, p -move-> s

  |

  o  i-0 initial commit: a b h p q r

  $ hg up -q null

Having another branch renaming a different file to the same filename as another

  $ hg up 'desc("i-2")'

  6 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg mv r w

  $ hg ci -m 'q-1 r -move-> w'

  created new head

  $ hg mv w v

  $ hg ci -m 'q-2 w -move-> v'

  $ hg log -G --rev '::.'

  @  q-2 w -move-> v

  |

  o  q-1 r -move-> w

  |

  o  i-2: c -move-> d, s -move-> t

  |

  o  i-1: a -move-> c, p -move-> s

  |

  o  i-0 initial commit: a b h p q r

  $ hg up -q null

Setup all merge

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

This is done beforehand to validate that the upgrade process creates valid copy

information.

merging with unrelated change does not interfere with the renames

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

- rename on one side

- unrelated change on the other side

  $ case_desc="simple merge - A side: multiple renames, B side: unrelated update"

  $ hg up 'desc("b-1")'

  6 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg merge 'desc("a-2")'

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

  (branch merge, don't forget to commit)

  $ hg ci -m "mBAm-0 $case_desc - one way"

  $ hg up 'desc("a-2")'

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

  $ hg merge 'desc("b-1")'

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

  (branch merge, don't forget to commit)

  $ hg ci -m "mABm-0 $case_desc - the other way"

  created new head

  $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'

  @    mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way

  |\

  +---o  mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way

  | |/

  | o  b-1: b update

  | |

  o |  a-2: e -move-> f

  | |

  o |  a-1: d -move-> e

  |/

  o  i-2: c -move-> d, s -move-> t

  |

  o  i-1: a -move-> c, p -move-> s

  |

  o  i-0 initial commit: a b h p q r

merging with the side having a delete

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

case summary:

- one with change to an unrelated file

- one deleting the change

and recreate an unrelated file after the merge

  $ case_desc="simple merge - C side: delete a file with copies history , B side: unrelated update"

  $ hg up 'desc("b-1")'

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

  $ hg merge 'desc("c-1")'

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

  (branch merge, don't forget to commit)

  $ hg ci -m "mBCm-0 $case_desc - one way"

  $ echo bar > d

  $ hg add d

  $ hg ci -m 'mBCm-1 re-add d'

  $ hg up 'desc("c-1")'

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

  $ hg merge 'desc("b-1")'

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

  (branch merge, don't forget to commit)

  $ hg ci -m "mCBm-0 $case_desc - the other way"

  created new head

  $ echo bar > d

  $ hg add d

  $ hg ci -m 'mCBm-1 re-add d'

  $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))'

  @  mCBm-1 re-add d

  |

  o    mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way

  |\

  | | o  mBCm-1 re-add d

  | | |

  +---o  mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way

  | |/

  | o  c-1 delete d

  | |

  o |  b-1: b update

  |/

  o  i-2: c -move-> d, s -move-> t

  |

  o  i-1: a -move-> c, p -move-> s

  |

  o  i-0 initial commit: a b h p q r

Comparing with a merge re-adding the file afterward

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

Merge:

- one with change to an unrelated file

- one deleting and recreating the change

  $ case_desc="simple merge - B side: unrelated update, D side: delete and recreate a file (with different content)"

  $ hg up 'desc("b-1")'

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

  $ hg merge 'desc("d-2")'

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

  (branch merge, don't forget to commit)

  $ hg ci -m "mBDm-0 $case_desc - one way"

  $ hg up 'desc("d-2")'

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

  $ hg merge 'desc("b-1")'

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