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

Failed qimport of patches from files should cleanup by recording successfully

     2

imported patches in series file.

     3

     4

  $ echo "[extensions]" >> $HGRCPATH

     5

  $ echo "mq=" >> $HGRCPATH

     6

  $ hg init repo

     7

  $ cd repo

     8

  $ echo a > a

     9

  $ hg ci -Am'add a'

    10

  adding a

    11

  $ cat >b.patch<<EOF

    12

  > diff --git a/a b/a

    13

  > --- a/a

    14

  > +++ b/a

    15

  > @@ -1,1 +1,2 @@

    16

  >  a

    17

  > +b

    18

  > EOF

    19

    20

empty series

    21

    22

  $ hg qseries

    23

    24

qimport valid patch followed by invalid patch

    25

    26

  $ hg qimport b.patch fakepatch

    27

  adding b.patch to series file

    28

  abort: unable to read file fakepatch

    29

  [255]

    30

    31

valid patches before fail added to series

    32

    33

  $ hg qseries

    34

  b.patch

    35

    36

  $ hg pull -q -r 0 . # update phase

    37

  $ hg qimport -r 0

    38

  abort: revision 0 is not mutable

    39

  (see 'hg help phases' for details)

    40

  [255]

    41

    42

  $ cd ..