# HG changeset patch # User Augie Fackler <au...@google.com> # Date 1500909392 14400 # Mon Jul 24 11:16:32 2017 -0400 # Node ID 73208fb1aea975f0d50168860d5bd691cbbad7e7 # Parent f50da59f7977c7d796850b95ac7c80a4fd92bd18 bundle2: correct %s to %d since part ids are integers
Fixes some Python 3 regressions. diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py --- a/mercurial/bundle2.py +++ b/mercurial/bundle2.py @@ -976,7 +976,7 @@ class bundlepart(object): parttype = self.type.upper() else: parttype = self.type.lower() - outdebug(ui, 'part %s: "%s"' % (self.id, parttype)) + outdebug(ui, 'part %d: "%s"' % (self.id, parttype)) ## parttype header = [_pack(_fparttypesize, len(parttype)), parttype, _pack(_fpartid, self.id), @@ -1213,7 +1213,7 @@ class unbundlepart(unpackermixin): self.type = self._fromheader(typesize) indebug(self.ui, 'part type: "%s"' % self.type) self.id = self._unpackheader(_fpartid)[0] - indebug(self.ui, 'part id: "%s"' % self.id) + indebug(self.ui, 'part id: "%d"' % self.id) # extract mandatory bit from type self.mandatory = (self.type != self.type.lower()) self.type = self.type.lower() _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel