Mercurial > hg
annotate tests/test-mq-guards.t @ 13922:b8dd2e95b0ca
hgweb: sort bookmarks in the same manner as console command
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sun, 10 Apr 2011 10:01:37 +0900 |
parents | 05fffd665170 |
children | e0f07847f8de |
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 |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11896
diff
changeset
|
37 [255] |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
38 |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
39 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
40 should fail |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
41 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
42 $ hg qguard +fail |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
43 abort: no patches applied |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11896
diff
changeset
|
44 [255] |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
45 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
46 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
47 applying a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
48 now at: 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 should guard a.patch |
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 $ hg qguard +a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
53 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
54 should print +a |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
55 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
56 $ hg qguard |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
57 a.patch: +a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
58 $ hg qpop |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
59 popping a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
60 patch queue now empty |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
61 |
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 should fail |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
64 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
65 $ hg qpush a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
66 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
|
67 [1] |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
68 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
69 $ hg qguard a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
70 a.patch: +a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
71 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
72 should push b.patch |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
73 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
74 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
75 applying b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
76 now at: b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
77 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
78 $ hg qpop |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
79 popping b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
80 patch queue now empty |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
81 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
82 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
|
83 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
84 $ hg qselect "" |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
85 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
|
86 [255] |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
87 $ hg qselect a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
88 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
|
89 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
90 should push a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
91 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
92 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
93 applying a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
94 now at: a.patch |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
95 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
96 $ hg qguard -- c.patch -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
97 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
98 should print -a |
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 $ hg qguard c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
101 c.patch: -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
102 |
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 should skip c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
105 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
106 $ hg qpush -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
107 applying b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
108 skipping c.patch - guarded by '-a' |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
109 now at: b.patch |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
110 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
111 should display b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
112 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
113 $ hg qtop |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
114 b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
115 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
116 $ hg qguard -n c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
117 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
118 should push c.patch |
7398
2cd1308cb588
mq: gracefully abort qpush/qgoto to guarded patch (issue1186)
Brendan Cully <brendan@kublai.com>
parents:
6607
diff
changeset
|
119 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
120 $ hg qpush -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
121 applying c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
122 now at: c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
123 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
124 $ hg qpop -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
125 popping c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
126 popping b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
127 popping a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
128 patch queue now empty |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
129 $ hg qselect -n |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
130 guards deactivated |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
131 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
|
132 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
133 should push all |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
134 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
135 $ hg qpush -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
136 applying b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
137 applying c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
138 now at: c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
139 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
140 $ hg qpop -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
141 popping c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
142 popping b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
143 patch queue now empty |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
144 $ hg qguard a.patch +1 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
145 $ hg qguard b.patch +2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
146 $ hg qselect 1 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
147 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
|
148 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
149 should push a.patch, not b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
150 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
151 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
152 applying a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
153 now at: a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
154 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
155 applying c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
156 now at: c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
157 $ hg qpop -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
158 popping c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
159 popping a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
160 patch queue now empty |
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 qselect 2 |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
163 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
164 should push b.patch |
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 qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
167 applying b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
168 now at: b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
169 $ hg qpush -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
170 applying c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
171 now at: c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
172 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
173 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
|
174 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
|
175 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
176 $ hg qtop |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
177 c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
178 $ hg qpop -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
179 popping c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
180 popping b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
181 patch queue now empty |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
182 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
183 $ hg qselect 1 2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
184 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
|
185 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
186 should push a.patch, b.patch |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
187 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
188 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
189 applying a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
190 now at: a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
191 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
192 applying b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
193 now at: b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
194 $ hg qpop -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
195 popping b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
196 popping a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
197 patch queue now empty |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
198 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
199 $ hg qguard -- a.patch +1 +2 -3 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
200 $ hg qselect 1 2 3 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
201 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
|
202 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
203 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
204 list patches and guards |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
205 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
206 $ hg qguard -l |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
207 a.patch: +1 +2 -3 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
208 b.patch: +2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
209 c.patch: unguarded |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
210 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
211 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
|
212 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
213 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
214 applying b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
215 now at: b.patch |
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 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
|
218 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
219 $ 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
|
220 > -l --color=always |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12316
diff
changeset
|
221 \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
|
222 \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
|
223 \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
|
224 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
225 should pop b.patch |
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 $ hg qpop |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
228 popping b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
229 patch queue now empty |
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 list series |
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 qseries -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
234 0 G a.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
235 1 U b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
236 2 U c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
237 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
238 list guards |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
239 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
240 $ hg qselect |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
241 1 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
242 2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
243 3 |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
244 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
245 should push b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
246 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
247 $ hg qpush |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
248 applying b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
249 now at: b.patch |
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 $ hg qpush -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
252 applying c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
253 now at: c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
254 $ hg qselect -n --reapply |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
255 guards deactivated |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
256 popping guarded patches |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
257 popping c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
258 popping b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
259 patch queue now empty |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
260 reapplying unguarded patches |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
261 applying c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
262 now at: c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
263 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
264 guards in series file: +1 +2 -3 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
265 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
266 $ hg qselect -s |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
267 +1 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
268 +2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
269 -3 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
270 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
271 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
|
272 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
273 $ hg qapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
274 c.patch |
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 $ hg qrename a.patch new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
277 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
278 should show : |
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 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
281 new.patch: +1 +2 -3 |
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 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
284 b.patch: +2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
285 |
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 c.patch: unguarded |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
288 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
289 $ hg qguard -l |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
290 new.patch: +1 +2 -3 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
291 b.patch: +2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
292 c.patch: unguarded |
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 $ hg qnew d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
295 $ hg qpop |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
296 popping d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
297 now at: c.patch |
2844
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
298 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
299 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
|
300 |
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 and d.patch as Unapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
303 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
304 $ hg qseries -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
305 0 G new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
306 1 G b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
307 2 A c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
308 3 U d.patch |
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 qseries again, but with color |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
311 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
312 $ hg --config extensions.color= qseries -v --color=always |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12316
diff
changeset
|
313 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
|
314 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
|
315 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
|
316 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
|
317 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
318 $ hg qguard d.patch +2 |
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 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
|
321 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
322 $ hg qseries -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
323 0 G new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
324 1 G b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
325 2 A c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
326 3 G d.patch |
3685
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2990
diff
changeset
|
327 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
328 $ qappunappv() |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
329 > { |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
330 > 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
|
331 > echo % hg $command |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
332 > hg $command |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
333 > done |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
334 > } |
4240
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
335 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
336 $ hg qpop -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
337 popping c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
338 patch queue now empty |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
339 $ hg qguard -l |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
340 new.patch: +1 +2 -3 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
341 b.patch: +2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
342 c.patch: unguarded |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
343 d.patch: +2 |
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 % hg qapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
346 % hg qapplied -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
347 % hg qunapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
348 c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
349 % hg qunapplied -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
350 0 G new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
351 1 G b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
352 2 U c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
353 3 G d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
354 $ hg qselect 1 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
355 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
|
356 $ qappunappv |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
357 % hg qapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
358 % hg qapplied -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
359 % hg qunapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
360 new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
361 c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
362 % hg qunapplied -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
363 0 U new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
364 1 G b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
365 2 U c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
366 3 G d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
367 $ hg qpush -a |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
368 applying new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
369 skipping b.patch - guarded by ['+2'] |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
370 applying c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
371 skipping d.patch - guarded by ['+2'] |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
372 now at: c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
373 $ qappunappv |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
374 % hg qapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
375 new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
376 c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
377 % hg qapplied -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
378 0 A new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
379 1 G b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
380 2 A c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
381 % hg qunapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
382 % hg qunapplied -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
383 3 G d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
384 $ hg qselect 2 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
385 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
|
386 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
|
387 $ qappunappv |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
388 % hg qapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
389 new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
390 c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
391 % hg qapplied -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
392 0 A new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
393 1 U b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
394 2 A c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
395 % hg qunapplied |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
396 d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
397 % hg qunapplied -v |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
398 3 U d.patch |
4240
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
399 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
400 $ for patch in `hg qseries`; do |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
401 > echo % hg qapplied $patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
402 > hg qapplied $patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
403 > echo % hg qunapplied $patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
404 > hg qunapplied $patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
405 > done |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
406 % hg qapplied new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
407 new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
408 % hg qunapplied new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
409 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 b.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 % hg qunapplied b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
414 d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
415 % hg qapplied c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
416 new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
417 c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
418 % hg qunapplied c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
419 d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
420 % hg qapplied d.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
421 new.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
422 c.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
423 % hg qunapplied d.patch |
4240
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
424 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
425 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
426 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
|
427 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
|
428 |
11896
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
429 $ hg qdelete -k b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
430 $ hg qseries -m |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
431 b.patch |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
432 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
433 hg qseries -m with color |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
434 |
286693eaba47
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11819
diff
changeset
|
435 $ hg --config extensions.color= qseries -m --color=always |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12316
diff
changeset
|
436 \x1b[0;31;1mb.patch\x1b[0m (esc) |