# HG changeset patch # User Yuya Nishihara # Date 2018-10-16 06:29:24 # Node ID dee73a97e1321d129852d51a1a9b3ced6ced17ef # Parent 558114fa7bc1749ee5493e01abc5f44b2c60c301 py3: invalidate repository cache with system-string keys # skip-blame just a few r'' prefixes diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -3511,9 +3511,9 @@ def reposetup(ui, repo): def invalidateall(self): super(mqrepo, self).invalidateall() - if localrepo.hasunfilteredcache(self, 'mq'): + if localrepo.hasunfilteredcache(self, r'mq'): # recreate mq in case queue path was changed - delattr(self.unfiltered(), 'mq') + delattr(self.unfiltered(), r'mq') def abortifwdirpatched(self, errmsg, force=False): if self.mq.applied and self.mq.checkapplied and not force: diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -2047,9 +2047,9 @@ class localrepository(object): def invalidatecaches(self): - if '_tagscache' in vars(self): + if r'_tagscache' in vars(self): # can't use delattr on proxy - del self.__dict__['_tagscache'] + del self.__dict__[r'_tagscache'] self.unfiltered()._branchcaches.clear() self.invalidatevolatilesets()