comparison mercurial/testing/storage.py @ 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 801ccd8e67c0
children ddeb510d6815
comparison
equal deleted inserted replaced
40055:0a4625ffd6c0 40056:324b4b10351e
1173 1173
1174 self.assertEqual(len(f), 3) 1174 self.assertEqual(len(f), 3)
1175 self.assertEqual(list(f.revs()), [0, 1, 2]) 1175 self.assertEqual(list(f.revs()), [0, 1, 2])
1176 1176
1177 self.assertEqual(f.read(node0), b'foo\n' * 30) 1177 self.assertEqual(f.read(node0), b'foo\n' * 30)
1178 1178 self.assertEqual(f.read(node2), b'foo\n' * 32)
1179 # TODO revlog can't resolve revision after censor. Probably due to a 1179
1180 # cache on the revlog instance. 1180 with self.assertRaises(error.CensoredNodeError):
1181 with self.assertRaises(error.StorageError):
1182 self.assertEqual(f.read(node2), b'foo\n' * 32)
1183
1184 # TODO should raise CensoredNodeError, but fallout from above prevents.
1185 with self.assertRaises(error.StorageError):
1186 f.read(node1) 1181 f.read(node1)
1187 1182
1188 def testgetstrippointnoparents(self): 1183 def testgetstrippointnoparents(self):
1189 # N revisions where none have parents. 1184 # N revisions where none have parents.
1190 f = self._makefilefn() 1185 f = self._makefilefn()