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

  $ echo "[extensions]" >> $HGRCPATH

     2

  $ echo "mq=" >> $HGRCPATH

     3

     4

  $ hg init a

     5

  $ cd a

     6

  $ echo a > a

     7

  $ hg ci -Ama

     8

  adding a

     9

    10

  $ hg qnew a.patch

    11

  $ echo a >> a

    12

  $ hg qrefresh

    13

    14

  $ hg qnew b.patch

    15

  $ echo b > b

    16

  $ hg add b

    17

  $ hg qrefresh

    18

    19

  $ hg qnew c.patch

    20

  $ echo c > c

    21

  $ hg add c

    22

  $ hg qrefresh

    23

    24

  $ hg qgoto a.patch

    25

  popping c.patch

    26

  popping b.patch

    27

  now at: a.patch

    28

    29

  $ hg qgoto c.patch

    30

  applying b.patch

    31

  applying c.patch

    32

  now at: c.patch

    33

    34

  $ hg qgoto b.patch

    35

  popping c.patch

    36

  now at: b.patch

    37

    38

Using index:

    39

    40

  $ hg qgoto 0

    41

  popping b.patch

    42

  now at: a.patch

    43

    44

  $ hg qgoto 2

    45

  applying b.patch

    46

  applying c.patch

    47

  now at: c.patch

    48

    49

No warnings when using index ... and update from non-qtip and with pending

    50

changes in unrelated files:

    51

    52

  $ hg qnew bug314159

    53

  $ echo d >> c

    54

  $ hg qrefresh

    55

  $ hg qnew bug141421

    56

  $ echo e >> b

    57

  $ hg qrefresh

    58

    59

  $ hg up -r bug314159

    60

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    61

  $ echo f >> a

    62

  $ echo f >> b

    63

  $ echo f >> c

    64

    65

  $ hg qgoto 1

    66

  abort: local changes found, refresh first

    67

  [255]

    68

  $ hg qgoto 1 -f

    69

  popping bug141421

    70

  popping bug314159

    71

  popping c.patch

    72

  now at: b.patch

    73

  $ hg st

    74

  M a

    75

  M b

    76

  ? c.orig

    77

  $ hg up -qCr.

    78

    79

  $ hg qgoto 3

    80

  applying c.patch

    81

  applying bug314159

    82

  now at: bug314159

    83

    84

Detect ambiguous non-index:

    85

    86

  $ hg qgoto 14

    87

  patch name "14" is ambiguous:

    88

    bug314159

    89

    bug141421

    90

  abort: patch 14 not in series

    91

  [255]

    92

    93

  $ cd ..