comparison mercurial/branchmap.py @ 42228:7c0ece3cd3ee

merge with stable
author Augie Fackler <augie@google.com>
date Tue, 23 Apr 2019 15:49:17 -0400
parents ececa45c80d8 07faf5c65190
children 9893d7aa7420
comparison
equal deleted inserted replaced
42227:c0e30c9ee5ba 42228:7c0ece3cd3ee
339 cachekey = [hex(self.tipnode), '%d' % self.tiprev] 339 cachekey = [hex(self.tipnode), '%d' % self.tiprev]
340 if self.filteredhash is not None: 340 if self.filteredhash is not None:
341 cachekey.append(hex(self.filteredhash)) 341 cachekey.append(hex(self.filteredhash))
342 f.write(" ".join(cachekey) + '\n') 342 f.write(" ".join(cachekey) + '\n')
343 nodecount = 0 343 nodecount = 0
344 for label, nodes in sorted(self.iteritems()): 344 for label, nodes in sorted(self._entries.iteritems()):
345 label = encoding.fromlocal(label) 345 label = encoding.fromlocal(label)
346 for node in nodes: 346 for node in nodes:
347 nodecount += 1 347 nodecount += 1
348 if node in self._closednodes: 348 if node in self._closednodes:
349 state = 'c' 349 state = 'c'