Mercurial > hg
view tests/test-propertycache.py @ 45761:341e014fe0fb stable
repoview: only pin obsolete wdir parents while there are unresolved conflicts
I noticed after doing an update from an obsolete revision with a dirty wdir that
the obsolete commit stayed visible for no obvious reason. It was decided in
85b03b1e4715 not to clear mergestate once all of the conflicts were resolved, in
order to allow re-resolving. Since the point of pinning the obsolete parents
was to allow resolving in the first place (aaeccdb6e654), it makes sense to also
gate it on whether or not there are any remaining files to resolve. This might
result in pinning again if files are marked unresolved again, but that seems
reasonable, given that it still solves the original issue.
Note that this isn't purely cosmetic- pushing with a pinned obsolete revision is
likely to cause complaints about pushing multiple heads or other unexpected
errors. So the faster it comes out of that state, the better.
Differential Revision: https://phab.mercurial-scm.org/D9248
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 23 Oct 2020 22:20:08 -0400 |
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'), )