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

Test update logic when there are renames

     2

     3

Update with local changes across a file rename

     4

     5

  $ hg init

     6

     7

  $ echo a > a

     8

  $ hg add a

     9

  $ hg ci -m a

    10

    11

  $ hg mv a b

    12

  $ hg ci -m rename

    13

    14

  $ echo b > b

    15

  $ hg ci -m change

    16

    17

  $ hg up -q 0

    18

    19

  $ echo c > a

    20

    21

  $ hg up

    22

  merging a and b to b

    23

  warning: conflicts during merge.

    24

  merging b incomplete! (edit conflicts, then use 'hg resolve --mark')

    25

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

    26

  use 'hg resolve' to retry unresolved file merges

    27

  [1]