test: explicitly "add" file before some commit in test-filecache.py

`hg commit -A` will revert the `hg addremove` step if the commit fails. However
`hg rollback` currently does not.

We are about to improve internal consistency around transaction and dirstate and the behavior of `hg rollback` will align on the other behavior in the process.

Before doing so, we make sure the test is using a separate call to `hg add` to
avoid the test scenario to be affected by that future change.

note: the behavior change for `hg rollback` seems fine as it affect a niche
usecase and `hg rollback` usage have been strongly discouraged for a while.

tests/test-filecache.py

@@ -1,282 +1,282
 import os
 import stat
 import subprocess
 import sys
 
 if subprocess.call(
     [sys.executable, '%s/hghave' % os.environ['TESTDIR'], 'cacheable']
 ):
     sys.exit(80)
 
 print_ = print
 
 
 def print(*args, **kwargs):
     """print() wrapper that flushes stdout buffers to avoid py3 buffer issues
 
     We could also just write directly to sys.stdout.buffer the way the
     ui object will, but this was easier for porting the test.
     """
     print_(*args, **kwargs)
     sys.stdout.flush()
 
 
 from mercurial import (
     extensions,
     hg,
     localrepo,
     pycompat,
     ui as uimod,
     util,
     vfs as vfsmod,
 )
 
 
 class fakerepo:
     def __init__(self):
         self._filecache = {}
 
     class fakevfs:
         def join(self, p):
             return p
 
     vfs = fakevfs()
 
     def unfiltered(self):
         return self
 
     def sjoin(self, p):
         return p
 
     @localrepo.repofilecache('x', 'y')
     def cached(self):
         print('creating')
         return 'string from function'
 
     def invalidate(self):
         for k in self._filecache:
             try:
                 delattr(self, pycompat.sysstr(k))
             except AttributeError:
                 pass
 
 
 def basic(repo):
     print("* neither file exists")
     # calls function
     repo.cached
 
     repo.invalidate()
     print("* neither file still exists")
     # uses cache
     repo.cached
 
     # create empty file
     f = open('x', 'w')
     f.close()
     repo.invalidate()
     print("* empty file x created")
     # should recreate the object
     repo.cached
 
     f = open('x', 'w')
     f.write('a')
     f.close()
     repo.invalidate()
     print("* file x changed size")
     # should recreate the object
     repo.cached
 
     repo.invalidate()
     print("* nothing changed with either file")
     # stats file again, reuses object
     repo.cached
 
     # atomic replace file, size doesn't change
     # hopefully st_mtime doesn't change as well so this doesn't use the cache
     # because of inode change
     f = vfsmod.vfs(b'.')(b'x', b'w', atomictemp=True)
     f.write(b'b')
     f.close()
 
     repo.invalidate()
     print("* file x changed inode")
     repo.cached
 
     # create empty file y
     f = open('y', 'w')
     f.close()
     repo.invalidate()
     print("* empty file y created")
     # should recreate the object
     repo.cached
 
     f = open('y', 'w')
     f.write('A')
     f.close()
     repo.invalidate()
     print("* file y changed size")
     # should recreate the object
     repo.cached
 
     f = vfsmod.vfs(b'.')(b'y', b'w', atomictemp=True)
     f.write(b'B')
     f.close()
 
     repo.invalidate()
     print("* file y changed inode")
     repo.cached
 
     f = vfsmod.vfs(b'.')(b'x', b'w', atomictemp=True)
     f.write(b'c')
     f.close()
     f = vfsmod.vfs(b'.')(b'y', b'w', atomictemp=True)
     f.write(b'C')
     f.close()
 
     repo.invalidate()
     print("* both files changed inode")
     repo.cached
 
 
 def fakeuncacheable():
     def wrapcacheable(orig, *args, **kwargs):
         return False
 
     def wrapinit(orig, *args, **kwargs):
         pass
 
     originit = extensions.wrapfunction(util.cachestat, '__init__', wrapinit)
     origcacheable = extensions.wrapfunction(
         util.cachestat, 'cacheable', wrapcacheable
     )
 
     for fn in ['x', 'y']:
         try:
             os.remove(fn)
         except OSError:
             pass
 
     basic(fakerepo())
 
     util.cachestat.cacheable = origcacheable
     util.cachestat.__init__ = originit
 
 
 def test_filecache_synced():
     # test old behavior that caused filecached properties to go out of sync
-    os.system('hg init && echo a >> a && hg ci -qAm.')
+    os.system('hg init && echo a >> a && hg add a && hg ci -qm.')
     repo = hg.repository(uimod.ui.load())
     # first rollback clears the filecache, but changelog to stays in __dict__
     repo.rollback()
     repo.commit(b'.')
     # second rollback comes along and touches the changelog externally
     # (file is moved)
     repo.rollback()
     # but since changelog isn't under the filecache control anymore, we don't
     # see that it changed, and return the old changelog without reconstructing
     # it
     repo.commit(b'.')
 
 
 def setbeforeget(repo):
     os.remove('x')
     os.remove('y')
     repo.__class__.cached.set(repo, 'string set externally')
     repo.invalidate()
     print("* neither file exists")
     print(repo.cached)
     repo.invalidate()
     f = open('x', 'w')
     f.write('a')
     f.close()
     print("* file x created")
     print(repo.cached)
 
     repo.__class__.cached.set(repo, 'string 2 set externally')
     repo.invalidate()
     print("* string set externally again")
     print(repo.cached)
 
     repo.invalidate()
     f = open('y', 'w')
     f.write('b')
     f.close()
     print("* file y created")
     print(repo.cached)
 
 
 def antiambiguity():
     filename = 'ambigcheck'
 
     # try some times, because reproduction of ambiguity depends on
     # "filesystem time"
     for i in range(5):
         fp = open(filename, 'w')
         fp.write('FOO')
         fp.close()
 
         oldstat = os.stat(filename)
         if oldstat[stat.ST_CTIME] != oldstat[stat.ST_MTIME]:
             # subsequent changing never causes ambiguity
             continue
 
         repetition = 3
 
         # repeat changing via checkambigatclosing, to examine whether
         # st_mtime is advanced multiple times as expected
         for i in range(repetition):
             # explicit closing
             fp = vfsmod.checkambigatclosing(open(filename, 'a'))
             fp.write('FOO')
             fp.close()
 
             # implicit closing by "with" statement
             with vfsmod.checkambigatclosing(open(filename, 'a')) as fp:
                 fp.write('BAR')
 
         newstat = os.stat(filename)
         if oldstat[stat.ST_CTIME] != newstat[stat.ST_CTIME]:
             # timestamp ambiguity was naturally avoided while repetition
             continue
 
         # st_mtime should be advanced "repetition * 2" times, because
         # all changes occurred at same time (in sec)
         expected = (oldstat[stat.ST_MTIME] + repetition * 2) & 0x7FFFFFFF
         if newstat[stat.ST_MTIME] != expected:
             print(
                 "'newstat[stat.ST_MTIME] %s is not %s (as %s + %s * 2)"
                 % (
                     newstat[stat.ST_MTIME],
                     expected,
                     oldstat[stat.ST_MTIME],
                     repetition,
                 )
             )
 
         # no more examination is needed regardless of result
         break
     else:
         # This platform seems too slow to examine anti-ambiguity
         # of file timestamp (or test happened to be executed at
         # bad timing). Exit silently in this case, because running
         # on other faster platforms can detect problems
         pass
 
 
 print('basic:')
 print()
 basic(fakerepo())
 print()
 print('fakeuncacheable:')
 print()
 fakeuncacheable()
 test_filecache_synced()
 print()
 print('setbeforeget:')
 print()
 setbeforeget(fakerepo())
 print()
 print('antiambiguity:')
 print()
 antiambiguity()