diff mercurial/localrepo.py @ 40296:e787d97e90ad

py3: fix test-dirstate-race.t Differential Revision: https://phab.mercurial-scm.org/D5106
author Mark Thomas <mbthomas@fb.com>
date Sun, 14 Oct 2018 14:02:32 +0000
parents 9d5ddf55415b
children 6637b079ae45
line wrap: on
line diff
--- a/mercurial/localrepo.py	Fri Oct 12 18:49:11 2018 +0200
+++ b/mercurial/localrepo.py	Sun Oct 14 14:02:32 2018 +0000
@@ -2067,13 +2067,13 @@
         rereads the dirstate. Use dirstate.invalidate() if you want to
         explicitly read the dirstate again (i.e. restoring it to a previous
         known good state).'''
-        if hasunfilteredcache(self, 'dirstate'):
+        if hasunfilteredcache(self, r'dirstate'):
             for k in self.dirstate._filecache:
                 try:
                     delattr(self.dirstate, k)
                 except AttributeError:
                     pass
-            delattr(self.unfiltered(), 'dirstate')
+            delattr(self.unfiltered(), r'dirstate')
 
     def invalidate(self, clearfilecache=False):
         '''Invalidates both store and non-store parts other than dirstate