changeset 20627:a42ea6d209e6

localrepo: add hook point to invalidate everything on each command-server run MQ extension will wrap this function to invalidate its state. repo.invalidate cannot be wrapped for this purpose because qpush obtains repo.lock in the middle of the operation, triggering repo.invalidate. Also, it seems wrong to obtain lock earlier because mq data is non-store parts.
author Yuya Nishihara <yuya@tcha.org>
date Mon, 03 Mar 2014 19:41:23 +0900
parents 7cbc6e228999
children e3d1df48fcc6
files mercurial/commandserver.py mercurial/localrepo.py
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commandserver.py	Sat Mar 01 20:08:41 2014 -0600
+++ b/mercurial/commandserver.py	Mon Mar 03 19:41:23 2014 +0900
@@ -188,8 +188,7 @@
         repoui = self.repoui.__class__(self.repoui)
         repoui.copy = copiedui.copy # redo copy protection
         self.repo.ui = self.repo.dirstate._ui = repoui
-        self.repo.invalidate()
-        self.repo.invalidatedirstate()
+        self.repo.invalidateall()
 
         req = dispatch.request(args[:], copiedui, self.repo, self.cin,
                                self.cout, self.cerr)
--- a/mercurial/localrepo.py	Sat Mar 01 20:08:41 2014 -0600
+++ b/mercurial/localrepo.py	Mon Mar 03 19:41:23 2014 +0900
@@ -993,6 +993,13 @@
                 pass
         self.invalidatecaches()
 
+    def invalidateall(self):
+        '''Fully invalidates both store and non-store parts, causing the
+        subsequent operation to reread any outside changes.'''
+        # extension should hook this to invalidate its caches
+        self.invalidate()
+        self.invalidatedirstate()
+
     def _lock(self, vfs, lockname, wait, releasefn, acquirefn, desc):
         try:
             l = lockmod.lock(vfs, lockname, 0, releasefn, desc=desc)