Mercurial > public > mercurial-scm > hg
comparison mercurial/branchmap.py @ 40232:d99a588d8515
py3: pass in system string to vars(branchmap).__contains__()
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 13 Oct 2018 10:58:06 +0200 |
| parents | 8547c8590ac1 |
| children | 5644f7c8982e |
comparison
equal
deleted
inserted
replaced
| 40231:58d785679e15 | 40232:d99a588d8515 |
|---|---|
| 478 # the cache was bypassing itself by setting: | 478 # the cache was bypassing itself by setting: |
| 479 # | 479 # |
| 480 # self.branchinfo = self._branchinfo | 480 # self.branchinfo = self._branchinfo |
| 481 # | 481 # |
| 482 # Since we now have data in the cache, we need to drop this bypassing. | 482 # Since we now have data in the cache, we need to drop this bypassing. |
| 483 if 'branchinfo' in vars(self): | 483 if r'branchinfo' in vars(self): |
| 484 del self.branchinfo | 484 del self.branchinfo |
| 485 | 485 |
| 486 def _setcachedata(self, rev, node, branchidx): | 486 def _setcachedata(self, rev, node, branchidx): |
| 487 """Writes the node's branch data to the in-memory cache data.""" | 487 """Writes the node's branch data to the in-memory cache data.""" |
| 488 if rev == nullrev: | 488 if rev == nullrev: |