Mercurial > hg
view tests/test-propertycache.py @ 23259:9f4778027bc2
addremove: add back forgotten files (BC)
After running "hg forget README && hg addremove", README will still be
reported as removed, while "hg forget README && hg add README" adds it
back so it gets reported as clean. It seems like they should behave
the same. Furthermore, it seems like no files should remain untracked
after 'hg addremove && hg commit' (or 'hg commit -A'). For these
reasons, change the behavior of addremove so it does add forgotten
files back.
The problem is with scmutil._interestingfiles(), which reports the
file as removed, so scmutil.addremove() does not add it. Fix by
teaching _interestingfiles() to report forgotten files separately from
removed files and make addremove() add forgotten files back. However,
do not treat forgotten files as sources for rename detection. Note
that since removed and forgotten files are treated the same before
this change, forgotten files were considered sources for rename
detection.
Also update the other caller, marktouched(), in the same way as
addremove().
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Sat, 08 Nov 2014 23:13:39 -0800 |
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')