wireproto: separate commands tables for version 1 and 2 commands We can't easily reuse existing command handlers for version 2 commands because the response types will be different. e.g. many commands return nodes encoded as hex. Our new wire protocol is binary safe, so we'll wish to encode nodes as binary. We /could/ teach each command handler to look at the protocol handler and change behavior based on the version in use. However, this would make logic a bit unwieldy over time and would make it harder to design a unified protocol handler interface. I think it's better to create a clean break between version 1 and version 2 of commands on the server. What I imagine happening is we will have separate @wireprotocommand functions for each protocol generation. Those functions will parse the request, dispatch to a common function to process it, then generate the response in its own, transport-specific manner. This commit establishes a separate table for tracking version 1 commands from version 2 commands. The HTTP server pieces have been updated to use this new table. Most commands are marked as both version 1 and version 2, so there is little practical impact to this change. A side-effect of this change is we now rely on transport registration in wireprototypes.TRANSPORTS and certain properties of the protocol interface. So a test had to be updated to conform. Differential Revision: https://phab.mercurial-scm.org/D2982

     1

from __future__ import absolute_import, print_function

     2

import os

     3

from mercurial import (

     4

    dispatch,

     5

)

     6

     7

def testdispatch(cmd):

     8

    """Simple wrapper around dispatch.dispatch()

     9

    10

    Prints command and result value, but does not handle quoting.

    11

    """

    12

    print(b"running: %s" % (cmd,))

    13

    req = dispatch.request(cmd.split())

    14

    result = dispatch.dispatch(req)

    15

    print(b"result: %r" % (result,))

    16

    17

testdispatch(b"init test1")

    18

os.chdir('test1')

    19

    20

# create file 'foo', add and commit

    21

f = open('foo', 'wb')

    22

f.write(b'foo\n')

    23

f.close()

    24

testdispatch(b"add foo")

    25

testdispatch(b"commit -m commit1 -d 2000-01-01 foo")

    26

    27

# append to file 'foo' and commit

    28

f = open('foo', 'ab')

    29

f.write(b'bar\n')

    30

f.close()

    31

testdispatch(b"commit -m commit2 -d 2000-01-02 foo")

    32

    33

# check 88803a69b24 (fancyopts modified command table)

    34

testdispatch(b"log -r 0")

    35

testdispatch(b"log -r tip")