comparison mercurial/localrepo.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 83146d176c03
children f84d7ed3bb35
comparison
equal deleted inserted replaced
40055:0a4625ffd6c0 40056:324b4b10351e
1680 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] 1680 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()]
1681 if report: 1681 if report:
1682 rp = report 1682 rp = report
1683 else: 1683 else:
1684 rp = self.ui.warn 1684 rp = self.ui.warn
1685 vfsmap = {'plain': self.vfs} # root of .hg/ 1685 vfsmap = {'plain': self.vfs, 'store': self.svfs} # root of .hg/
1686 # we must avoid cyclic reference between repo and transaction. 1686 # we must avoid cyclic reference between repo and transaction.
1687 reporef = weakref.ref(self) 1687 reporef = weakref.ref(self)
1688 # Code to track tag movement 1688 # Code to track tag movement
1689 # 1689 #
1690 # Since tags are all handled as file content, it is actually quite hard 1690 # Since tags are all handled as file content, it is actually quite hard