author | Matt Mackall <mpm@selenic.com> |
Fri, 27 Oct 2006 11:24:10 -0500 | |
changeset 3563 | 26b556c1d01d |
parent 3459 | ba3a96750de0 |
child 3681 | 05d877dfd33d |
permissions | -rwxr-xr-x |
2729 | 1 |
#!/bin/sh |
2 |
||
2976
61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2935
diff
changeset
|
3 |
echo "[extensions]" >> $HGRCPATH |
61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2935
diff
changeset
|
4 |
echo "mq=" >> $HGRCPATH |
2729 | 5 |
|
6 |
echo % help |
|
7 |
hg help mq |
|
8 |
||
9 |
hg init a |
|
10 |
cd a |
|
11 |
echo a > a |
|
2836
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2834
diff
changeset
|
12 |
hg ci -Ama |
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2834
diff
changeset
|
13 |
|
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2834
diff
changeset
|
14 |
hg clone . ../k |
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2834
diff
changeset
|
15 |
|
2729 | 16 |
mkdir b |
17 |
echo z > b/z |
|
18 |
hg ci -Ama |
|
19 |
||
20 |
echo % qinit |
|
21 |
||
22 |
hg qinit |
|
23 |
||
24 |
cd .. |
|
25 |
hg init b |
|
26 |
||
27 |
echo % -R qinit |
|
28 |
||
29 |
hg -R b qinit |
|
30 |
||
31 |
hg init c |
|
32 |
||
33 |
echo % qinit -c |
|
34 |
||
35 |
hg --cwd c qinit -c |
|
36 |
hg -R c/.hg/patches st |
|
37 |
||
38 |
echo % qnew implies add |
|
39 |
||
40 |
hg -R c qnew test.patch |
|
41 |
hg -R c/.hg/patches st |
|
42 |
||
43 |
cd a |
|
44 |
||
45 |
echo % qnew -m |
|
46 |
||
47 |
hg qnew -m 'foo bar' test.patch |
|
48 |
cat .hg/patches/test.patch |
|
49 |
||
50 |
echo % qrefresh |
|
51 |
||
52 |
echo a >> a |
|
53 |
hg qrefresh |
|
2831
0b9ac7dfcf56
Fix some tests for portability.
Danek Duvall <danek.duvall@sun.com>
parents:
2729
diff
changeset
|
54 |
sed -e "s/^\(diff -r \)\([a-f0-9]* \)/\1 x/" \ |
2729 | 55 |
-e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
56 |
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/test.patch |
|
57 |
||
58 |
echo % qpop |
|
59 |
||
60 |
hg qpop |
|
61 |
||
62 |
echo % qpush |
|
63 |
||
64 |
hg qpush |
|
65 |
||
66 |
cd .. |
|
67 |
||
68 |
echo % pop/push outside repo |
|
69 |
||
70 |
hg -R a qpop |
|
71 |
hg -R a qpush |
|
72 |
||
73 |
cd a |
|
74 |
hg qnew test2.patch |
|
75 |
||
76 |
echo % qrefresh in subdir |
|
77 |
||
78 |
cd b |
|
79 |
echo a > a |
|
80 |
hg add a |
|
81 |
hg qrefresh |
|
82 |
||
83 |
echo % pop/push -a in subdir |
|
84 |
||
85 |
hg qpop -a |
|
86 |
hg --traceback qpush -a |
|
87 |
||
88 |
echo % qseries |
|
89 |
hg qseries |
|
90 |
||
91 |
echo % qapplied |
|
92 |
hg qapplied |
|
93 |
||
94 |
echo % qtop |
|
95 |
hg qtop |
|
96 |
||
97 |
echo % qprev |
|
98 |
hg qprev |
|
99 |
||
100 |
echo % qnext |
|
101 |
hg qnext |
|
102 |
||
103 |
echo % pop, qnext, qprev, qapplied |
|
104 |
hg qpop |
|
105 |
hg qnext |
|
106 |
hg qprev |
|
107 |
hg qapplied |
|
108 |
||
2834
b8d587cfa3bb
mq: test commit in repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2831
diff
changeset
|
109 |
echo % commit should fail |
b8d587cfa3bb
mq: test commit in repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2831
diff
changeset
|
110 |
hg commit |
b8d587cfa3bb
mq: test commit in repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2831
diff
changeset
|
111 |
|
2836
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2834
diff
changeset
|
112 |
echo % push should fail |
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2834
diff
changeset
|
113 |
hg push ../../k |
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2834
diff
changeset
|
114 |
|
2729 | 115 |
echo % qunapplied |
116 |
hg qunapplied |
|
117 |
||
3078
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3024
diff
changeset
|
118 |
echo % qpush/qpop with index |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3024
diff
changeset
|
119 |
hg qnew test1b.patch |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3024
diff
changeset
|
120 |
echo 1b > 1b |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3024
diff
changeset
|
121 |
hg add 1b |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3024
diff
changeset
|
122 |
hg qrefresh |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3024
diff
changeset
|
123 |
hg qpush 2 |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3024
diff
changeset
|
124 |
hg qpop 0 |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3024
diff
changeset
|
125 |
hg qpush test.patch+1 |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3024
diff
changeset
|
126 |
hg qpush test.patch+2 |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3024
diff
changeset
|
127 |
hg qpop test2.patch-1 |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3024
diff
changeset
|
128 |
hg qpop test2.patch-2 |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3024
diff
changeset
|
129 |
hg qpush test1b.patch+1 |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3024
diff
changeset
|
130 |
|
2836
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2834
diff
changeset
|
131 |
echo % push should succeed |
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2834
diff
changeset
|
132 |
hg qpop -a |
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2834
diff
changeset
|
133 |
hg push ../../k |
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2834
diff
changeset
|
134 |
|
2729 | 135 |
echo % strip |
136 |
cd ../../b |
|
137 |
echo x>x |
|
138 |
hg ci -Ama |
|
139 |
hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
|
140 |
hg unbundle .hg/strip-backup/* |
|
2934
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
141 |
|
3024
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
142 |
echo '% cd b; hg qrefresh' |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
143 |
hg init refresh |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
144 |
cd refresh |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
145 |
echo a > a |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
146 |
hg ci -Ama -d'0 0' |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
147 |
hg qnew -mfoo foo |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
148 |
echo a >> a |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
149 |
hg qrefresh |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
150 |
mkdir b |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
151 |
cd b |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
152 |
echo f > f |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
153 |
hg add f |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
154 |
hg qrefresh |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
155 |
sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
156 |
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
157 |
echo % hg qrefresh . |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
158 |
hg qrefresh . |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
159 |
sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
160 |
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
161 |
hg status |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2976
diff
changeset
|
162 |
|
3332
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3078
diff
changeset
|
163 |
echo % qpush failure |
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3078
diff
changeset
|
164 |
cd .. |
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3078
diff
changeset
|
165 |
hg qrefresh |
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3078
diff
changeset
|
166 |
hg qnew -mbar bar |
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3078
diff
changeset
|
167 |
echo foo > foo |
3459
ba3a96750de0
mq: test case for issue399
Brendan Cully <brendan@kublai.com>
parents:
3332
diff
changeset
|
168 |
echo bar > bar |
ba3a96750de0
mq: test case for issue399
Brendan Cully <brendan@kublai.com>
parents:
3332
diff
changeset
|
169 |
hg add foo bar |
3332
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3078
diff
changeset
|
170 |
hg qrefresh |
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3078
diff
changeset
|
171 |
hg qpop -a |
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3078
diff
changeset
|
172 |
echo bar > foo |
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3078
diff
changeset
|
173 |
hg qpush -a |
3459
ba3a96750de0
mq: test case for issue399
Brendan Cully <brendan@kublai.com>
parents:
3332
diff
changeset
|
174 |
hg st |
3332
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3078
diff
changeset
|
175 |
|
2976
61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2935
diff
changeset
|
176 |
cat >>$HGRCPATH <<EOF |
2934
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
177 |
[diff] |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
178 |
git = True |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
179 |
EOF |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
180 |
cd .. |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
181 |
hg init git |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
182 |
cd git |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
183 |
hg qinit |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
184 |
|
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
185 |
hg qnew -m'new file' new |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
186 |
echo foo > new |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
187 |
chmod +x new |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
188 |
hg add new |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
189 |
hg qrefresh |
2935 | 190 |
sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
191 |
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/new |
|
2934
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
192 |
|
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
193 |
hg qnew -m'copy file' copy |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
194 |
hg cp new copy |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
195 |
hg qrefresh |
2935 | 196 |
sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
197 |
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/copy |
|
2934
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
198 |
|
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
199 |
hg qpop |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
200 |
hg qpush |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2836
diff
changeset
|
201 |
hg qdiff |