Mercurial > hg
annotate tests/test-mq-guards.t @ 11899:99cafcae25d9
log: do not --follow file that is deleted and recreated later (issue732)
== What ==
issue732 is only one example of a buggy behaviour, but there are in fact many
intricated cases. For example:
( "o" contains an alive version of the tracked file, "x" does not)
tip - o - o - x - o - o - x ...
\
o - o - o - o - x ...
\ /
o - o
This repository contains at least two instances of the tracked file, but
when calling "hg log -f file" only the latest one (the one alive in tip)
matters to us.
== How ==
We must extract from the filelog the history of the file instance we're
interested in and discard changes related to other instances of that file.
We see that we're only interested in ancestors(node), and that all
other nodes in the filelog should not be considered.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Sun, 15 Aug 2010 23:17:53 +0900 |
parents | 286693eaba47 |
children | 4134686b83e1 |
rev | line source |
---|---|
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 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
4 $ hg init |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
5 $ hg qinit |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
6 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
7 $ echo x > x |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
8 $ hg ci -Ama |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
9 adding x |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
10 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
11 $ hg qnew a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
12 $ echo a > a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
13 $ hg add a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
14 $ hg qrefresh |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
15 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
16 $ hg qnew b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
17 $ echo b > b |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
18 $ hg add b |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
19 $ hg qrefresh |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
20 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
21 $ hg qnew c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
22 $ echo c > c |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
23 $ hg add c |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
24 $ hg qrefresh |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
25 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
26 $ hg qpop -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
27 popping c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
28 popping b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
29 popping a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
30 patch queue now empty |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
31 |
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 should fail |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
34 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
35 $ hg qguard does-not-exist.patch +bleh |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
36 abort: no patch named does-not-exist.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
37 |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
38 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
39 should fail |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
40 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
41 $ hg qguard +fail |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
42 abort: no patches applied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
43 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
44 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
45 applying a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
46 now at: a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
47 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
48 should guard a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
49 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
50 $ hg qguard +a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
51 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
52 should print +a |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
53 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
54 $ hg qguard |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
55 a.patch: +a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
56 $ hg qpop |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
57 popping a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
58 patch queue now empty |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
59 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
60 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
61 should fail |
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 $ hg qpush a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
64 cannot push 'a.patch' - guarded by ['+a'] |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
65 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
66 $ hg qguard a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
67 a.patch: +a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
68 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
69 should push b.patch |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
70 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
71 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
72 applying b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
73 now at: b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
74 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
75 $ hg qpop |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
76 popping b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
77 patch queue now empty |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
78 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
79 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
|
80 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
81 $ hg qselect "" |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
82 abort: guard cannot be an empty string |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
83 $ hg qselect a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
84 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
|
85 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
86 should push a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
87 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
88 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
89 applying a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
90 now at: a.patch |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
91 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
92 $ hg qguard -- c.patch -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
93 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
94 should print -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
95 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
96 $ hg qguard c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
97 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 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
100 should skip c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
101 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
102 $ hg qpush -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
103 applying b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
104 skipping c.patch - guarded by '-a' |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
105 now at: b.patch |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
106 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
107 should display b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
108 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
109 $ hg qtop |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
110 b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
111 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
112 $ hg qguard -n c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
113 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
114 should push c.patch |
7398
2cd1308cb588
mq: gracefully abort qpush/qgoto to guarded patch (issue1186)
Brendan Cully <brendan@kublai.com>
parents:
6607
diff
changeset
|
115 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
116 $ hg qpush -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
117 applying c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
118 now at: c.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 qpop -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
121 popping c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
122 popping b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
123 popping a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
124 patch queue now empty |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
125 $ hg qselect -n |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
126 guards deactivated |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
127 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
|
128 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
129 should push all |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
130 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
131 $ hg qpush -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
132 applying b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
133 applying c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
134 now at: c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
135 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
136 $ hg qpop -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
137 popping c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
138 popping b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
139 patch queue now empty |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
140 $ hg qguard a.patch +1 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
141 $ hg qguard b.patch +2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
142 $ hg qselect 1 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
143 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
|
144 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
145 should push a.patch, not b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
146 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
147 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
148 applying a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
149 now at: a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
150 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
151 applying c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
152 now at: c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
153 $ hg qpop -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
154 popping c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
155 popping a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
156 patch queue now empty |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
157 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
158 $ hg qselect 2 |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
159 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
160 should push b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
161 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
162 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
163 applying b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
164 now at: b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
165 $ hg qpush -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
166 applying c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
167 now at: c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
168 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
169 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
|
170 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
|
171 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
172 $ hg qtop |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
173 c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
174 $ hg qpop -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
175 popping c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
176 popping b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
177 patch queue now empty |
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 $ hg qselect 1 2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
180 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
|
181 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
182 should push a.patch, b.patch |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
183 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
184 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
185 applying a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
186 now at: a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
187 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
188 applying b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
189 now at: b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
190 $ hg qpop -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
191 popping b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
192 popping a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
193 patch queue now empty |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
194 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
195 $ hg qguard -- a.patch +1 +2 -3 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
196 $ hg qselect 1 2 3 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
197 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
|
198 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
199 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
200 list patches and guards |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
201 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
202 $ hg qguard -l |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
203 a.patch: +1 +2 -3 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
204 b.patch: +2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
205 c.patch: unguarded |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
206 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
207 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
|
208 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
209 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
210 applying b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
211 now at: b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
212 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
213 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
|
214 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
215 $ 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
|
216 > -l --color=always |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
217 [0;30;1ma.patch[0m: [0;33m+1[0m [0;33m+2[0m [0;31m-3[0m |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
218 [0;34;1;4mb.patch[0m: [0;33m+2[0m |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
219 [0;30;1mc.patch[0m: [0;32munguarded[0m |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
220 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
221 should pop 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 $ hg qpop |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
224 popping b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
225 patch queue now empty |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
226 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
227 list series |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
228 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
229 $ hg qseries -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
230 0 G a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
231 1 U b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
232 2 U c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
233 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
234 list guards |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
235 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
236 $ hg qselect |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
237 1 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
238 2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
239 3 |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
240 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
241 should push b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
242 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
243 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
244 applying b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
245 now at: b.patch |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
246 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
247 $ hg qpush -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
248 applying c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
249 now at: c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
250 $ hg qselect -n --reapply |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
251 guards deactivated |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
252 popping guarded patches |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
253 popping c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
254 popping b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
255 patch queue now empty |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
256 reapplying unguarded patches |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
257 applying c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
258 now at: c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
259 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
260 guards in series file: +1 +2 -3 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
261 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
262 $ hg qselect -s |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
263 +1 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
264 +2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
265 -3 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
266 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
267 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
|
268 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
269 $ hg qapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
270 c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
271 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
272 $ hg qrename a.patch new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
273 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
274 should show : |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
275 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
276 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
277 new.patch: +1 +2 -3 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
278 |
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 b.patch: +2 |
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 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
283 c.patch: unguarded |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
284 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
285 $ hg qguard -l |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
286 new.patch: +1 +2 -3 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
287 b.patch: +2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
288 c.patch: unguarded |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
289 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
290 $ hg qnew d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
291 $ hg qpop |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
292 popping d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
293 now at: c.patch |
2844
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
294 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
295 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
|
296 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
297 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
298 and d.patch as Unapplied |
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 $ hg qseries -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
301 0 G new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
302 1 G b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
303 2 A c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
304 3 U d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
305 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
306 qseries again, but with color |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
307 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
308 $ hg --config extensions.color= qseries -v --color=always |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
309 0 G [0;30;1mnew.patch[0m |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
310 1 G [0;30;1mb.patch[0m |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
311 2 A [0;34;1;4mc.patch[0m |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
312 3 U [0;30;1md.patch[0m |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
313 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
314 $ hg qguard d.patch +2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
315 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
316 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
|
317 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
318 $ hg qseries -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
319 0 G new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
320 1 G b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
321 2 A c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
322 3 G d.patch |
3685
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2990
diff
changeset
|
323 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
324 $ qappunappv() |
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 > 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
|
327 > echo % hg $command |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
328 > hg $command |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
329 > done |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
330 > } |
4240
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
331 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
332 $ hg qpop -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
333 popping c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
334 patch queue now empty |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
335 $ hg qguard -l |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
336 new.patch: +1 +2 -3 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
337 b.patch: +2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
338 c.patch: unguarded |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
339 d.patch: +2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
340 $ qappunappv |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
341 % hg qapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
342 % hg qapplied -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
343 % hg qunapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
344 c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
345 % hg qunapplied -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
346 0 G new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
347 1 G b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
348 2 U c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
349 3 G d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
350 $ hg qselect 1 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
351 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
|
352 $ qappunappv |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
353 % hg qapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
354 % hg qapplied -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
355 % hg qunapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
356 new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
357 c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
358 % hg qunapplied -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
359 0 U new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
360 1 G b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
361 2 U c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
362 3 G d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
363 $ hg qpush -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
364 applying new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
365 skipping b.patch - guarded by ['+2'] |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
366 applying c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
367 skipping d.patch - guarded by ['+2'] |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
368 now at: c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
369 $ qappunappv |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
370 % hg qapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
371 new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
372 c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
373 % hg qapplied -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
374 0 A new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
375 1 G b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
376 2 A c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
377 % hg qunapplied |
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 3 G d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
380 $ hg qselect 2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
381 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
|
382 number of guarded, applied patches has changed from 1 to 0 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
383 $ qappunappv |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
384 % hg qapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
385 new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
386 c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
387 % hg qapplied -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
388 0 A new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
389 1 U b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
390 2 A c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
391 % hg qunapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
392 d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
393 % hg qunapplied -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
394 3 U d.patch |
4240
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
395 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
396 $ for patch in `hg qseries`; do |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
397 > echo % hg qapplied $patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
398 > hg qapplied $patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
399 > echo % hg qunapplied $patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
400 > hg qunapplied $patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
401 > done |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
402 % hg qapplied new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
403 new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
404 % hg qunapplied new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
405 b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
406 d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
407 % hg qapplied b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
408 new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
409 % hg qunapplied b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
410 d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
411 % hg qapplied c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
412 new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
413 c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
414 % hg qunapplied c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
415 d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
416 % hg qapplied d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
417 new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
418 c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
419 % hg qunapplied d.patch |
4240
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
420 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
421 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
422 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
|
423 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
|
424 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
425 $ hg qdelete -k b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
426 $ hg qseries -m |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
427 b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
428 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
429 hg qseries -m with color |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
430 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
431 $ hg --config extensions.color= qseries -m --color=always |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
432 [0;31;1mb.patch[0m |