tests/test-revlog-packentry.t
author Pierre-Yves David <pierre-yves.david@fb.com>
Tue, 23 Dec 2014 15:30:38 -0800
changeset 23702 c48924787eaa
parent 23285 6cc1f388ac80
child 37284 009d0283de5f
permissions -rw-r--r--
filectx.parents: enforce changeid of parent to be in own changectx ancestors Because of the way filenodes are computed, you can have multiple changesets "introducing" the same file revision. For example, in the changeset graph below, changeset 2 and 3 both change a file -to- and -from- the same content. o 3: content = new | | o 2: content = new |/ o 1: content = old In such cases, the file revision is create once, when 2 is added, and just reused for 3. So the file change in '3' (from "old" to "new)" has no linkrev pointing to it). We'll call this situation "linkrev-shadowing". As the linkrev is used for optimization purposes when walking a file history, the linkrev-shadowing results in an unexpected jump to another branch during such a walk.. This leads to multiple bugs with log, annotate and rename detection. One element to fix such bugs is to ensure that walking the file history sticks on the same topology as the changeset's history. For this purpose, we extend the logic in 'basefilectx.parents' so that it always defines the proper changeset to associate the parent file revision with. This "proper" changeset has to be an ancestor of the changeset associated with the child file revision. This logic is performed in the '_adjustlinkrev' function. This function is given the starting changeset and all the information regarding the parent file revision. If the linkrev for the file revision is an ancestor of the starting changeset, the linkrev is valid and will be used. If it is not, we detected a topological jump caused by linkrev shadowing, we are going to walk the ancestors of the starting changeset until we find one setting the file to the revision we are trying to create. The performance impact appears acceptable: - We are walking the changelog once for each filelog traversal (as there should be no overlap between searches), - changelog traversal itself is fairly cheap, compared to what is likely going to be perform on the result on the filelog traversal, - We only touch the manifest for ancestors touching the file, And such changesets are likely to be the one introducing the file. (except in pathological cases involving merge), - We use manifest diff instead of full manifest unpacking to check manifest content, so it does not involve applying multiple diffs in most case. - linkrev shadowing is not the common case. Tests for fixed issues in log, annotate and rename detection have been added. But this changeset does not solve all problems. It fixes -ancestry- computation, but if the linkrev-shadowed changesets is the starting one, we'll still get things wrong. We'll have to fix the bootstrapping of such operations in a later changeset. Also, the usage of `hg log FILE` without --follow still has issues with linkrev pointing to hidden changesets, because it relies on the `filelog` revset which implement its own traversal logic that is still to be fixed. Thanks goes to: - Matt Mackall: for nudging me in the right direction - Julien Cristau and RĂ©mi Cardona: for keep telling me linkrev bug were an evolution show stopper for 3 years. - Durham Goode: for finding a new linkrev issue every few weeks - Mads Kiilerich: for that last rename bug who raise this topic over my anoyance limit.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11919
67fb33eb3add tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5338
diff changeset
     1
  $ hg init repo
67fb33eb3add tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5338
diff changeset
     2
  $ cd repo
5338
f87685355c9c revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     3
11919
67fb33eb3add tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5338
diff changeset
     4
  $ touch foo
67fb33eb3add tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5338
diff changeset
     5
  $ hg ci -Am 'add foo'
67fb33eb3add tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5338
diff changeset
     6
  adding foo
67fb33eb3add tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5338
diff changeset
     7
67fb33eb3add tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5338
diff changeset
     8
  $ hg up -C null
67fb33eb3add tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5338
diff changeset
     9
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5338
f87685355c9c revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    10
11919
67fb33eb3add tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5338
diff changeset
    11
this should be stored as a delta against rev 0
5338
f87685355c9c revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    12
11919
67fb33eb3add tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5338
diff changeset
    13
  $ echo foo bar baz > foo
67fb33eb3add tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5338
diff changeset
    14
  $ hg ci -Am 'add foo again'
67fb33eb3add tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5338
diff changeset
    15
  adding foo
67fb33eb3add tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5338
diff changeset
    16
  created new head
5338
f87685355c9c revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    17
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 11919
diff changeset
    18
  $ hg debugindex foo
17132
b87acfda5268 tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents: 16913
diff changeset
    19
     rev    offset  length  ..... linkrev nodeid       p1           p2 (re)
b87acfda5268 tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents: 16913
diff changeset
    20
       0         0       0  .....       0 b80de5d13875 000000000000 000000000000 (re)
23285
6cc1f388ac80 revlog: store fulltext when compressed delta is bigger than it
Siddharth Agarwal <sid0@fb.com>
parents: 17132
diff changeset
    21
       1         0      13  .....       1 0376abec49b8 000000000000 000000000000 (re)
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 14182
diff changeset
    22
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 14182
diff changeset
    23
  $ cd ..