Mercurial > hg
view tests/test-propertycache.py @ 42377:0546ead39a7e stable
manifest: avoid corruption by dropping removed files with pure (issue5801)
Previously, removed files would simply be marked by overwriting the first byte
with NUL and dropping their entry in `self.position`. But no effort was made to
ignore them when compacting the dictionary into text form. This allowed them to
slip into the manifest revision, since the code seems to be trying to minimize
the string operations by copying as large a chunk as possible. As part of this,
compact() walks the existing text based on entries in the `positions` list, and
consumed everything up to the next position entry. This typically resulted in
a ValueError complaining about unsorted manifest entries.
Sometimes it seems that files do get dropped in large repos- it seems to
correspond to there being a new entry that would take the same slot. A much
more trivial problem is that if the only changes were removals, `_compact()`
didn't even run because `__delitem__` doesn't add anything to `self.extradata`.
Now there's an explicit variable to flag this, both to allow `_compact()` to
run, and to avoid searching the manifest in cases where there are no removals.
In practice, this behavior was mostly obscured by the check in fastdelta() which
takes a different path that explicitly drops removed files if there are fewer
than 1000 changes. However, timeless has a repo where after rebasing tens of
commits, a totally different path[1] is taken that bypasses the change count
check and hits this problem.
[1] https://www.mercurial-scm.org/repo/hg/file/2338bdea4474/mercurial/manifest.py#l1511
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 23 May 2019 21:54:24 -0400 |
parents | e5d74742d00e |
children | 2372284d9457 |
line wrap: on
line source
"""test behavior of propertycache and unfiltered propertycache The repoview overlay is quite complex. We test the behavior of property cache of both localrepo and repoview to prevent regression.""" from __future__ import absolute_import, print_function import os import subprocess from mercurial import ( hg, localrepo, pycompat, ui as uimod, util, ) from mercurial.utils import ( procutil, ) # create some special property cache that trace they call calllog = [] @util.propertycache def testcachedfoobar(repo): name = repo.filtername if name is None: name = '' val = len(name) calllog.append(val) return val unficalllog = [] @localrepo.unfilteredpropertycache def testcachedunfifoobar(repo): name = repo.filtername if name is None: name = '' val = 100 + len(name) unficalllog.append(val) return val #plug them on repo localrepo.localrepository.testcachedfoobar = testcachedfoobar localrepo.localrepository.testcachedunfifoobar = testcachedunfifoobar # Create an empty repo and instantiate it. It is important to run # these tests on the real object to detect regression. repopath = pycompat.fsencode(os.path.join(os.environ['TESTTMP'], 'repo')) assert subprocess.call(pycompat.rapply(procutil.tonativestr, [b'hg', b'init', repopath])) == 0 ui = uimod.ui.load() repo = hg.repository(ui, path=repopath).unfiltered() print('') print('=== property cache ===') print('') print('calllog:', calllog) print('cached value (unfiltered):', vars(repo).get('testcachedfoobar', 'NOCACHE')) print('') print('= first access on unfiltered, should do a call') print('access:', repo.testcachedfoobar) print('calllog:', calllog) print('cached value (unfiltered):', vars(repo).get('testcachedfoobar', 'NOCACHE')) print('') print('= second access on unfiltered, should not do call') print('access', repo.testcachedfoobar) print('calllog:', calllog) print('cached value (unfiltered):', vars(repo).get('testcachedfoobar', 'NOCACHE')) print('') print('= first access on "visible" view, should do a call') visibleview = repo.filtered('visible') print('cached value ("visible" view):', vars(visibleview).get('testcachedfoobar', 'NOCACHE')) print('access:', visibleview.testcachedfoobar) print('calllog:', calllog) print('cached value (unfiltered):', vars(repo).get('testcachedfoobar', 'NOCACHE')) print('cached value ("visible" view):', vars(visibleview).get('testcachedfoobar', 'NOCACHE')) print('') print('= second access on "visible view", should not do call') print('access:', visibleview.testcachedfoobar) print('calllog:', calllog) print('cached value (unfiltered):', vars(repo).get('testcachedfoobar', 'NOCACHE')) print('cached value ("visible" view):', vars(visibleview).get('testcachedfoobar', 'NOCACHE')) print('') print('= no effect on other view') immutableview = repo.filtered('immutable') print('cached value ("immutable" view):', vars(immutableview).get('testcachedfoobar', 'NOCACHE')) print('access:', immutableview.testcachedfoobar) print('calllog:', calllog) print('cached value (unfiltered):', vars(repo).get('testcachedfoobar', 'NOCACHE')) print('cached value ("visible" view):', vars(visibleview).get('testcachedfoobar', 'NOCACHE')) print('cached value ("immutable" view):', vars(immutableview).get('testcachedfoobar', 'NOCACHE')) # unfiltered property cache test print('') print('') print('=== unfiltered property cache ===') print('') print('unficalllog:', unficalllog) print('cached value (unfiltered): ', vars(repo).get('testcachedunfifoobar', 'NOCACHE')) print('cached value ("visible" view): ', vars(visibleview).get('testcachedunfifoobar', 'NOCACHE')) print('cached value ("immutable" view):', vars(immutableview).get('testcachedunfifoobar', 'NOCACHE')) print('') print('= first access on unfiltered, should do a call') print('access (unfiltered):', repo.testcachedunfifoobar) print('unficalllog:', unficalllog) print('cached value (unfiltered): ', vars(repo).get('testcachedunfifoobar', 'NOCACHE')) print('') print('= second access on unfiltered, should not do call') print('access (unfiltered):', repo.testcachedunfifoobar) print('unficalllog:', unficalllog) print('cached value (unfiltered): ', vars(repo).get('testcachedunfifoobar', 'NOCACHE')) print('') print('= access on view should use the unfiltered cache') print('access (unfiltered): ', repo.testcachedunfifoobar) print('access ("visible" view): ', visibleview.testcachedunfifoobar) print('access ("immutable" view):', immutableview.testcachedunfifoobar) print('unficalllog:', unficalllog) print('cached value (unfiltered): ', vars(repo).get('testcachedunfifoobar', 'NOCACHE')) print('cached value ("visible" view): ', vars(visibleview).get('testcachedunfifoobar', 'NOCACHE')) print('cached value ("immutable" view):', vars(immutableview).get('testcachedunfifoobar', 'NOCACHE')) print('') print('= even if we clear the unfiltered cache') del repo.__dict__['testcachedunfifoobar'] print('cached value (unfiltered): ', vars(repo).get('testcachedunfifoobar', 'NOCACHE')) print('cached value ("visible" view): ', vars(visibleview).get('testcachedunfifoobar', 'NOCACHE')) print('cached value ("immutable" view):', vars(immutableview).get('testcachedunfifoobar', 'NOCACHE')) print('unficalllog:', unficalllog) print('access ("visible" view): ', visibleview.testcachedunfifoobar) print('unficalllog:', unficalllog) print('cached value (unfiltered): ', vars(repo).get('testcachedunfifoobar', 'NOCACHE')) print('cached value ("visible" view): ', vars(visibleview).get('testcachedunfifoobar', 'NOCACHE')) print('cached value ("immutable" view):', vars(immutableview).get('testcachedunfifoobar', 'NOCACHE')) print('access ("immutable" view):', immutableview.testcachedunfifoobar) print('unficalllog:', unficalllog) print('cached value (unfiltered): ', vars(repo).get('testcachedunfifoobar', 'NOCACHE')) print('cached value ("visible" view): ', vars(visibleview).get('testcachedunfifoobar', 'NOCACHE')) print('cached value ("immutable" view):', vars(immutableview).get('testcachedunfifoobar', 'NOCACHE')) print('access (unfiltered): ', repo.testcachedunfifoobar) print('unficalllog:', unficalllog) print('cached value (unfiltered): ', vars(repo).get('testcachedunfifoobar', 'NOCACHE')) print('cached value ("visible" view): ', vars(visibleview).get('testcachedunfifoobar', 'NOCACHE')) print('cached value ("immutable" view):', vars(immutableview).get('testcachedunfifoobar', 'NOCACHE'))