annotate tests/test-revlog-group-emptyiter.t @ 40056:324b4b10351e

revlog: rewrite censoring logic I was able to corrupt a revlog relatively easily with the existing censoring code. The underlying problem is that the existing code doesn't fully take delta chains into account. When copying revisions that occur after the censored revision, the delta base can refer to a censored revision. Then at read time, things blow up due to the revision data not being a compressed delta. This commit rewrites the revlog censoring code to take a higher-level approach. We now create a new revlog instance pointing at temp files. We iterate through each revision in the source revlog and insert those revisions into the new revlog, replacing the censored revision's data along the way. The new implementation isn't as efficient as the old one. This is because it will fully engage delta computation on insertion. But I don't think it matters. The new implementation is a bit hacky because it attempts to reload the revlog instance with a new revlog index/data file. This is fragile. But this is needed because the index (which could be backed by C) would have a cached copy of the old, possibly changed data and that could lead to problems accessing index or revision data later. One benefit of the new approach is that we integrate with the transaction. The old revlog is backed up and if the transaction is rolled back, the original revlog is restored. As part of this, we had to teach the transaction about the store vfs. I'm not super keen about this. But this was the easiest way to hook things up to the transaction. We /could/ just ignore the transaction like we were doing before. But any file mutation should be governed by transaction semantics, including undo during rollback. Differential Revision: https://phab.mercurial-scm.org/D4869
author Gregory Szorc <gregory.szorc@gmail.com>
date Tue, 02 Oct 2018 17:34:34 -0700
parents f2719b387380
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12328
diff changeset
1 Issue1678: IndexError when pushing
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 11918
diff changeset
2
11918
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
3 setting up base repo
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
4 $ hg init a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
5 $ cd a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
6 $ touch a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
7 $ hg ci -Am a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
8 adding a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
9 $ cd ..
8635
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
10
11918
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
11 cloning base repo
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
12 $ hg clone a b
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
13 updating to branch default
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
15 $ cd b
8635
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
16
11918
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
17 setting up cset to push
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
18 $ hg up null
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
19 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
20 $ touch a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
21 different msg so we get a clog new entry
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
22 $ hg ci -Am b
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
23 adding a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
24 created new head
8635
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
25
11918
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
26 pushing
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
27 $ hg push -f ../a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
28 pushing to ../a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
29 searching for changes
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
30 adding changesets
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
31 adding manifests
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
32 adding file changes
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
33 added 1 changesets with 0 changes to 0 files (+1 heads)
8635
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
34
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
35 $ cd ..