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

#require bzr bzr114

     2

     3

  $ . "$TESTDIR/bzr-definitions"

     4

     5

The file/directory replacement can only be reproduced on

     6

bzr >= 1.4. Merge it back in test-convert-bzr-directories once

     7

this version becomes mainstream.

     8

replace file with dir

     9

    10

  $ mkdir test-replace-file-with-dir

    11

  $ cd test-replace-file-with-dir

    12

  $ bzr init -q source

    13

  $ cd source

    14

  $ echo d > d

    15

  $ bzr add -q d

    16

  $ bzr commit -q -m 'add d file'

    17

  $ rm d

    18

  $ mkdir d

    19

  $ bzr add -q d

    20

  $ bzr commit -q -m 'replace with d dir'

    21

  $ echo a > d/a

    22

  $ bzr add -q d/a

    23

  $ bzr commit -q -m 'add d/a'

    24

  $ cd ..

    25

  $ hg convert source source-hg

    26

  initializing destination source-hg repository

    27

  scanning source...

    28

  sorting...

    29

  converting...

    30

  2 add d file

    31

  1 replace with d dir

    32

  0 add d/a

    33

  $ manifest source-hg tip

    34

  % manifest of tip

    35

  644   d/a

    36

  $ cd source-hg

    37

  $ hg update

    38

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

    39

  $ cd ../..