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

SVN-fs-dump-format-version: 2

     2

     3

UUID: b70c45d5-2b76-4722-a373-d9babae61626

     4

     5

Revision-number: 0

     6

Prop-content-length: 260

     7

Content-length: 260

     8

     9

K 8

    10

svn:date

    11

V 27

    12

2012-04-18T11:35:14.752409Z

    13

K 17

    14

svn:sync-from-url

    15

V 73

    16

file:///Users/pmezard/dev/hg/hg-pmezard/tests/svn/temp/svn-repo/trunk/dir

    17

K 18

    18

svn:sync-from-uuid

    19

V 36

    20

56625b9e-e7e9-45be-ab61-052d41f0e1dd

    21

K 24

    22

svn:sync-last-merged-rev

    23

V 1

    24

4

    25

PROPS-END

    26

    27

Revision-number: 1

    28

Prop-content-length: 112

    29

Content-length: 112

    30

    31

K 10

    32

svn:author

    33

V 7

    34

pmezard

    35

K 8

    36

svn:date

    37

V 27

    38

2012-04-18T11:35:14.769622Z

    39

K 7

    40

svn:log

    41

V 10

    42

init projA

    43

PROPS-END

    44

    45

Node-path: trunk

    46

Node-kind: dir

    47

Node-action: add

    48

Prop-content-length: 10

    49

Content-length: 10

    50

    51

PROPS-END

    52

    53

    54

Revision-number: 2

    55

Prop-content-length: 107

    56

Content-length: 107

    57

    58

K 10

    59

svn:author

    60

V 7

    61

pmezard

    62

K 8

    63

svn:date

    64

V 27

    65

2012-04-18T11:35:15.052989Z

    66

K 7

    67

svn:log

    68

V 6

    69

adddir

    70

PROPS-END

    71

    72

Node-path: trunk/dir

    73

Node-kind: dir

    74

Node-action: add

    75

Prop-content-length: 10

    76

Content-length: 10

    77

    78

PROPS-END

    79

    80

    81

Node-path: trunk/dir/a

    82

Node-kind: file

    83

Node-action: add

    84

Prop-content-length: 10

    85

Text-content-length: 2

    86

Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3

    87

Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b

    88

Content-length: 12

    89

    90

PROPS-END

    91

a

    92

    93

    94

Revision-number: 3

    95

Prop-content-length: 105

    96

Content-length: 105

    97

    98

K 10

    99

svn:author

   100

V 7

   101

pmezard

   102

K 8

   103

svn:date

   104

V 27

   105

2012-04-18T11:35:16.050353Z

   106

K 7

   107

svn:log

   108

V 4

   109

addb

   110

PROPS-END

   111

   112

Revision-number: 4

   113

Prop-content-length: 105

   114

Content-length: 105

   115

   116

K 10

   117

svn:author

   118

V 7

   119

pmezard

   120

K 8

   121

svn:date

   122

V 27

   123

2012-04-18T11:35:17.050768Z

   124

K 7

   125

svn:log

   126

V 4

   127

addc

   128

PROPS-END

   129