From patchwork Thu Feb  1 20:39:33 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D1896: obsolete: use native string when peeking in __dict__
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 27133
Message-Id: <67d1ad309e4a82f4bbcf5c53670d8566@localhost.localdomain>
To: mercurial-devel@mercurial-scm.org
Date: Thu, 1 Feb 2018 20:39:33 +0000

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3cec0055969b: obsolete: use native string when peeking in __dict__ (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1896?vs=4886&id=5067

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

AFFECTED FILES
  mercurial/obsolete.py

CHANGE DETAILS




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

diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py
--- a/mercurial/obsolete.py
+++ b/mercurial/obsolete.py
@@ -570,7 +570,7 @@
         return len(self._all)
 
     def __nonzero__(self):
-        if not self._cached('_all'):
+        if not self._cached(r'_all'):
             try:
                 return self.svfs.stat('obsstore').st_size > 1
             except OSError as inst:
@@ -727,11 +727,11 @@
         markers = list(markers) # to allow repeated iteration
         self._data = self._data + rawdata
         self._all.extend(markers)
-        if self._cached('successors'):
+        if self._cached(r'successors'):
             _addsuccessors(self.successors, markers)
-        if self._cached('predecessors'):
+        if self._cached(r'predecessors'):
             _addpredecessors(self.predecessors, markers)
-        if self._cached('children'):
+        if self._cached(r'children'):
             _addchildren(self.children, markers)
         _checkinvalidmarkers(markers)