tests/test-mq-guards.t
author Arseniy Alekseyev <aalekseyev@janestreet.com>
Fri, 26 Apr 2024 19:10:35 +0100
changeset 51626 865efc020c33
parent 49621 55c6ebd11cb9
permissions -rw-r--r--
dirstate: remove the python-side whitelist of allowed matchers This whitelist is too permissive because it allows matchers that contain disallowed ones deep inside, for example through `intersectionmatcher`. It is also too restrictive because it doesn't pass through some of the matchers we support, such as `patternmatcher`. It's also unnecessary because unsupported matchers raise `FallbackError` and we fall back anyway. Making this change makes more of the tests use rust code path, and therefore subtly change behavior. For example, rust status in largefiles repos seems to have strange behavior.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
     1
  $ echo "[extensions]" >> $HGRCPATH
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
     2
  $ echo "mq=" >> $HGRCPATH
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
     3
49621
55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 23749
diff changeset
     4
  $ hg init repo
55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 23749
diff changeset
     5
  $ cd repo
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
     6
  $ hg qinit
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
     7
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
     8
  $ echo x > x
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
     9
  $ hg ci -Ama
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    10
  adding x
2821
2e4ace008c94 mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    11
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    12
  $ hg qnew a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    13
  $ echo a > a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    14
  $ hg add a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    15
  $ hg qrefresh
2821
2e4ace008c94 mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    16
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    17
  $ hg qnew b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    18
  $ echo b > b
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    19
  $ hg add b
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    20
  $ hg qrefresh
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    21
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    22
  $ hg qnew c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    23
  $ echo c > c
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    24
  $ hg add c
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    25
  $ hg qrefresh
2821
2e4ace008c94 mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    26
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    27
  $ hg qpop -a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    28
  popping c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    29
  popping b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    30
  popping a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    31
  patch queue now empty
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    32
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    33
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    34
should fail
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    35
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    36
  $ hg qguard does-not-exist.patch +bleh
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    37
  abort: no patch named does-not-exist.patch
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11896
diff changeset
    38
  [255]
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    39
2821
2e4ace008c94 mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    40
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    41
should fail
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    42
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    43
  $ hg qguard +fail
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    44
  abort: no patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11896
diff changeset
    45
  [255]
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    46
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    47
  $ hg qpush
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    48
  applying a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    49
  now at: a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    50
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    51
should guard a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    52
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    53
  $ hg qguard +a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    54
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    55
should print +a
2821
2e4ace008c94 mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    56
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    57
  $ hg qguard
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    58
  a.patch: +a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    59
  $ hg qpop
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    60
  popping a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    61
  patch queue now empty
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    62
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    63
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    64
should fail
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    65
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    66
  $ hg qpush a.patch
14464
00256f689f9c mq: print "'foo' 'bar'", not "['foo', 'bar']" when showing guards
Martin Geisler <mg@aragost.com>
parents: 13987
diff changeset
    67
  cannot push 'a.patch' - guarded by '+a'
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11896
diff changeset
    68
  [1]
2821
2e4ace008c94 mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    69
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    70
  $ hg qguard a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    71
  a.patch: +a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    72
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    73
should push b.patch
2821
2e4ace008c94 mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    74
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    75
  $ hg qpush
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    76
  applying b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    77
  now at: b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    78
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    79
  $ hg qpop
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    80
  popping b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    81
  patch queue now empty
2821
2e4ace008c94 mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    82
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    83
test selection of an empty guard
4133
a9ee6c53af8d mq: abort cleanly when invalid patch name is given to qguard
Christian Ebert <blacktrash@gmx.net>
parents: 3763
diff changeset
    84
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    85
  $ hg qselect ""
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    86
  abort: guard cannot be an empty string
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11896
diff changeset
    87
  [255]
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    88
  $ hg qselect a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    89
  number of unguarded, unapplied patches has changed from 2 to 3
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    90
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    91
should push a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    92
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    93
  $ hg qpush
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    94
  applying a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    95
  now at: a.patch
2821
2e4ace008c94 mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    96
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    97
  $ hg qguard -- c.patch -a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    98
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
    99
should print -a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   100
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   101
  $ hg qguard c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   102
  c.patch: -a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   103
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   104
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   105
should skip c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   106
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   107
  $ hg qpush -a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   108
  applying b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   109
  skipping c.patch - guarded by '-a'
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   110
  now at: b.patch
16063
c36db39b3fee mq: fix qnext when all remaining patches are guarded
Patrick Mezard <pmezard@gmail.com>
parents: 15256
diff changeset
   111
  $ hg qnext
c36db39b3fee mq: fix qnext when all remaining patches are guarded
Patrick Mezard <pmezard@gmail.com>
parents: 15256
diff changeset
   112
  all patches applied
c36db39b3fee mq: fix qnext when all remaining patches are guarded
Patrick Mezard <pmezard@gmail.com>
parents: 15256
diff changeset
   113
  [1]
2821
2e4ace008c94 mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   114
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   115
should display b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   116
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   117
  $ hg qtop
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   118
  b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   119
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   120
  $ hg qguard -n c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   121
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   122
should push c.patch
7398
2cd1308cb588 mq: gracefully abort qpush/qgoto to guarded patch (issue1186)
Brendan Cully <brendan@kublai.com>
parents: 6607
diff changeset
   123
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   124
  $ hg qpush -a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   125
  applying c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   126
  now at: c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   127
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   128
  $ hg qpop -a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   129
  popping c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   130
  popping b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   131
  popping a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   132
  patch queue now empty
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   133
  $ hg qselect -n
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   134
  guards deactivated
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   135
  number of unguarded, unapplied patches has changed from 3 to 2
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   136
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   137
should push all
2821
2e4ace008c94 mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   138
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   139
  $ hg qpush -a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   140
  applying b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   141
  applying c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   142
  now at: c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   143
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   144
  $ hg qpop -a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   145
  popping c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   146
  popping b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   147
  patch queue now empty
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   148
  $ hg qguard a.patch +1
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   149
  $ hg qguard b.patch +2
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   150
  $ hg qselect 1
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   151
  number of unguarded, unapplied patches has changed from 1 to 2
2821
2e4ace008c94 mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   152
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   153
should push a.patch, not b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   154
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   155
  $ hg qpush
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   156
  applying a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   157
  now at: a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   158
  $ hg qpush
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   159
  applying c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   160
  now at: c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   161
  $ hg qpop -a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   162
  popping c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   163
  popping a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   164
  patch queue now empty
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   165
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   166
  $ hg qselect 2
2821
2e4ace008c94 mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   167
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   168
should push b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   169
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   170
  $ hg qpush
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   171
  applying b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   172
  now at: b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   173
  $ hg qpush -a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   174
  applying c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   175
  now at: c.patch
16064
7e5a281a082c mq: make qprev return the previous applied patch (issue3245)
Patrick Mezard <pmezard@gmail.com>
parents: 16063
diff changeset
   176
  $ hg qprev
7e5a281a082c mq: make qprev return the previous applied patch (issue3245)
Patrick Mezard <pmezard@gmail.com>
parents: 16063
diff changeset
   177
  b.patch
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   178
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   179
Used to be an issue with holes in the patch sequence
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   180
So, put one hole on the base and ask for topmost patch.
2821
2e4ace008c94 mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   181
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   182
  $ hg qtop
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   183
  c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   184
  $ hg qpop -a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   185
  popping c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   186
  popping b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   187
  patch queue now empty
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   188
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   189
  $ hg qselect 1 2
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   190
  number of unguarded, unapplied patches has changed from 2 to 3
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   191
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   192
should push a.patch, b.patch
2821
2e4ace008c94 mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   193
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   194
  $ hg qpush
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   195
  applying a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   196
  now at: a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   197
  $ hg qpush
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   198
  applying b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   199
  now at: b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   200
  $ hg qpop -a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   201
  popping b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   202
  popping a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   203
  patch queue now empty
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   204
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   205
  $ hg qguard -- a.patch +1 +2 -3
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   206
  $ hg qselect 1 2 3
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   207
  number of unguarded, unapplied patches has changed from 3 to 2
2829
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2821
diff changeset
   208
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   209
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   210
list patches and guards
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   211
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   212
  $ hg qguard -l
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   213
  a.patch: +1 +2 -3
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   214
  b.patch: +2
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   215
  c.patch: unguarded
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   216
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   217
have at least one patch applied to test coloring
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   218
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   219
  $ hg qpush
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   220
  applying b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   221
  now at: b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   222
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   223
list patches and guards with color
2850
851b07ec450c mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2844
diff changeset
   224
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   225
  $ hg --config extensions.color= qguard --config color.mode=ansi \
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   226
  >     -l --color=always
12942
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12316
diff changeset
   227
  \x1b[0;30;1ma.patch\x1b[0m: \x1b[0;33m+1\x1b[0m \x1b[0;33m+2\x1b[0m \x1b[0;31m-3\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12316
diff changeset
   228
  \x1b[0;34;1;4mb.patch\x1b[0m: \x1b[0;33m+2\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12316
diff changeset
   229
  \x1b[0;30;1mc.patch\x1b[0m: \x1b[0;32munguarded\x1b[0m (esc)
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   230
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   231
should pop b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   232
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   233
  $ hg qpop
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   234
  popping b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   235
  patch queue now empty
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   236
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   237
list series
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   238
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   239
  $ hg qseries -v
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   240
  0 G a.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   241
  1 U b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   242
  2 U c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   243
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   244
list guards
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   245
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   246
  $ hg qselect
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   247
  1
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   248
  2
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   249
  3
2829
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2821
diff changeset
   250
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   251
should push b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   252
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   253
  $ hg qpush
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   254
  applying b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   255
  now at: b.patch
2829
05316bb57d01 mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2821
diff changeset
   256
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   257
  $ hg qpush -a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   258
  applying c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   259
  now at: c.patch
22454
ac31d87608d6 mq: use "mq.applied[i].name" instead of "mq.appliedname(i)" for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22453
diff changeset
   260
  $ hg qselect -n --reapply -v
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   261
  guards deactivated
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   262
  popping guarded patches
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   263
  popping c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   264
  popping b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   265
  patch queue now empty
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   266
  reapplying unguarded patches
22454
ac31d87608d6 mq: use "mq.applied[i].name" instead of "mq.appliedname(i)" for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22453
diff changeset
   267
  skipping a.patch - guarded by '+1' '+2'
ac31d87608d6 mq: use "mq.applied[i].name" instead of "mq.appliedname(i)" for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22453
diff changeset
   268
  skipping b.patch - guarded by '+2'
ac31d87608d6 mq: use "mq.applied[i].name" instead of "mq.appliedname(i)" for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22453
diff changeset
   269
  skipping a.patch - guarded by '+1' '+2'
ac31d87608d6 mq: use "mq.applied[i].name" instead of "mq.appliedname(i)" for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22453
diff changeset
   270
  skipping b.patch - guarded by '+2'
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   271
  applying c.patch
22454
ac31d87608d6 mq: use "mq.applied[i].name" instead of "mq.appliedname(i)" for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22453
diff changeset
   272
  patching file c
ac31d87608d6 mq: use "mq.applied[i].name" instead of "mq.appliedname(i)" for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22453
diff changeset
   273
  adding c
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23139
diff changeset
   274
  committing files:
22454
ac31d87608d6 mq: use "mq.applied[i].name" instead of "mq.appliedname(i)" for safety
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22453
diff changeset
   275
  c
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23139
diff changeset
   276
  committing manifest
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23139
diff changeset
   277
  committing changelog
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   278
  now at: c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   279
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   280
guards in series file: +1 +2 -3
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   281
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   282
  $ hg qselect -s
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   283
  +1
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   284
  +2
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   285
  -3
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   286
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   287
should show c.patch
11819
1c00577b0298 qguard: label patch names by status when listing guards
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11141
diff changeset
   288
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   289
  $ hg qapplied
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   290
  c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   291
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   292
  $ hg qrename a.patch new.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   293
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   294
should show :
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   295
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   296
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   297
new.patch: +1 +2 -3
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   298
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   299
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   300
b.patch: +2
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   301
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   302
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   303
c.patch: unguarded
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   304
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   305
  $ hg qguard -l
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   306
  new.patch: +1 +2 -3
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   307
  b.patch: +2
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   308
  c.patch: unguarded
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   309
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   310
  $ hg qnew d.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   311
  $ hg qpop
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   312
  popping d.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   313
  now at: c.patch
2844
582cbc4392cb qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2829
diff changeset
   314
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   315
should show new.patch and b.patch as Guarded, c.patch as Applied
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   316
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   317
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   318
and d.patch as Unapplied
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   319
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   320
  $ hg qseries -v
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   321
  0 G new.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   322
  1 G b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   323
  2 A c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   324
  3 U d.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   325
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   326
qseries again, but with color
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   327
13987
e0f07847f8de color: add support for terminfo-based attributes and color
Danek Duvall <duvall@comfychair.org>
parents: 12942
diff changeset
   328
  $ hg --config extensions.color= --config color.mode=ansi qseries -v --color=always
12942
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12316
diff changeset
   329
  0 G \x1b[0;30;1mnew.patch\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12316
diff changeset
   330
  1 G \x1b[0;30;1mb.patch\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12316
diff changeset
   331
  2 A \x1b[0;34;1;4mc.patch\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12316
diff changeset
   332
  3 U \x1b[0;30;1md.patch\x1b[0m (esc)
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   333
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   334
  $ hg qguard d.patch +2
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   335
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   336
new.patch, b.patch: Guarded. c.patch: Applied. d.patch: Guarded.
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   337
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   338
  $ hg qseries -v
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   339
  0 G new.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   340
  1 G b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   341
  2 A c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   342
  3 G d.patch
3685
193e9c6d1a6d Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents: 2990
diff changeset
   343
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   344
  $ qappunappv()
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   345
  > {
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   346
  >     for command in qapplied "qapplied -v" qunapplied "qunapplied -v"; do
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   347
  >         echo % hg $command
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   348
  >         hg $command
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   349
  >     done
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   350
  > }
4240
943f40b4da30 Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4133
diff changeset
   351
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   352
  $ hg qpop -a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   353
  popping c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   354
  patch queue now empty
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   355
  $ hg qguard -l
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   356
  new.patch: +1 +2 -3
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   357
  b.patch: +2
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   358
  c.patch: unguarded
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   359
  d.patch: +2
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   360
  $ qappunappv
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   361
  % hg qapplied
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   362
  % hg qapplied -v
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   363
  % hg qunapplied
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   364
  c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   365
  % hg qunapplied -v
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   366
  0 G new.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   367
  1 G b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   368
  2 U c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   369
  3 G d.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   370
  $ hg qselect 1
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   371
  number of unguarded, unapplied patches has changed from 1 to 2
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   372
  $ qappunappv
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   373
  % hg qapplied
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   374
  % hg qapplied -v
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   375
  % hg qunapplied
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   376
  new.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   377
  c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   378
  % hg qunapplied -v
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   379
  0 U new.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   380
  1 G b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   381
  2 U c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   382
  3 G d.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   383
  $ hg qpush -a
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   384
  applying new.patch
14464
00256f689f9c mq: print "'foo' 'bar'", not "['foo', 'bar']" when showing guards
Martin Geisler <mg@aragost.com>
parents: 13987
diff changeset
   385
  skipping b.patch - guarded by '+2'
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   386
  applying c.patch
14464
00256f689f9c mq: print "'foo' 'bar'", not "['foo', 'bar']" when showing guards
Martin Geisler <mg@aragost.com>
parents: 13987
diff changeset
   387
  skipping d.patch - guarded by '+2'
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   388
  now at: c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   389
  $ qappunappv
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   390
  % hg qapplied
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   391
  new.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   392
  c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   393
  % hg qapplied -v
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   394
  0 A new.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   395
  1 G b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   396
  2 A c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   397
  % hg qunapplied
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   398
  % hg qunapplied -v
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   399
  3 G d.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   400
  $ hg qselect 2
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   401
  number of unguarded, unapplied patches has changed from 0 to 1
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   402
  $ qappunappv
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   403
  % hg qapplied
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   404
  new.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   405
  c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   406
  % hg qapplied -v
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   407
  0 A new.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   408
  1 U b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   409
  2 A c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   410
  % hg qunapplied
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   411
  d.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   412
  % hg qunapplied -v
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   413
  3 U d.patch
4240
943f40b4da30 Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4133
diff changeset
   414
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   415
  $ for patch in `hg qseries`; do
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   416
  >     echo % hg qapplied $patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   417
  >     hg qapplied $patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   418
  >     echo % hg qunapplied $patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   419
  >     hg qunapplied $patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   420
  > done
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   421
  % hg qapplied new.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   422
  new.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   423
  % hg qunapplied new.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   424
  b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   425
  d.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   426
  % hg qapplied b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   427
  new.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   428
  % hg qunapplied b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   429
  d.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   430
  % hg qapplied c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   431
  new.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   432
  c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   433
  % hg qunapplied c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   434
  d.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   435
  % hg qapplied d.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   436
  new.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   437
  c.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   438
  % hg qunapplied d.patch
4240
943f40b4da30 Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4133
diff changeset
   439
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   440
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   441
hg qseries -m: only b.patch should be shown
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   442
the guards file was not ignored in the past
4241
7c59ade0f0d6 hg qseries -m: guards file was not ignored
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4240
diff changeset
   443
11896
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   444
  $ hg qdelete -k b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   445
  $ hg qseries -m
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   446
  b.patch
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   447
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   448
hg qseries -m with color
286693eaba47 tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11819
diff changeset
   449
13987
e0f07847f8de color: add support for terminfo-based attributes and color
Danek Duvall <duvall@comfychair.org>
parents: 12942
diff changeset
   450
  $ hg --config extensions.color= --config color.mode=ansi qseries -m --color=always
12942
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12316
diff changeset
   451
  \x1b[0;31;1mb.patch\x1b[0m (esc)
15245
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   452
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   453
21024
7731a2281cf0 spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents: 16064
diff changeset
   454
excercise corner cases in "qselect --reapply"
15245
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   455
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   456
  $ hg qpop -a
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   457
  popping c.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   458
  popping new.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   459
  patch queue now empty
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   460
  $ hg qguard -- new.patch -not-new
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   461
  $ hg qguard -- c.patch -not-c
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   462
  $ hg qguard -- d.patch -not-d
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   463
  $ hg qpush -a
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   464
  applying new.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   465
  applying c.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   466
  applying d.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   467
  patch d.patch is empty
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   468
  now at: d.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   469
  $ hg qguard -l
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   470
  new.patch: -not-new
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   471
  c.patch: -not-c
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   472
  d.patch: -not-d
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   473
  $ hg qselect --reapply not-d
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   474
  popping guarded patches
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   475
  popping d.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   476
  now at: c.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   477
  reapplying unguarded patches
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   478
  cannot push 'd.patch' - guarded by '-not-d'
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   479
  $ hg qser -v
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   480
  0 A new.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   481
  1 A c.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   482
  2 G d.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   483
  $ hg qselect --reapply -n
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   484
  guards deactivated
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   485
  $ hg qpush
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   486
  applying d.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   487
  patch d.patch is empty
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   488
  now at: d.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   489
  $ hg qser -v
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   490
  0 A new.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   491
  1 A c.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   492
  2 A d.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   493
  $ hg qselect --reapply not-c
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   494
  popping guarded patches
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   495
  popping d.patch
15256
8caf7a757afa mq: fix corner cases for handling of patch 0 in qselect
Mads Kiilerich <mads@kiilerich.com>
parents: 15245
diff changeset
   496
  popping c.patch
8caf7a757afa mq: fix corner cases for handling of patch 0 in qselect
Mads Kiilerich <mads@kiilerich.com>
parents: 15245
diff changeset
   497
  now at: new.patch
15245
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   498
  reapplying unguarded patches
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   499
  applying d.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   500
  patch d.patch is empty
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   501
  now at: d.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   502
  $ hg qser -v
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   503
  0 A new.patch
15256
8caf7a757afa mq: fix corner cases for handling of patch 0 in qselect
Mads Kiilerich <mads@kiilerich.com>
parents: 15245
diff changeset
   504
  1 G c.patch
15245
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   505
  2 A d.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   506
  $ hg qselect --reapply not-new
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   507
  popping guarded patches
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   508
  popping d.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   509
  popping new.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   510
  patch queue now empty
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   511
  reapplying unguarded patches
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   512
  applying c.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   513
  applying d.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   514
  patch d.patch is empty
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   515
  now at: d.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   516
  $ hg qser -v
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   517
  0 G new.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   518
  1 A c.patch
aa2c35057f47 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com>
parents: 14464
diff changeset
   519
  2 A d.patch
22453
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   520
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   521
test that qselect shows "number of guarded, applied patches" correctly
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   522
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   523
  $ hg qimport -q -e b.patch
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   524
  adding b.patch to series file
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   525
  $ hg qguard -- b.patch -not-b
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   526
  $ hg qpop -a -q
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   527
  patch queue now empty
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   528
  $ hg qunapplied -v
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   529
  0 G new.patch
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   530
  1 U c.patch
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   531
  2 U d.patch
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   532
  3 U b.patch
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   533
  $ hg qselect not-new not-c
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   534
  number of unguarded, unapplied patches has changed from 3 to 2
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   535
  $ hg qpush -q -a
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   536
  patch d.patch is empty
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   537
  now at: b.patch
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   538
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   539
  $ hg qapplied -v
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   540
  0 G new.patch
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   541
  1 G c.patch
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   542
  2 A d.patch
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   543
  3 A b.patch
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   544
  $ hg qselect --none
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   545
  guards deactivated
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   546
  $ hg qselect not-new not-c not-d
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
   547
  number of guarded, applied patches has changed from 0 to 1
22455
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   548
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   549
test that "qselect --reapply" reapplies patches successfully when the
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   550
already applied patch becomes unguarded and it follows the already
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   551
guarded (= not yet applied) one.
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   552
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   553
  $ hg qpop -q -a
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   554
  patch queue now empty
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   555
  $ hg qselect not-new not-c
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   556
  number of unguarded, unapplied patches has changed from 1 to 2
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   557
  $ hg qpush -q -a
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   558
  patch d.patch is empty
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   559
  now at: b.patch
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   560
  $ hg qapplied -v
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   561
  0 G new.patch
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   562
  1 G c.patch
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   563
  2 A d.patch
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   564
  3 A b.patch
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   565
  $ hg qselect -q --reapply not-c not-b
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   566
  now at: d.patch
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   567
  cannot push 'b.patch' - guarded by '-not-b'
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   568
  $ hg qseries -v
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   569
  0 U new.patch
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   570
  1 G c.patch
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   571
  2 A d.patch
c89379d47e95 mq: pop correct patches when changing pushable-ness of already applied ones
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22454
diff changeset
   572
  3 G b.patch
22456
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   573
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   574
test that "qselect --reapply" checks applied patches correctly when no
23139
e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents: 22456
diff changeset
   575
applied patches becomes guarded but some of unapplied ones become
22456
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   576
unguarded.
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   577
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   578
  $ hg qpop -q -a
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   579
  patch queue now empty
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   580
  $ hg qselect not-new not-c not-d
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   581
  number of unguarded, unapplied patches has changed from 2 to 1
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   582
  $ hg qpush -q -a
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   583
  now at: b.patch
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   584
  $ hg qapplied -v
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   585
  0 G new.patch
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   586
  1 G c.patch
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   587
  2 G d.patch
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   588
  3 A b.patch
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   589
  $ hg qselect -q --reapply not-new not-c
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   590
  $ hg qseries -v
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   591
  0 G new.patch
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   592
  1 G c.patch
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   593
  2 U d.patch
4bbcee186fc6 mq: examine "pushable" of already applied patch correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22455
diff changeset
   594
  3 A b.patch