Mercurial > hg
view tests/test-propertycache.py @ 42619:20d0e59be79b
tests: show the files fields of changelogs for many merges
I don't think there's coverage for many of the subtle cases, and I
found it hard to understand what the code is doing by reading it. The
test takes 40s to run on a laptop, or 9s with --chg.
I have yet to find a description of what the files field is supposed
to be for merges. I thought it could be one of:
1. the files added/modified/removed relative to p1 (wouldn't seem
useful, but `hg diff -c -r mergerev` has this behavior)
2. the files with filelog nodes not in either parent (i.e., what is
needed to create a bundle out of a commit)
3. the files added/removed/modified files by merge itself [1]
It's clearly not 1, because file contents merges are symmetric. It's
clearly not 2 because removed files and exec bit changes are
listed. It's also not 3 but I think it's intended to be 3 and the
differences are bugs.
Assuming 3, the test shows that, for merges, the list of files both
overapproximates and underapproximates. All the cases involve file
changes not in the filelog but in the manifest (existence of file
at revision, exec bit and file vs symlink).
I didn't look at all underapproximations, but they looked minor. The
two overapproximations are problematic though because they both cause
potentially long lists of files when merging cleanly.
[1] even what it means for the merge commit itself to change a file is
not completely trivial. A file in the merge being the same as in one
of the parent is too lax as it would consider that merges change
nothing when they revert all the changes done on one side. The
criteria used in the test and in the next commit for "merge didn't
touch a file" is:
- the parents and the merge all have the same file
- or, one parent didn't touch the file and the other parent contains
the same file as the merge
Differential Revision: https://phab.mercurial-scm.org/D6612
author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
---|---|
date | Tue, 02 Jul 2019 12:55:51 -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'))