$ HGENCODING=utf-8

  $ export HGENCODING

  $ cat >> $HGRCPATH << EOF

  > [extensions]

  > drawdag=$TESTDIR/drawdag.py

  > EOF

  $ try() {

  >   hg debugrevspec --debug "$@"

  > }

  $ log() {

  >   hg log --template '{rev}\n' -r "$1"

  > }

  $ hg init repo

  $ cd repo

  $ echo a > a

  $ hg branch a

  marked working directory as branch a

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

  $ hg ci -Aqm0

  $ echo b > b

  $ hg branch b

  marked working directory as branch b

  $ hg ci -Aqm1

  $ rm a

  $ hg branch a-b-c-

  marked working directory as branch a-b-c-

  $ hg ci -Aqm2 -u Bob

  $ hg log -r "extra('branch', 'a-b-c-')" --template '{rev}\n'

  2

  $ hg log -r "extra('branch')" --template '{rev}\n'

  0

  1

  2

  $ hg log -r "extra('branch', 're:a')" --template '{rev} {branch}\n'

  0 a

  2 a-b-c-

  $ hg co 1

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

  $ hg branch +a+b+c+

  marked working directory as branch +a+b+c+

  $ hg ci -Aqm3

  $ hg co 2  # interleave

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

  $ echo bb > b

  $ hg branch -- -a-b-c-

  marked working directory as branch -a-b-c-

  $ hg ci -Aqm4 -d "May 12 2005"

  $ hg co 3

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg branch !a/b/c/

  marked working directory as branch !a/b/c/

  $ hg ci -Aqm"5 bug"

  $ hg merge 4

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

  (branch merge, don't forget to commit)

  $ hg branch _a_b_c_

  marked working directory as branch _a_b_c_

  $ hg ci -Aqm"6 issue619"

  $ hg branch .a.b.c.

  marked working directory as branch .a.b.c.

  $ hg ci -Aqm7

  $ hg branch all

  marked working directory as branch all

  $ hg co 4

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

  $ hg branch é

  marked working directory as branch \xc3\xa9 (esc)

  $ hg ci -Aqm9

  $ hg tag -r6 1.0

  $ hg bookmark -r6 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

  $ hg clone --quiet -U -r 7 . ../remote1

  $ hg clone --quiet -U -r 8 . ../remote2

  $ echo "[paths]" >> .hg/hgrc

  $ echo "default = ../remote1" >> .hg/hgrc

test subtracting something from an addset

  $ log '(outgoing() or removes(a)) - removes(a)'

  8

  9

test intersecting something with an addset

  $ log 'parents(outgoing() or removes(a))'

  1

  4

  5

  8

test that `or` operation combines elements in the right order:

  $ log '3:4 or 2:5'

  3

  4

  2

  5

  $ log '3:4 or 5:2'

  3

  4

  5

  2

  $ log 'sort(3:4 or 2:5)'

  2

  3

  4

  5

  $ log 'sort(3:4 or 5:2)'

  2

  3

  4

  5

test that more than one `-r`s are combined in the right order and deduplicated:

  $ hg log -T '{rev}\n' -r 3 -r 3 -r 4 -r 5:2 -r 'ancestors(4)'

  3

  4

  5

  2

  0

  1

test that `or` operation skips duplicated revisions from right-hand side

  $ try 'reverse(1::5) or ancestors(4)'

  (or

    (list

      (func

        (symbol 'reverse')

        (dagrange

          (symbol '1')

          (symbol '5')))

      (func

        (symbol 'ancestors')

        (symbol '4'))))

  * set:

  <addset

    <baseset- [1, 3, 5]>,

    <generatorset+>>

  5

  3

  1

  0

  2

  4

  $ try 'sort(ancestors(4) or reverse(1::5))'

  (func

    (symbol 'sort')

    (or

      (list

        (func

          (symbol 'ancestors')

          (symbol '4'))

        (func

          (symbol 'reverse')

          (dagrange

            (symbol '1')

            (symbol '5'))))))

  * set:

  <addset+

    <generatorset+>,

    <baseset- [1, 3, 5]>>

  0

  1

  2

  3

  4

  5

test optimization of trivial `or` operation

  $ try --optimize '0|(1)|"2"|-2|tip|null'

  (or

    (list

      (symbol '0')

      (group

        (symbol '1'))

      (string '2')

      (negate

        (symbol '2'))

      (symbol 'tip')

      (symbol 'null')))

  * optimized:

  (func

    (symbol '_list')

    (string '0\x001\x002\x00-2\x00tip\x00null'))

  * set:

  <baseset [0, 1, 2, 8, 9, -1]>

  0

  1

  2

  8

  9

  -1

  $ try --optimize '0|1|2:3'

  (or

    (list

      (symbol '0')

      (symbol '1')

      (range

        (symbol '2')

        (symbol '3'))))

  * optimized:

  (or

    (list

      (func

        (symbol '_list')

        (string '0\x001'))

      (range

        (symbol '2')

        (symbol '3'))))

  * set:

  <addset

    <baseset [0, 1]>,

    <spanset+ 2:4>>

  0

  1

  2

  3

  $ try --optimize '0:1|2|3:4|5|6'

  (or

    (list

      (range

        (symbol '0')

        (symbol '1'))

      (symbol '2')

      (range

        (symbol '3')

        (symbol '4'))

      (symbol '5')

      (symbol '6')))

  * optimized:

  (or

    (list

      (range

        (symbol '0')

        (symbol '1'))

      (symbol '2')

      (range

        (symbol '3')

        (symbol '4'))

      (func

        (symbol '_list')

        (string '5\x006'))))

  * set:

  <addset

    <addset

      <spanset+ 0:2>,

      <baseset [2]>>,

    <addset

      <spanset+ 3:5>,

      <baseset [5, 6]>>>

  0

  1

  2

  3

  4

  5

  6

unoptimized `or` looks like this

  $ try --no-optimized -p analyzed '0|1|2|3|4'

  * analyzed:

  (or

    (list

      (symbol '0')

      (symbol '1')

      (symbol '2')

      (symbol '3')

      (symbol '4')))

  * set:

  <addset

    <addset

      <baseset [0]>,

      <baseset [1]>>,

    <addset

      <baseset [2]>,

      <addset

        <baseset [3]>,

        <baseset [4]>>>>

  0

  1

  2

  3

  4

test that `_list` should be narrowed by provided `subset`

  $ log '0:2 and (null|1|2|3)'

  1

  2

test that `_list` should remove duplicates

  $ log '0|1|2|1|2|-1|tip'

  0

  1

  2

  9

test unknown revision in `_list`

  $ log '0|unknown'

  abort: unknown revision 'unknown'!

  [255]

test integer range in `_list`

  $ log '-1|-10'

  9

  0

  $ log '-10|-11'

  abort: unknown revision '-11'!

  [255]

  $ log '9|10'

  abort: unknown revision '10'!

  [255]

test '0000' != '0' in `_list`

  $ log '0|0000'

  0

  -1

test ',' in `_list`

  $ log '0,1'

  hg: parse error: can't use a list in this context

  (see hg help "revsets.x or y")

  [255]

  $ try '0,1,2'

  (list

    (symbol '0')

    (symbol '1')

    (symbol '2'))

  hg: parse error: can't use a list in this context

  (see hg help "revsets.x or y")

  [255]

test that chained `or` operations make balanced addsets

  $ try '0:1|1:2|2:3|3:4|4:5'

  (or

    (list

      (range

        (symbol '0')

        (symbol '1'))

      (range

        (symbol '1')

        (symbol '2'))

      (range

        (symbol '2')

        (symbol '3'))

      (range

        (symbol '3')

        (symbol '4'))

      (range

        (symbol '4')

        (symbol '5'))))

  * set:

  <addset

    <addset

      <spanset+ 0:2>,

      <spanset+ 1:3>>,

    <addset

      <spanset+ 2:4>,

      <addset

        <spanset+ 3:5>,

        <spanset+ 4:6>>>>

  0

  1

  2

  3

  4

  5

no crash by empty group "()" while optimizing `or` operations

  $ try --optimize '0|()'

  (or

    (list

      (symbol '0')

      (group

        None)))

  * optimized:

  (or

    (list

      (symbol '0')

      None))

  hg: parse error: missing argument

  [255]

test that chained `or` operations never eat up stack (issue4624)

(uses `0:1` instead of `0` to avoid future optimization of trivial revisions)

  $ hg log -T '{rev}\n' -r `$PYTHON -c "print '+'.join(['0:1'] * 500)"`