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 'strip =' >> $HGRCPATH

     3

     4

  $ cat >findbranch.py <<EOF

     5

  > import re, sys

     6

  > 

     7

  > head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$')

     8

  > 

     9

  > for line in sys.stdin:

    10

  >     hmatch = head_re.match(line)

    11

  >     if not hmatch:

    12

  >         sys.exit(1)

    13

  >     if hmatch.group(1) == 'Branch':

    14

  >         sys.exit(0)

    15

  > sys.exit(1)

    16

  > EOF

    17

    18

  $ hg init a

    19

  $ cd a

    20

  $ echo "Rev 1" >rev

    21

  $ hg add rev

    22

  $ hg commit -m "No branch."

    23

  $ hg branch abranch

    24

  marked working directory as branch abranch

    25

  (branches are permanent and global, did you want a bookmark?)

    26

  $ echo "Rev  2" >rev

    27

  $ hg commit -m "With branch."

    28

    29

  $ hg export 0 > ../r0.patch

    30

  $ hg export 1 > ../r1.patch

    31

  $ cd ..

    32

    33

  $ if python findbranch.py < r0.patch; then

    34

  >     echo "Export of default branch revision has Branch header" 1>&2

    35

  >     exit 1

    36

  > fi

    37

    38

  $ if python findbranch.py < r1.patch; then

    39

  >     :  # Do nothing

    40

  > else

    41

  >     echo "Export of branch revision is missing Branch header" 1>&2

    42

  >     exit 1

    43

  > fi

    44

    45

Make sure import still works with branch information in patches.

    46

    47

  $ hg init b

    48

  $ cd b

    49

  $ hg import ../r0.patch

    50

  applying ../r0.patch

    51

  $ hg import ../r1.patch

    52

  applying ../r1.patch

    53

  $ cd ..

    54

    55

  $ hg init c

    56

  $ cd c

    57

  $ hg import --exact --no-commit ../r0.patch

    58

  applying ../r0.patch

    59

  warning: can't check exact import with --no-commit

    60

  $ hg st

    61

  A rev

    62

  $ hg revert -a

    63

  forgetting rev

    64

  $ rm rev

    65

  $ hg import --exact ../r0.patch

    66

  applying ../r0.patch

    67

  $ hg import --exact ../r1.patch

    68

  applying ../r1.patch

    69

    70

Test --exact and patch header separators (issue3356)

    71

    72

  $ hg strip --no-backup .

    73

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

    74

  >>> import re

    75

  >>> p = file('../r1.patch', 'rb').read()

    76

  >>> p = re.sub(r'Parent\s+', 'Parent ', p)

    77

  >>> file('../r1-ws.patch', 'wb').write(p)

    78

  $ hg import --exact ../r1-ws.patch

    79

  applying ../r1-ws.patch

    80

    81

  $ cd ..