wireprotov2: change how revisions are specified to changesetdata Right now, we have a handful of arguments for specifying the revisions whose data should be returned. Defining how all these arguments interact when various combinations are present is difficult. This commit establishes a new, generic mechanism for specifying revisions. Instead of a hodgepodge of arguments defining things, we have a list of dicts that specify revision selectors. The final set of revisions is a union of all these selectors. We implement support for specifying revisions based on: * An explicit list of changeset revisions * An explicit list of changeset revisions plus ancestry depth * A DAG range between changeset roots and heads If you squint hard enough, this problem has already been solved by revsets. But I'm reluctant to expose revsets to the wire protocol because that would require servers to implement a revset parser. Plus there are security and performance implications: the set of revision selectors needs to be narrowly and specifically tailored for what is appropriate to be executing on a server. Perhaps there would be a way for us to express the "parse tree" of a revset query, for example. I'm not sure. We can explore this space another time. For now, the new mechanism should bring sufficient flexibility while remaining relatively simple. The selector "types" are prefixed with "changeset" because I plan to add manifest and file-flavored selectors as well. This will enable us to e.g. select file revisions based on a range of changeset revisions. Differential Revision: https://phab.mercurial-scm.org/D4979

     1

  $ hg init empty-repo

     2

  $ cd empty-repo

     3

     4

Flags on revlog version 0 are rejected

     5

     6

  >>> with open('.hg/store/00changelog.i', 'wb') as fh:

     7

  ...     fh.write(b'\x00\x01\x00\x00') and None

     8

     9

  $ hg log

    10

  abort: unknown flags (0x01) in version 0 revlog 00changelog.i!

    11

  [255]

    12

    13

Unknown flags on revlog version 1 are rejected

    14

    15

  >>> with open('.hg/store/00changelog.i', 'wb') as fh:

    16

  ...     fh.write(b'\x00\x04\x00\x01') and None

    17

    18

  $ hg log

    19

  abort: unknown flags (0x04) in version 1 revlog 00changelog.i!

    20

  [255]

    21

    22

Unknown version is rejected

    23

    24

  >>> with open('.hg/store/00changelog.i', 'wb') as fh:

    25

  ...     fh.write(b'\x00\x00\x00\x02') and None

    26

    27

  $ hg log

    28

  abort: unknown version (2) in revlog 00changelog.i!

    29

  [255]

    30

    31

  $ cd ..

    32

    33

Test for CVE-2016-3630

    34

    35

  $ hg init

    36

    37

  >>> open("a.i", "wb").write(

    38

  ... b"""eJxjYGZgZIAAYQYGxhgom+k/FMx8YKx9ZUaKSOyqo4cnuKb8mbqHV5cBCVTMWb1Cwqkhe4Gsg9AD

    39

  ... Joa3dYtcYYYBAQ8Qr4OqZAYRICPTSr5WKd/42rV36d+8/VmrNpv7NP1jQAXrQE4BqQUARngwVA=="""

    40

  ... .decode("base64").decode("zlib")) and None

    41

    42

  $ hg debugrevlogindex a.i

    43

     rev linkrev nodeid       p1           p2

    44

       0       2 99e0332bd498 000000000000 000000000000

    45

       1       3 6674f57a23d8 99e0332bd498 000000000000

    46

    47

  >>> from mercurial import revlog, vfs

    48

  >>> tvfs = vfs.vfs(b'.')

    49

  >>> tvfs.options = {b'revlogv1': True}

    50

  >>> rl = revlog.revlog(tvfs, b'a.i')

    51

  >>> rl.revision(1)

    52

  mpatchError('patch cannot be decoded',)