wireproto: correctly escape batched args and responses (issue4739) This issue appears to be as old as wireproto batching itself: I can reproduce the failure as far back as 08ef6b5f3715 trivially by rebasing the test changes in this patch, which was back in the 1.9 era. I didn't test before that change, because prior to that the testfile has a different name and I'm lazy. Note that the test thought it was checking this case, but it actually wasn't: it put a literal ; in the arg and response for its greet command, but the mangle/unmangle step defined in the test meant that instead of "Fo, =;o" going over the wire, "Gp-!><p" went instead, which doesn't contain any special characters (those being [.=;]) and thus not exercising the escaping. The test has been updated to use pre-unmangled special characters, so the request is now "Fo+<:o", which mangles to "Gp,=;p". I have confirmed that the test fails without the adjustment to the escaping rules in wireproto.py. No existing clients of RPC batching were depending on the old behavior in any way. The only *actual* users of batchable RPCs in core were: 1) largefiles, wherein it batches up many statlfile calls. It sends hexlified hashes over the wire and gets a 0, 1, or 2 back as a response. No risk of special characters. 2) setdiscovery, which was using heads() and known(), both of which communicate via hexlified nodes. Again, no risk of special characters. Since the escaping functionality has been completely broken since it was introduced, we know that it has no users. As such, we can change the escaping mechanism without having to worry about backwards compatibility issues. For the curious, this was detected by chance: it happens that the lz4-compressed text of a test file for remotefilelog compressed to something containing a ;, which then caused the failure when I moved remotefilelog to using batching for file content fetching.

     1

hide outer repo

     2

  $ hg init

     3

     4

Invalid syntax: no value

     5

     6

  $ cat > .hg/hgrc << EOF

     7

  > novaluekey

     8

  > EOF

     9

  $ hg showconfig

    10

  hg: parse error at $TESTTMP/.hg/hgrc:1: novaluekey (glob)

    11

  [255]

    12

    13

Invalid syntax: no key

    14

    15

  $ cat > .hg/hgrc << EOF

    16

  > =nokeyvalue

    17

  > EOF

    18

  $ hg showconfig

    19

  hg: parse error at $TESTTMP/.hg/hgrc:1: =nokeyvalue (glob)

    20

  [255]

    21

    22

Test hint about invalid syntax from leading white space

    23

    24

  $ cat > .hg/hgrc << EOF

    25

  >  key=value

    26

  > EOF

    27

  $ hg showconfig

    28

  hg: parse error at $TESTTMP/.hg/hgrc:1:  key=value (glob)

    29

  unexpected leading whitespace

    30

  [255]

    31

    32

  $ cat > .hg/hgrc << EOF

    33

  >  [section]

    34

  > key=value

    35

  > EOF

    36

  $ hg showconfig

    37

  hg: parse error at $TESTTMP/.hg/hgrc:1:  [section] (glob)

    38

  unexpected leading whitespace

    39

  [255]

    40

    41

Reset hgrc

    42

    43

  $ echo > .hg/hgrc

    44

    45

Test case sensitive configuration

    46

    47

  $ cat <<EOF >> $HGRCPATH

    48

  > [Section]

    49

  > KeY = Case Sensitive

    50

  > key = lower case

    51

  > EOF

    52

    53

  $ hg showconfig Section

    54

  Section.KeY=Case Sensitive

    55

  Section.key=lower case

    56

    57

Test "%unset"

    58

    59

  $ cat >> $HGRCPATH <<EOF

    60

  > [unsettest]

    61

  > local-hgrcpath = should be unset (HGRCPATH)

    62

  > %unset local-hgrcpath

    63

  > 

    64

  > global = should be unset (HGRCPATH)

    65

  > 

    66

  > both = should be unset (HGRCPATH)

    67

  > 

    68

  > set-after-unset = should be unset (HGRCPATH)

    69

  > EOF

    70

    71

  $ cat >> .hg/hgrc <<EOF

    72

  > [unsettest]

    73

  > local-hgrc = should be unset (.hg/hgrc)

    74

  > %unset local-hgrc

    75

  > 

    76

  > %unset global

    77

  > 

    78

  > both = should be unset (.hg/hgrc)

    79

  > %unset both

    80

  > 

    81

  > set-after-unset = should be unset (.hg/hgrc)

    82

  > %unset set-after-unset

    83

  > set-after-unset = should be set (.hg/hgrc)

    84

  > EOF

    85

    86

  $ hg showconfig unsettest

    87

  unsettest.set-after-unset=should be set (.hg/hgrc)

    88

    89

Test exit code when no config matches

    90

    91

  $ hg config Section.idontexist

    92

  [1]