comparison mercurial/obsolete.py @ 36423:2831d918e1b4

py3: convert known-int values to bytes using %d I decided to grep around for \sstr\( and see what low-hanging fruit that showed me. This was part of that hunt. That grep pattern still has some things worth exploring. Differential Revision: https://phab.mercurial-scm.org/D2441
author Augie Fackler <augie@google.com>
date Sun, 25 Feb 2018 23:09:07 -0500
parents 75d9dcb64e7d
children c6061cadb400
comparison
equal deleted inserted replaced
36422:04c319a07c7b 36423:2831d918e1b4
654 self._addmarkers(new, data) 654 self._addmarkers(new, data)
655 # new marker *may* have changed several set. invalidate the cache. 655 # new marker *may* have changed several set. invalidate the cache.
656 self.caches.clear() 656 self.caches.clear()
657 # records the number of new markers for the transaction hooks 657 # records the number of new markers for the transaction hooks
658 previous = int(transaction.hookargs.get('new_obsmarkers', '0')) 658 previous = int(transaction.hookargs.get('new_obsmarkers', '0'))
659 transaction.hookargs['new_obsmarkers'] = str(previous + len(new)) 659 transaction.hookargs['new_obsmarkers'] = '%d' % (previous + len(new))
660 return len(new) 660 return len(new)
661 661
662 def mergemarkers(self, transaction, data): 662 def mergemarkers(self, transaction, data):
663 """merge a binary stream of markers inside the obsstore 663 """merge a binary stream of markers inside the obsstore
664 664