author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
Wed, 08 Apr 2009 02:38:23 +0900 | |
changeset 8060 | 84d0fe34427b |
parent 7772 | 88887054d277 |
child 9365 | b8dc3eba4f9d |
permissions | -rwxr-xr-x |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
1 |
#!/bin/sh |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
2 |
|
2990
61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2850
diff
changeset
|
3 |
echo "[extensions]" >> $HGRCPATH |
61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2850
diff
changeset
|
4 |
echo "mq=" >> $HGRCPATH |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
5 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
6 |
hg init |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 |
hg qinit |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
8 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
9 |
echo x > x |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
10 |
hg ci -Ama |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
11 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
12 |
hg qnew a.patch |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
13 |
echo a > a |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
14 |
hg add a |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
15 |
hg qrefresh |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
16 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
17 |
hg qnew b.patch |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
18 |
echo b > b |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
19 |
hg add b |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
20 |
hg qrefresh |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
21 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
22 |
hg qnew c.patch |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
23 |
echo c > c |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
24 |
hg add c |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
25 |
hg qrefresh |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
26 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
27 |
hg qpop -a |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
28 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
29 |
echo % should fail |
4133
a9ee6c53af8d
mq: abort cleanly when invalid patch name is given to qguard
Christian Ebert <blacktrash@gmx.net>
parents:
3763
diff
changeset
|
30 |
hg qguard does-not-exist.patch +bleh |
a9ee6c53af8d
mq: abort cleanly when invalid patch name is given to qguard
Christian Ebert <blacktrash@gmx.net>
parents:
3763
diff
changeset
|
31 |
|
a9ee6c53af8d
mq: abort cleanly when invalid patch name is given to qguard
Christian Ebert <blacktrash@gmx.net>
parents:
3763
diff
changeset
|
32 |
echo % should fail |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
33 |
hg qguard +fail |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
34 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
35 |
hg qpush |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
36 |
echo % should guard a.patch |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
37 |
hg qguard +a |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
38 |
echo % should print +a |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
39 |
hg qguard |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
40 |
hg qpop |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
41 |
|
7398
2cd1308cb588
mq: gracefully abort qpush/qgoto to guarded patch (issue1186)
Brendan Cully <brendan@kublai.com>
parents:
6607
diff
changeset
|
42 |
echo % should fail |
2cd1308cb588
mq: gracefully abort qpush/qgoto to guarded patch (issue1186)
Brendan Cully <brendan@kublai.com>
parents:
6607
diff
changeset
|
43 |
hg qpush a.patch |
2cd1308cb588
mq: gracefully abort qpush/qgoto to guarded patch (issue1186)
Brendan Cully <brendan@kublai.com>
parents:
6607
diff
changeset
|
44 |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
45 |
hg qguard a.patch |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
46 |
echo % should push b.patch |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
47 |
hg qpush |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
48 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
49 |
hg qpop |
6607
75b506f0e571
mq: make qselect fail properly on an empty guard
Patrick Mezard <pmezard@gmail.com>
parents:
5471
diff
changeset
|
50 |
echo % test selection of an empty guard |
75b506f0e571
mq: make qselect fail properly on an empty guard
Patrick Mezard <pmezard@gmail.com>
parents:
5471
diff
changeset
|
51 |
hg qselect "" |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
52 |
hg qselect a |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
53 |
echo % should push a.patch |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
54 |
hg qpush |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
55 |
|
7772
88887054d277
fancyopts: Parse options that occur after arguments.
Augie Fackler <durin42@gmail.com>
parents:
7398
diff
changeset
|
56 |
hg qguard -- c.patch -a |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
57 |
echo % should print -a |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
58 |
hg qguard c.patch |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
59 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
60 |
echo % should skip c.patch |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
61 |
hg qpush -a |
4405
8369672060b5
Test qtop breaking when series ends with guarded patches.
Patrick Mezard <pmezard@gmail.com>
parents:
4340
diff
changeset
|
62 |
echo % should display b.patch |
8369672060b5
Test qtop breaking when series ends with guarded patches.
Patrick Mezard <pmezard@gmail.com>
parents:
4340
diff
changeset
|
63 |
hg qtop |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
64 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
65 |
hg qguard -n c.patch |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
66 |
echo % should push c.patch |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
67 |
hg qpush -a |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
68 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
69 |
hg qpop -a |
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
70 |
hg qselect -n |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
71 |
echo % should push all |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
72 |
hg qpush -a |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
73 |
|
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
74 |
hg qpop -a |
2850
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
75 |
hg qguard a.patch +1 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
76 |
hg qguard b.patch +2 |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
77 |
hg qselect 1 |
2850
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
78 |
echo % should push a.patch, not b.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
79 |
hg qpush |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
80 |
hg qpush |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
81 |
hg qpop -a |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
82 |
|
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
83 |
hg qselect 2 |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
84 |
echo % should push b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
85 |
hg qpush |
4340
23068518deca
mq: test qtop with holes in the patch sequence.
Patrick Mezard <pmezard@gmail.com>
parents:
4241
diff
changeset
|
86 |
hg qpush -a |
23068518deca
mq: test qtop with holes in the patch sequence.
Patrick Mezard <pmezard@gmail.com>
parents:
4241
diff
changeset
|
87 |
# Used to be an issue with holes in the patch sequence |
23068518deca
mq: test qtop with holes in the patch sequence.
Patrick Mezard <pmezard@gmail.com>
parents:
4241
diff
changeset
|
88 |
# So, put one hole on the base and ask for topmost patch. |
23068518deca
mq: test qtop with holes in the patch sequence.
Patrick Mezard <pmezard@gmail.com>
parents:
4241
diff
changeset
|
89 |
hg qtop |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
90 |
hg qpop -a |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
91 |
|
2850
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
92 |
hg qselect 1 2 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
93 |
echo % should push a.patch, b.patch |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
94 |
hg qpush |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
95 |
hg qpush |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
96 |
hg qpop -a |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
97 |
|
7772
88887054d277
fancyopts: Parse options that occur after arguments.
Augie Fackler <durin42@gmail.com>
parents:
7398
diff
changeset
|
98 |
hg qguard -- a.patch +1 +2 -3 |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
99 |
hg qselect 1 2 3 |
2850
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
100 |
echo % list patches and guards |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
101 |
hg qguard -l |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
102 |
echo % list series |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
103 |
hg qseries -v |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
104 |
echo % list guards |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
105 |
hg qselect |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
106 |
echo % should push b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2821
diff
changeset
|
107 |
hg qpush |
2844
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
108 |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
109 |
hg qpush -a |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
110 |
hg qselect -n --reapply |
2850
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
111 |
echo % guards in series file: +1 +2 -3 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
112 |
hg qselect -s |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
113 |
echo % should show c.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
114 |
hg qapplied |
3685
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2990
diff
changeset
|
115 |
|
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2990
diff
changeset
|
116 |
hg qrename a.patch new.patch |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2990
diff
changeset
|
117 |
echo % should show : |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2990
diff
changeset
|
118 |
echo % new.patch: +1 +2 -3 |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2990
diff
changeset
|
119 |
echo % b.patch: +2 |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2990
diff
changeset
|
120 |
echo % c.patch: unguarded |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2990
diff
changeset
|
121 |
hg qguard -l |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2990
diff
changeset
|
122 |
|
3763
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
123 |
hg qnew d.patch |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
124 |
hg qpop |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
125 |
echo % should show new.patch and b.patch as Guarded, c.patch as Applied |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
126 |
echo % and d.patch as Unapplied |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
127 |
hg qseries -v |
3685
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2990
diff
changeset
|
128 |
|
3763
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
129 |
hg qguard d.patch +2 |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
130 |
echo % new.patch, b.patch: Guarded. c.patch: Applied. d.patch: Guarded. |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
131 |
hg qseries -v |
4240
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
132 |
|
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
133 |
qappunappv() |
5471
5b81c1cc6ebe
tests: make test-mq-guards work with ksh
Jim Hague <jim.hague@acm.org>
parents:
4405
diff
changeset
|
134 |
{ |
4240
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
135 |
for command in qapplied "qapplied -v" qunapplied "qunapplied -v"; do |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
136 |
echo % hg $command |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
137 |
hg $command |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
138 |
done |
5471
5b81c1cc6ebe
tests: make test-mq-guards work with ksh
Jim Hague <jim.hague@acm.org>
parents:
4405
diff
changeset
|
139 |
} |
4240
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
140 |
|
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
141 |
hg qpop -a |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
142 |
hg qguard -l |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
143 |
qappunappv |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
144 |
hg qselect 1 |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
145 |
qappunappv |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
146 |
hg qpush -a |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
147 |
qappunappv |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
148 |
hg qselect 2 |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
149 |
qappunappv |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
150 |
|
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
151 |
for patch in `hg qseries`; do |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
152 |
echo % hg qapplied $patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
153 |
hg qapplied $patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
154 |
echo % hg qunapplied $patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
155 |
hg qunapplied $patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
156 |
done |
4241
7c59ade0f0d6
hg qseries -m: guards file was not ignored
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4240
diff
changeset
|
157 |
|
7c59ade0f0d6
hg qseries -m: guards file was not ignored
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4240
diff
changeset
|
158 |
echo % hg qseries -m: only b.patch should be shown |
7c59ade0f0d6
hg qseries -m: guards file was not ignored
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4240
diff
changeset
|
159 |
echo the guards file was not ignored in the past |
7c59ade0f0d6
hg qseries -m: guards file was not ignored
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4240
diff
changeset
|
160 |
hg qdelete -k b.patch |
7c59ade0f0d6
hg qseries -m: guards file was not ignored
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4240
diff
changeset
|
161 |
hg qseries -m |