Mercurial > hg
view tests/test-propertycache.py @ 46811:5a0b930cfb3e
commit: get info from mergestate whether a file was merged or not
While commiting a merge, the commit code does not know whether a file was merged
during `hg merge` or not. This leads the commit code to look for filelog
ancestor to choose parents of new filelog created on merge commit.
This leads to wrong results in some cases as demonstrated by previous patch.
From this patch, we start storing information about merged files in mergestate
in stateextras and then use that on commit to detect whether we need to set two
parents or not.
Differential Revision: https://phab.mercurial-scm.org/D10149
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 10 Mar 2021 13:14:32 +0530 |
parents | 2372284d9457 |
children | 6000f5b25c9b |
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'), )