Mercurial > hg
view tests/test-propertycache.py @ 26000:9ac4e81b9659 stable
match: fix a caseonly rename + explicit path commit on icasefs (issue4768)
The problem was that the former name and the new name are both normalized to the
case in dirstate, so matcher._files would be ['ABC.txt', 'ABC.txt'].
localrepo.commit() calls localrepo.status(), passing along the matcher. Inside
dirstate.status(), _walkexplicit() simply grabs matcher.files() and processes
those items. Since the old name isn't present, it is silently dropped. There's
a fundamental tension here, because the status command should also accept files
that don't match the filesystem, so we can't drop the normalization in status.
The problem originated in baa11dde8c0e.
Unfortunately with this change, the case of the old file must still be specified
exactly, or the old file is again silently excluded. I went back to
baa11dde8c0e^, and that had the same behavior, so we are no worse off. I'm open
to ideas from a matcher or dirstate expert on how to fix that half.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 06 Aug 2015 21:00:16 -0400 |
parents | 7731a2281cf0 |
children | 84673a7c54af |
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.""" import os, subprocess import mercurial.localrepo import mercurial.repoview import mercurial.util import mercurial.hg import mercurial.ui as uimod # create some special property cache that trace they call calllog = [] @mercurial.util.propertycache def testcachedfoobar(repo): name = repo.filtername if name is None: name = '' val = len(name) calllog.append(val) return val unficalllog = [] @mercurial.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 mercurial.localrepo.localrepository.testcachedfoobar = testcachedfoobar mercurial.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 = os.path.join(os.environ['TESTTMP'], 'repo') assert subprocess.call(['hg', 'init', repopath]) == 0 ui = uimod.ui() repo = mercurial.hg.repository(ui, path=repopath).unfiltered() print '' print '=== property cache ===' print '' print 'calllog:', calllog print 'cached value (unfiltered):', print 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):', print 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):', print 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):', print vars(visibleview).get('testcachedfoobar', 'NOCACHE') print 'access:', visibleview.testcachedfoobar print 'calllog:', calllog print 'cached value (unfiltered):', print vars(repo).get('testcachedfoobar', 'NOCACHE') print 'cached value ("visible" view):', print 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):', print vars(repo).get('testcachedfoobar', 'NOCACHE') print 'cached value ("visible" view):', print vars(visibleview).get('testcachedfoobar', 'NOCACHE') print '' print '= no effect on other view' immutableview = repo.filtered('immutable') print 'cached value ("immutable" view):', print vars(immutableview).get('testcachedfoobar', 'NOCACHE') print 'access:', immutableview.testcachedfoobar print 'calllog:', calllog print 'cached value (unfiltered):', print vars(repo).get('testcachedfoobar', 'NOCACHE') print 'cached value ("visible" view):', print vars(visibleview).get('testcachedfoobar', 'NOCACHE') print 'cached value ("immutable" view):', print vars(immutableview).get('testcachedfoobar', 'NOCACHE') # unfiltered property cache test print '' print '' print '=== unfiltered property cache ===' print '' print 'unficalllog:', unficalllog print 'cached value (unfiltered): ', print vars(repo).get('testcachedunfifoobar', 'NOCACHE') print 'cached value ("visible" view): ', print vars(visibleview).get('testcachedunfifoobar', 'NOCACHE') print 'cached value ("immutable" view):', print 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): ', print 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): ', print 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): ', print vars(repo).get('testcachedunfifoobar', 'NOCACHE') print 'cached value ("visible" view): ', print vars(visibleview).get('testcachedunfifoobar', 'NOCACHE') print 'cached value ("immutable" view):', print vars(immutableview).get('testcachedunfifoobar', 'NOCACHE') print '' print '= even if we clear the unfiltered cache' del repo.__dict__['testcachedunfifoobar'] print 'cached value (unfiltered): ', print vars(repo).get('testcachedunfifoobar', 'NOCACHE') print 'cached value ("visible" view): ', print vars(visibleview).get('testcachedunfifoobar', 'NOCACHE') print 'cached value ("immutable" view):', print vars(immutableview).get('testcachedunfifoobar', 'NOCACHE') print 'unficalllog:', unficalllog print 'access ("visible" view): ', visibleview.testcachedunfifoobar print 'unficalllog:', unficalllog print 'cached value (unfiltered): ', print vars(repo).get('testcachedunfifoobar', 'NOCACHE') print 'cached value ("visible" view): ', print vars(visibleview).get('testcachedunfifoobar', 'NOCACHE') print 'cached value ("immutable" view):', print vars(immutableview).get('testcachedunfifoobar', 'NOCACHE') print 'access ("immutable" view):', immutableview.testcachedunfifoobar print 'unficalllog:', unficalllog print 'cached value (unfiltered): ', print vars(repo).get('testcachedunfifoobar', 'NOCACHE') print 'cached value ("visible" view): ', print vars(visibleview).get('testcachedunfifoobar', 'NOCACHE') print 'cached value ("immutable" view):', print vars(immutableview).get('testcachedunfifoobar', 'NOCACHE') print 'access (unfiltered): ', repo.testcachedunfifoobar print 'unficalllog:', unficalllog print 'cached value (unfiltered): ', print vars(repo).get('testcachedunfifoobar', 'NOCACHE') print 'cached value ("visible" view): ', print vars(visibleview).get('testcachedunfifoobar', 'NOCACHE') print 'cached value ("immutable" view):', print vars(immutableview).get('testcachedunfifoobar', 'NOCACHE')