diff --git a/mercurial/help/internals/wireprotocol.txt b/mercurial/help/internals/wireprotocol.txt --- a/mercurial/help/internals/wireprotocol.txt +++ b/mercurial/help/internals/wireprotocol.txt @@ -638,10 +638,10 @@ ``0x01`` or ``0x02`` MUST be set to indicate this frame's role in a series of command request frames. -If command data frames are to be sent, ``0x10`` MUST be set on ALL +If command data frames are to be sent, ``0x08`` MUST be set on ALL command request frames. -Command Data (``0x03``) +Command Data (``0x02``) ----------------------- This frame contains raw data for a command. diff --git a/mercurial/wireprotoframing.py b/mercurial/wireprotoframing.py --- a/mercurial/wireprotoframing.py +++ b/mercurial/wireprotoframing.py @@ -42,7 +42,7 @@ } FRAME_TYPE_COMMAND_REQUEST = 0x01 -FRAME_TYPE_COMMAND_DATA = 0x03 +FRAME_TYPE_COMMAND_DATA = 0x02 FRAME_TYPE_BYTES_RESPONSE = 0x04 FRAME_TYPE_ERROR_RESPONSE = 0x05 FRAME_TYPE_TEXT_OUTPUT = 0x06 diff --git a/tests/test-wireproto-serverreactor.py b/tests/test-wireproto-serverreactor.py --- a/tests/test-wireproto-serverreactor.py +++ b/tests/test-wireproto-serverreactor.py @@ -185,7 +185,7 @@ ffs(b'1 1 stream-begin command-data 0 ignored')) self.assertaction(result, b'error') self.assertEqual(result[1], { - b'message': b'expected command request frame; got 3', + b'message': b'expected command request frame; got 2', }) def testunexpectedcommanddatareceiving(self):