# HG changeset patch # User Yuya Nishihara # Date 1539421086 -7200 # Node ID d99a588d8515ee07a5e2ddb9e715fb8c6cc45b38 # Parent 58d785679e158dcf460df8cffc32b7be4b36ea83 py3: pass in system string to vars(branchmap).__contains__() diff -r 58d785679e15 -r d99a588d8515 mercurial/branchmap.py --- a/mercurial/branchmap.py Sat Oct 13 08:48:59 2018 +0000 +++ b/mercurial/branchmap.py Sat Oct 13 10:58:06 2018 +0200 @@ -480,7 +480,7 @@ # self.branchinfo = self._branchinfo # # Since we now have data in the cache, we need to drop this bypassing. - if 'branchinfo' in vars(self): + if r'branchinfo' in vars(self): del self.branchinfo def _setcachedata(self, rev, node, branchidx):