From patchwork Thu Feb  1 20:05:51 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D1898: localrepo: consistently use native str when __dict__ is
 involved
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 27112
Message-Id: <58f03b52a94765a19335e059cec8fb07@localhost.localdomain>
To: mercurial-devel@mercurial-scm.org
Date: Thu, 1 Feb 2018 20:05:51 +0000

durin42 updated this revision to Diff 5043.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1898?vs=4950&id=5043

REVISION DETAIL
  https://phab.mercurial-scm.org/D1898

AFFECTED FILES
  mercurial/localrepo.py

CHANGE DETAILS




To: durin42, #hg-reviewers, pulkit
Cc: mercurial-devel

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1574,7 +1574,8 @@
     def _refreshfilecachestats(self, tr):
         """Reload stats of cached files so that they are flagged as valid"""
         for k, ce in self._filecache.items():
-            if k == 'dirstate' or k not in self.__dict__:
+            k = pycompat.sysstr(k)
+            if k == r'dirstate' or k not in self.__dict__:
                 continue
             ce.refresh()