Show More
@@ -491,7 +491,8 b' def _processpart(op, part):' | |||||
491 | if output: |
|
491 | if output: | |
492 | outpart = op.reply.newpart('output', data=output, |
|
492 | outpart = op.reply.newpart('output', data=output, | |
493 | mandatory=False) |
|
493 | mandatory=False) | |
494 | outpart.addparam('in-reply-to', str(part.id), mandatory=False) |
|
494 | outpart.addparam( | |
|
495 | 'in-reply-to', pycompat.bytestr(part.id), mandatory=False) | |||
495 | # If exiting or interrupted, do not attempt to seek the stream in the |
|
496 | # If exiting or interrupted, do not attempt to seek the stream in the | |
496 | # finally block below. This makes abort faster. |
|
497 | # finally block below. This makes abort faster. | |
497 | except (SystemExit, KeyboardInterrupt): |
|
498 | except (SystemExit, KeyboardInterrupt): | |
@@ -1578,7 +1579,8 b' def handlechangegroup(op, inpart):' | |||||
1578 | # This is definitely not the final form of this |
|
1579 | # This is definitely not the final form of this | |
1579 | # return. But one need to start somewhere. |
|
1580 | # return. But one need to start somewhere. | |
1580 | part = op.reply.newpart('reply:changegroup', mandatory=False) |
|
1581 | part = op.reply.newpart('reply:changegroup', mandatory=False) | |
1581 | part.addparam('in-reply-to', str(inpart.id), mandatory=False) |
|
1582 | part.addparam( | |
|
1583 | 'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False) | |||
1582 | part.addparam('return', '%i' % ret, mandatory=False) |
|
1584 | part.addparam('return', '%i' % ret, mandatory=False) | |
1583 | assert not inpart.read() |
|
1585 | assert not inpart.read() | |
1584 |
|
1586 | |||
@@ -1641,7 +1643,8 b' def handleremotechangegroup(op, inpart):' | |||||
1641 | # This is definitely not the final form of this |
|
1643 | # This is definitely not the final form of this | |
1642 | # return. But one need to start somewhere. |
|
1644 | # return. But one need to start somewhere. | |
1643 | part = op.reply.newpart('reply:changegroup') |
|
1645 | part = op.reply.newpart('reply:changegroup') | |
1644 | part.addparam('in-reply-to', str(inpart.id), mandatory=False) |
|
1646 | part.addparam( | |
|
1647 | 'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False) | |||
1645 | part.addparam('return', '%i' % ret, mandatory=False) |
|
1648 | part.addparam('return', '%i' % ret, mandatory=False) | |
1646 | try: |
|
1649 | try: | |
1647 | real_part.validate() |
|
1650 | real_part.validate() | |
@@ -1784,7 +1787,8 b' def handlepushkey(op, inpart):' | |||||
1784 | op.records.add('pushkey', record) |
|
1787 | op.records.add('pushkey', record) | |
1785 | if op.reply is not None: |
|
1788 | if op.reply is not None: | |
1786 | rpart = op.reply.newpart('reply:pushkey') |
|
1789 | rpart = op.reply.newpart('reply:pushkey') | |
1787 | rpart.addparam('in-reply-to', str(inpart.id), mandatory=False) |
|
1790 | rpart.addparam( | |
|
1791 | 'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False) | |||
1788 | rpart.addparam('return', '%i' % ret, mandatory=False) |
|
1792 | rpart.addparam('return', '%i' % ret, mandatory=False) | |
1789 | if inpart.mandatory and not ret: |
|
1793 | if inpart.mandatory and not ret: | |
1790 | kwargs = {} |
|
1794 | kwargs = {} | |
@@ -1839,7 +1843,8 b' def handleobsmarker(op, inpart):' | |||||
1839 | op.records.add('obsmarkers', {'new': new}) |
|
1843 | op.records.add('obsmarkers', {'new': new}) | |
1840 | if op.reply is not None: |
|
1844 | if op.reply is not None: | |
1841 | rpart = op.reply.newpart('reply:obsmarkers') |
|
1845 | rpart = op.reply.newpart('reply:obsmarkers') | |
1842 | rpart.addparam('in-reply-to', str(inpart.id), mandatory=False) |
|
1846 | rpart.addparam( | |
|
1847 | 'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False) | |||
1843 | rpart.addparam('new', '%i' % new, mandatory=False) |
|
1848 | rpart.addparam('new', '%i' % new, mandatory=False) | |
1844 |
|
1849 | |||
1845 |
|
1850 |
General Comments 0
You need to be logged in to leave comments.
Login now