Mercurial > hg
changeset 33675:24b7c75c6441
bundle2: use bytestr() instead of str() to convert part id to bytes
This was exposed by trying to run previously-passing Python 3 tests.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 24 Jul 2017 11:28:40 -0400 |
| parents | 9a323773216c |
| children | 9f862fe7a8bd |
| files | mercurial/bundle2.py |
| diffstat | 1 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bundle2.py Mon Jul 24 11:20:08 2017 -0400 +++ b/mercurial/bundle2.py Mon Jul 24 11:28:40 2017 -0400 @@ -491,7 +491,8 @@ if output: outpart = op.reply.newpart('output', data=output, mandatory=False) - outpart.addparam('in-reply-to', str(part.id), mandatory=False) + outpart.addparam( + 'in-reply-to', pycompat.bytestr(part.id), mandatory=False) # If exiting or interrupted, do not attempt to seek the stream in the # finally block below. This makes abort faster. except (SystemExit, KeyboardInterrupt): @@ -1578,7 +1579,8 @@ # This is definitely not the final form of this # return. But one need to start somewhere. part = op.reply.newpart('reply:changegroup', mandatory=False) - part.addparam('in-reply-to', str(inpart.id), mandatory=False) + part.addparam( + 'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False) part.addparam('return', '%i' % ret, mandatory=False) assert not inpart.read() @@ -1641,7 +1643,8 @@ # This is definitely not the final form of this # return. But one need to start somewhere. part = op.reply.newpart('reply:changegroup') - part.addparam('in-reply-to', str(inpart.id), mandatory=False) + part.addparam( + 'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False) part.addparam('return', '%i' % ret, mandatory=False) try: real_part.validate() @@ -1784,7 +1787,8 @@ op.records.add('pushkey', record) if op.reply is not None: rpart = op.reply.newpart('reply:pushkey') - rpart.addparam('in-reply-to', str(inpart.id), mandatory=False) + rpart.addparam( + 'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False) rpart.addparam('return', '%i' % ret, mandatory=False) if inpart.mandatory and not ret: kwargs = {} @@ -1839,7 +1843,8 @@ op.records.add('obsmarkers', {'new': new}) if op.reply is not None: rpart = op.reply.newpart('reply:obsmarkers') - rpart.addparam('in-reply-to', str(inpart.id), mandatory=False) + rpart.addparam( + 'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False) rpart.addparam('new', '%i' % new, mandatory=False)