Patchwork [3,of,8] localrepo: store path and vfs location of cached properties

login
register
mail settings
Submitter Katsunori FUJIWARA
Date June 29, 2017, 4:53 p.m.
Message ID <9114ae36f40b73391270.1498755190@speaknoevil>
Download mbox | patch
Permalink /patch/21825/
State Accepted
Headers show

Comments

Katsunori FUJIWARA - June 29, 2017, 4:53 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1498754869 -32400
#      Fri Jun 30 01:47:49 2017 +0900
# Node ID 9114ae36f40b733912705ef0bacb2961941f18d6
# Parent  de1d28aa7e7b94e01e109dcb26aecf073ce1fde7
localrepo: store path and vfs location of cached properties

This information is used to make transaction handle these files
specially, in order to avoid file stat ambiguity of them.

Gathering information about cached files via annotation classes can
avoid overlooking properties newly introduced in the future.

Patch

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -66,6 +66,11 @@  release = lockmod.release
 urlerr = util.urlerr
 urlreq = util.urlreq
 
+# set of (path, vfs-location) tuples. vfs-location is:
+# - 'plain for vfs relative paths
+# - '' for svfs relative paths
+_cachedfiles = set()
+
 class _basefilecache(scmutil.filecache):
     """All filecache usage on repo are done for logic that should be unfiltered
     """
@@ -80,11 +85,21 @@  class _basefilecache(scmutil.filecache):
 
 class repofilecache(_basefilecache):
     """filecache for files in .hg but outside of .hg/store"""
+    def __init__(self, *paths):
+        super(repofilecache, self).__init__(*paths)
+        for path in paths:
+            _cachedfiles.add((path, 'plain'))
+
     def join(self, obj, fname):
         return obj.vfs.join(fname)
 
 class storecache(_basefilecache):
     """filecache for files in the store"""
+    def __init__(self, *paths):
+        super(storecache, self).__init__(*paths)
+        for path in paths:
+            _cachedfiles.add((path, ''))
+
     def join(self, obj, fname):
         return obj.sjoin(fname)