Patchwork D3383: wireprotov2: change frame type value for command data

login
register
mail settings
Submitter phabricator
Date April 15, 2018, 12:22 a.m.
Message ID <differential-rev-PHID-DREV-gbpqqrlimy3fdit6k7bj-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/31063/
State Superseded
Headers show

Comments

phabricator - April 15, 2018, 12:22 a.m.
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  When we dropped the dedicated command argument frame type, this left
  a hole in our frame type numbering. Let's start plugging that hole.
  
  The command data frame is now type value 2 instead of 3.
  
  There was limited test fallout because a) we do a good job of using
  the constants to refer to frame types b) not many tests are sending
  command data frames.
  
  Bumping the media type will be performed in a later commit, once all
  type value adjustment has been performed.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3383

AFFECTED FILES
  mercurial/help/internals/wireprotocol.txt
  mercurial/wireprotoframing.py
  tests/test-wireproto-serverreactor.py

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

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):
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/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.