Mercurial > hg
annotate tests/test-verify.t @ 23702:c48924787eaa
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.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Tue, 23 Dec 2014 15:30:38 -0800 |
parents | b32a30da608d |
children | 4d2b9b304ad0 |
rev | line source |
---|---|
11787
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
1 prepare repo |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
2 |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
3 $ hg init a |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
4 $ cd a |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
5 $ echo "some text" > FOO.txt |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
6 $ echo "another text" > bar.txt |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
7 $ echo "more text" > QUICK.txt |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
8 $ hg add |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
9 adding FOO.txt |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
10 adding QUICK.txt |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
11 adding bar.txt |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
12 $ hg ci -mtest1 |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
13 |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
14 verify |
6893 | 15 |
11787
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
16 $ hg verify |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
17 checking changesets |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
18 checking manifests |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
19 crosschecking files in changesets and manifests |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
20 checking files |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
21 3 files, 1 changesets, 3 total revisions |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
22 |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
23 verify with journal |
6893 | 24 |
11787
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
25 $ touch .hg/store/journal |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
26 $ hg verify |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
27 abandoned transaction found - run hg recover |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
28 checking changesets |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
29 checking manifests |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
30 crosschecking files in changesets and manifests |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
31 checking files |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
32 3 files, 1 changesets, 3 total revisions |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
33 $ rm .hg/store/journal |
6893 | 34 |
11787
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
35 introduce some bugs in repo |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
36 |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
37 $ cd .hg/store/data |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
38 $ mv _f_o_o.txt.i X_f_o_o.txt.i |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
39 $ mv bar.txt.i xbar.txt.i |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
40 $ rm _q_u_i_c_k.txt.i |
9690
b33d70849a20
verify: report existence of journal
Sune Foldager <cryo@cyanite.org>
parents:
8720
diff
changeset
|
41 |
11787
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
42 $ hg verify |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
43 checking changesets |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
44 checking manifests |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
45 crosschecking files in changesets and manifests |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
46 checking files |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
47 data/FOO.txt.i@0: missing revlog! |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
48 0: empty or missing FOO.txt |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
49 FOO.txt@0: f62022d3d590 in manifests not found |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
50 data/QUICK.txt.i@0: missing revlog! |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
51 0: empty or missing QUICK.txt |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
52 QUICK.txt@0: 88b857db8eba in manifests not found |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
53 data/bar.txt.i@0: missing revlog! |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
54 0: empty or missing bar.txt |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
55 bar.txt@0: 256559129457 in manifests not found |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
56 3 files, 1 changesets, 0 total revisions |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
57 9 integrity errors encountered! |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
58 (first damaged changeset appears to be 0) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12172
diff
changeset
|
59 [1] |
6893 | 60 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
12327
diff
changeset
|
61 $ cd ../../.. |
11787
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
62 $ cd .. |
6893 | 63 |
17385
b32a30da608d
verify: do not choke on valid changelog without manifest
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
64 test changelog without a manifest |
8016
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
65 |
11787
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
66 $ hg init b |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
67 $ cd b |
17385
b32a30da608d
verify: do not choke on valid changelog without manifest
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
68 $ hg branch foo |
b32a30da608d
verify: do not choke on valid changelog without manifest
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
69 marked working directory as branch foo |
b32a30da608d
verify: do not choke on valid changelog without manifest
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
70 (branches are permanent and global, did you want a bookmark?) |
b32a30da608d
verify: do not choke on valid changelog without manifest
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
71 $ hg ci -m branchfoo |
b32a30da608d
verify: do not choke on valid changelog without manifest
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
72 $ hg verify |
b32a30da608d
verify: do not choke on valid changelog without manifest
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
73 checking changesets |
b32a30da608d
verify: do not choke on valid changelog without manifest
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
74 checking manifests |
b32a30da608d
verify: do not choke on valid changelog without manifest
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
75 crosschecking files in changesets and manifests |
b32a30da608d
verify: do not choke on valid changelog without manifest
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
76 checking files |
b32a30da608d
verify: do not choke on valid changelog without manifest
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
77 0 files, 1 changesets, 0 total revisions |
b32a30da608d
verify: do not choke on valid changelog without manifest
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
78 |
b32a30da608d
verify: do not choke on valid changelog without manifest
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
79 test revlog corruption |
8016
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
80 |
11787
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
81 $ touch a |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
82 $ hg add a |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
83 $ hg ci -m a |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
84 |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
85 $ echo 'corrupted' > b |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
86 $ dd if=.hg/store/data/a.i of=start bs=1 count=20 2>/dev/null |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
87 $ cat start b > .hg/store/data/a.i |
8016
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
88 |
11787
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
89 $ hg verify |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
90 checking changesets |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
91 checking manifests |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
92 crosschecking files in changesets and manifests |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
93 checking files |
17385
b32a30da608d
verify: do not choke on valid changelog without manifest
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
94 a@1: broken revlog! (index data/a.i is corrupted) |
11787
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
95 warning: orphan revlog 'data/a.i' |
17385
b32a30da608d
verify: do not choke on valid changelog without manifest
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
96 1 files, 2 changesets, 0 total revisions |
11787
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
97 1 warnings encountered! |
7830e693b704
tests: unify test-verify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9690
diff
changeset
|
98 1 integrity errors encountered! |
17385
b32a30da608d
verify: do not choke on valid changelog without manifest
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
99 (first damaged changeset appears to be 1) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12172
diff
changeset
|
100 [1] |
8016
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
101 |
12172 | 102 $ cd .. |
12170
581066a319e5
verify: fix "missing revlog!" errors for revlog format v0 and add test
Thomas Arendsen Hein <thomas@intevation.de>
parents:
9690
diff
changeset
|
103 |
12172 | 104 test revlog format 0 |
12170
581066a319e5
verify: fix "missing revlog!" errors for revlog format v0 and add test
Thomas Arendsen Hein <thomas@intevation.de>
parents:
9690
diff
changeset
|
105 |
12172 | 106 $ "$TESTDIR/revlog-formatv0.py" |
107 $ cd formatv0 | |
108 $ hg verify | |
109 repository uses revlog format 0 | |
110 checking changesets | |
111 checking manifests | |
112 crosschecking files in changesets and manifests | |
113 checking files | |
114 1 files, 1 changesets, 1 total revisions | |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
12327
diff
changeset
|
115 $ cd .. |