Mercurial > hg
annotate tests/test-merge5.t @ 46607:e9901d01d135
revlog: add a mechanism to verify expected file position before appending
If someone uses `hg debuglocks`, or some non-hg process writes to the .hg
directory without respecting the locks, or if the repo's on a networked
filesystem, it's possible for the revlog code to write out corrupted data.
The form of this corruption can vary depending on what data was written and how
that happened. We are in the "networked filesystem" case (though I've had users
also do this to themselves with the "`hg debuglocks`" scenario), and most often
see this with the changelog. What ends up happening is we produce two items
(let's call them rev1 and rev2) in the .i file that have the same linkrev,
baserev, and offset into the .d file, while the data in the .d file is appended
properly. rev2's compressed_size is accurate for rev2, but when we go to
decompress the data in the .d file, we use the offset that's recorded in the
index file, which is the same as rev1, and attempt to decompress
rev2.compressed_size bytes of rev1's data. This usually does not succeed. :)
When using inline data, this also fails, though I haven't investigated why too
closely. This shows up as a "patch decode" error. I believe what's happening
there is that we're basically ignoring the offset field, getting the data
properly, but since baserev != rev, it thinks this is a delta based on rev
(instead of a full text) and can't actually apply it as such.
For now, I'm going to make this an optional component and default it to entirely
off. I may increase the default severity of this in the future, once I've
enabled it for my users and we gain more experience with it. Luckily, most of my
users have a versioned filesystem and can roll back to before the corruption has
been written, it's just a hassle to do so and not everyone knows how (so it's a
support burden). Users on other filesystems will not have that luxury, and this
can cause them to have a corrupted repository that they are unlikely to know how
to resolve, and they'll see this as a data-loss event. Refusing to create the
corruption is a much better user experience.
This mechanism is not perfect. There may be false-negatives (racy writes that
are not detected). There should not be any false-positives (non-racy writes that
are detected as such). This is not a mechanism that makes putting a repo on a
networked filesystem "safe" or "supported", just *less* likely to cause
corruption.
Differential Revision: https://phab.mercurial-scm.org/D9952
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Wed, 03 Feb 2021 16:33:10 -0800 |
parents | 527ce85c2e60 |
children | 55c6ebd11cb9 |
rev | line source |
---|---|
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
1 $ hg init |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
2 $ echo This is file a1 > a |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
3 $ echo This is file b1 > b |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
4 $ hg add a b |
12155
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
5 $ hg commit -m "commit #0" |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
6 $ echo This is file b22 > b |
12155
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
7 $ hg commit -m "comment #1" |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
8 $ hg update 0 |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
10 $ rm b |
12155
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
11 $ hg commit -A -m "comment #2" |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
12 removing b |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
13 created new head |
12154
c85e07a2d783
test-merge5: ensure updating to tip across branches is tested
Brodie Rao <brodie@bitheap.org>
parents:
11978
diff
changeset
|
14 $ hg update 1 |
c85e07a2d783
test-merge5: ensure updating to tip across branches is tested
Brodie Rao <brodie@bitheap.org>
parents:
11978
diff
changeset
|
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17849
6da47b655d97
update: check for missing files with --check (issue3595)
Matt Mackall <mpm@selenic.com>
parents:
14485
diff
changeset
|
16 $ rm b |
28065
6b1fc09c699a
update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28029
diff
changeset
|
17 $ hg update -c 2 |
19801
41abe2e3e3b7
update: standardize error message for dirty update --check
Siddharth Agarwal <sid0@fb.com>
parents:
19799
diff
changeset
|
18 abort: uncommitted changes |
45840
527ce85c2e60
errors: introduce StateError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
28065
diff
changeset
|
19 [20] |
17849
6da47b655d97
update: check for missing files with --check (issue3595)
Matt Mackall <mpm@selenic.com>
parents:
14485
diff
changeset
|
20 $ hg revert b |
28065
6b1fc09c699a
update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28029
diff
changeset
|
21 $ hg update -c 2 |
12154
c85e07a2d783
test-merge5: ensure updating to tip across branches is tested
Brodie Rao <brodie@bitheap.org>
parents:
11978
diff
changeset
|
22 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
23 $ mv a c |
415
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
24 |
12155
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
25 Should abort: |
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
26 |
23026
fe80fdf68ba7
test-merge5: remove obsolete '-y' and its motivating comment
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
19801
diff
changeset
|
27 $ hg update 1 |
19799
ab3e42225dbc
update: add error message for dirty non-linear update with no rev
Siddharth Agarwal <sid0@fb.com>
parents:
19798
diff
changeset
|
28 abort: uncommitted changes |
ab3e42225dbc
update: add error message for dirty non-linear update with no rev
Siddharth Agarwal <sid0@fb.com>
parents:
19798
diff
changeset
|
29 (commit or update --clean to discard changes) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12155
diff
changeset
|
30 [255] |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
31 $ mv c a |
12155
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
32 |
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
33 Should succeed: |
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
34 |
23026
fe80fdf68ba7
test-merge5: remove obsolete '-y' and its motivating comment
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
19801
diff
changeset
|
35 $ hg update 1 |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
36 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |