author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
Sun, 24 May 2009 18:43:05 +0900 | |
changeset 8599 | 1f706b1b62f3 |
parent 8167 | 6c82beaaa11a |
child 8742 | a964ab624385 |
permissions | -rwxr-xr-x |
5816 | 1 |
#!/bin/sh |
2 |
||
3 |
cat <<EOF >> $HGRCPATH |
|
4 |
[extensions] |
|
5 |
hgext.keyword = |
|
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
6 |
hgext.mq = |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
7 |
hgext.notify = |
5816 | 8 |
[keyword] |
9 |
* = |
|
10 |
b = ignore |
|
11 |
[hooks] |
|
12 |
commit= |
|
13 |
commit.test=cp a hooktest |
|
14 |
EOF |
|
15 |
||
16 |
echo % help |
|
17 |
hg help keyword |
|
18 |
||
19 |
echo % hg kwdemo |
|
20 |
hg --quiet kwdemo --default \ |
|
21 |
| sed -e 's![^ ][^ ]*demo.txt,v!/TMP/demo.txt,v!' \ |
|
22 |
-e 's/,v [a-z0-9][a-z0-9]* /,v xxxxxxxxxxxx /' \ |
|
23 |
-e '/[$]Revision/ s/: [a-z0-9][a-z0-9]* /: xxxxxxxxxxxx /' \ |
|
24 |
-e 's! 20[0-9][0-9]/[01][0-9]/[0-3][0-9] [0-2][0-9]:[0-6][0-9]:[0-6][0-9]! 2000/00/00 00:00:00!' |
|
25 |
||
26 |
hg --quiet kwdemo "Branch = {branches}" |
|
27 |
||
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
28 |
hg init Test-bndl |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
29 |
cd Test-bndl |
5816 | 30 |
|
31 |
echo % kwshrink should exit silently in empty/invalid repo |
|
32 |
hg kwshrink |
|
33 |
||
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
34 |
# Symlinks cannot be created on Windows. The bundle was made with: |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
35 |
# |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
36 |
# hg init t |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
37 |
# cd t |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
38 |
# echo a > a |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
39 |
# ln -s a sym |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
40 |
# hg add sym |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
41 |
# hg ci -m addsym -u mercurial |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
42 |
# hg bundle --base null ../test-keyword.hg |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
43 |
# |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
44 |
hg pull -u "$TESTDIR/test-keyword.hg" \ |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
45 |
| sed 's/pulling from.*test-keyword.hg/pulling from test-keyword.hg/' |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
46 |
|
5816 | 47 |
echo 'expand $Id$' > a |
48 |
echo 'do not process $Id:' >> a |
|
49 |
echo 'xxx $' >> a |
|
50 |
echo 'ignore $Id$' > b |
|
51 |
echo % cat |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
52 |
cat a b |
5816 | 53 |
|
54 |
echo % addremove |
|
55 |
hg addremove |
|
56 |
echo % status |
|
57 |
hg status |
|
58 |
||
59 |
echo % default keyword expansion including commit hook |
|
60 |
echo % interrupted commit should not change state or run commit hook |
|
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5839
diff
changeset
|
61 |
hg --debug commit |
5816 | 62 |
echo % status |
63 |
hg status |
|
64 |
||
65 |
echo % commit |
|
8167
6c82beaaa11a
tests: removed redundant "-d '0 0'" from test scripts
Martin Geisler <mg@lazybytes.net>
parents:
7527
diff
changeset
|
66 |
hg --debug commit -mabsym -u 'User Name <user@example.com>' |
5816 | 67 |
echo % status |
68 |
hg status |
|
69 |
echo % identify |
|
6157
09b00faa8670
keyword: remove "identify" and "remove" from nokwcommands
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6116
diff
changeset
|
70 |
hg debugrebuildstate |
5816 | 71 |
hg --quiet identify |
72 |
echo % cat |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
73 |
cat a b |
5816 | 74 |
echo % hg cat |
75 |
hg cat sym a b |
|
76 |
||
77 |
echo |
|
78 |
echo % diff a hooktest |
|
79 |
diff a hooktest |
|
80 |
||
81 |
echo % removing commit hook from config |
|
82 |
sed -e '/\[hooks\]/,$ d' $HGRCPATH > $HGRCPATH.nohook |
|
83 |
mv $HGRCPATH.nohook $HGRCPATH |
|
84 |
rm hooktest |
|
85 |
||
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
86 |
echo % bundle |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
87 |
hg bundle --base null ../kw.hg |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
88 |
|
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
89 |
cd .. |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
90 |
hg init Test |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
91 |
cd Test |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
92 |
|
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
93 |
echo % notify on pull to check whether keywords stay as is in email |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
94 |
echo % ie. if patch.diff wrapper acts as it should |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
95 |
|
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
96 |
cat <<EOF >> $HGRCPATH |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
97 |
[hooks] |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
98 |
incoming.notify = python:hgext.notify.hook |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
99 |
[notify] |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
100 |
sources = pull |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
101 |
diffstat = False |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
102 |
[reposubs] |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
103 |
* = Test |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
104 |
EOF |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
105 |
|
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
106 |
echo % pull from bundle |
7116
e981725da3fe
notify: mime-encode messages
Christian Ebert <blacktrash@gmx.net>
parents:
6933
diff
changeset
|
107 |
hg pull -u ../kw.hg 2>&1 | sed -e '/^Content-Type:/,/^diffs (/ d' |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
108 |
|
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
109 |
echo % remove notify config |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
110 |
sed -e '/\[hooks\]/,$ d' $HGRCPATH > $HGRCPATH.nonotify |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
111 |
mv $HGRCPATH.nonotify $HGRCPATH |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
112 |
|
5816 | 113 |
echo % touch |
114 |
touch a b |
|
115 |
echo % status |
|
116 |
hg status |
|
117 |
||
118 |
rm sym a b |
|
119 |
echo % update |
|
120 |
hg update |
|
121 |
echo % cat |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
122 |
cat a b |
5816 | 123 |
|
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
124 |
echo % check whether expansion is filewise |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
125 |
echo '$Id$' > c |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
126 |
echo 'tests for different changenodes' >> c |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
127 |
echo % commit c |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
128 |
hg commit -A -mcndiff -d '1 0' -u 'User Name <user@example.com>' |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
129 |
echo % force expansion |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
130 |
hg -v kwexpand |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
131 |
echo % compare changenodes in a c |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
132 |
cat a c |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
133 |
|
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
134 |
echo % qinit -c |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
135 |
hg qinit -c |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
136 |
echo % qimport |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
137 |
hg qimport -r tip -n mqtest.diff |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
138 |
echo % qcommit |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
139 |
hg qcommit -mqtest |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
140 |
echo % keywords should not be expanded in patch |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
141 |
cat .hg/patches/mqtest.diff |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
142 |
echo % qpop |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
143 |
hg qpop |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
144 |
echo % qgoto - should imply qpush |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
145 |
hg qgoto mqtest.diff |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
146 |
echo % cat |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
147 |
cat c |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
148 |
echo % qpop and move on |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
149 |
hg qpop |
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
150 |
|
5816 | 151 |
echo % copy |
152 |
hg cp a c |
|
153 |
||
154 |
echo % kwfiles added |
|
155 |
hg kwfiles |
|
156 |
||
157 |
echo % commit |
|
158 |
hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>' |
|
159 |
echo % cat a c |
|
160 |
cat a c |
|
6328
991f7518c3f3
tests: remove some unnecessary sleeps
Matt Mackall <mpm@selenic.com>
parents:
6157
diff
changeset
|
161 |
echo % touch copied c |
5816 | 162 |
touch c |
163 |
echo % status |
|
164 |
hg status |
|
165 |
||
166 |
echo % kwfiles |
|
167 |
hg kwfiles |
|
168 |
||
169 |
echo % diff --rev |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
170 |
hg diff --rev 1 | grep -v 'b/c' |
5816 | 171 |
|
172 |
echo % rollback |
|
173 |
hg rollback |
|
174 |
echo % status |
|
175 |
hg status |
|
176 |
echo % update -C |
|
177 |
hg update --clean |
|
178 |
||
179 |
echo % custom keyword expansion |
|
180 |
echo % try with kwdemo |
|
181 |
hg --quiet kwdemo "Xinfo = {author}: {desc}" |
|
182 |
||
183 |
cat <<EOF >>$HGRCPATH |
|
184 |
[keywordmaps] |
|
185 |
Id = {file} {node|short} {date|rfc822date} {author|user} |
|
186 |
Xinfo = {author}: {desc} |
|
187 |
EOF |
|
188 |
||
189 |
echo % cat |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
190 |
cat a b |
5816 | 191 |
echo % hg cat |
192 |
hg cat sym a b |
|
193 |
||
194 |
echo |
|
195 |
echo '$Xinfo$' >> a |
|
196 |
cat <<EOF >> log |
|
197 |
firstline |
|
198 |
secondline |
|
199 |
EOF |
|
200 |
||
201 |
echo % interrupted commit should not change state |
|
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5839
diff
changeset
|
202 |
hg commit |
5816 | 203 |
echo % status |
204 |
hg status |
|
205 |
||
206 |
echo % commit |
|
207 |
hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' |
|
208 |
rm log |
|
209 |
echo % status |
|
210 |
hg status |
|
6867
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6667
diff
changeset
|
211 |
echo % verify |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6667
diff
changeset
|
212 |
hg verify |
5816 | 213 |
|
214 |
echo % cat |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
215 |
cat a b |
5816 | 216 |
echo % hg cat |
217 |
hg cat sym a b |
|
218 |
echo |
|
6667
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
219 |
echo % annotate |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
220 |
hg annotate a |
5816 | 221 |
|
222 |
echo % remove |
|
6157
09b00faa8670
keyword: remove "identify" and "remove" from nokwcommands
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6116
diff
changeset
|
223 |
hg debugrebuildstate |
5816 | 224 |
hg remove a |
225 |
hg --debug commit -m rma |
|
226 |
echo % status |
|
227 |
hg status |
|
228 |
echo % rollback |
|
229 |
hg rollback |
|
230 |
echo % status |
|
231 |
hg status |
|
232 |
echo % revert a |
|
233 |
hg revert --no-backup --rev tip a |
|
234 |
echo % cat a |
|
235 |
cat a |
|
236 |
||
237 |
echo % clone to test incoming |
|
238 |
cd .. |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
239 |
hg clone -r1 Test Test-a |
5816 | 240 |
cd Test-a |
241 |
cat <<EOF >> .hg/hgrc |
|
242 |
[paths] |
|
243 |
default = ../Test |
|
244 |
EOF |
|
245 |
echo % incoming |
|
246 |
# remove path to temp dir |
|
247 |
hg incoming | sed -e 's/^\(comparing with \).*\(test-keyword.*\)/\1\2/' |
|
248 |
||
5839
59fba5caa94b
Don't use the -i option with sed
Will Maier <willmaier@ml1.net>
parents:
5816
diff
changeset
|
249 |
sed -e 's/Id.*/& rejecttest/' a > a.new |
59fba5caa94b
Don't use the -i option with sed
Will Maier <willmaier@ml1.net>
parents:
5816
diff
changeset
|
250 |
mv a.new a |
5816 | 251 |
echo % commit rejecttest |
252 |
hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>' |
|
253 |
echo % export |
|
254 |
hg export -o ../rejecttest.diff tip |
|
255 |
||
256 |
cd ../Test |
|
257 |
echo % import |
|
258 |
hg import ../rejecttest.diff |
|
259 |
echo % cat |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
260 |
cat a b |
5816 | 261 |
echo |
262 |
echo % rollback |
|
263 |
hg rollback |
|
264 |
echo % clean update |
|
265 |
hg update --clean |
|
266 |
||
267 |
echo % kwexpand/kwshrink on selected files |
|
268 |
mkdir x |
|
269 |
echo % copy a x/a |
|
270 |
hg copy a x/a |
|
271 |
echo % kwexpand a |
|
272 |
hg --verbose kwexpand a |
|
273 |
echo % kwexpand x/a should abort |
|
274 |
hg --verbose kwexpand x/a |
|
275 |
cd x |
|
276 |
hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' |
|
277 |
echo % cat a |
|
278 |
cat a |
|
279 |
echo % kwshrink a inside directory x |
|
280 |
hg --verbose kwshrink a |
|
281 |
echo % cat a |
|
282 |
cat a |
|
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5839
diff
changeset
|
283 |
cd .. |
5816 | 284 |
|
285 |
echo % kwexpand nonexistent |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
286 |
hg kwexpand nonexistent 2>&1 | sed 's/nonexistent:.*/nonexistent:/' |
5816 | 287 |
|
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
288 |
echo % hg serve |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
289 |
hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
290 |
cat hg.pid >> $DAEMON_PIDS |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
291 |
echo % expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
292 |
echo % hgweb file |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
293 |
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/a/?style=raw') |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
294 |
echo % no expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
295 |
echo % hgweb annotate |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
296 |
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/a/?style=raw') |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
297 |
echo % hgweb changeset |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
298 |
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/tip/?style=raw') |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
299 |
echo % hgweb filediff |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
300 |
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/bb948857c743/a?style=raw') |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
301 |
echo % errors encountered |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
302 |
cat errors.log |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
303 |
|
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
304 |
echo % merge/resolve |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
305 |
echo '$Id$' > m |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
306 |
hg add m |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
307 |
hg commit -m 4kw |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
308 |
echo foo >> m |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
309 |
hg commit -m 5foo |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
310 |
echo % simplemerge |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
311 |
hg update 4 |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
312 |
echo foo >> m |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
313 |
hg commit -m 6foo |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
314 |
hg merge |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
315 |
hg commit -m simplemerge |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
316 |
cat m |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
317 |
echo % conflict |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
318 |
hg update 4 |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
319 |
echo bar >> m |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
320 |
hg commit -m 8bar |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
321 |
hg merge |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
322 |
echo % keyword stays outside conflict zone |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
323 |
cat m |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
324 |
echo % resolve to local |
7527
5a14a8f3b909
resolve: require -a switch to resolve all files
Matt Mackall <mpm@selenic.com>
parents:
7116
diff
changeset
|
325 |
HGMERGE=internal:local hg resolve -a |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
326 |
hg commit -m localresolve |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
327 |
cat m |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
328 |
|
5816 | 329 |
echo % switch off expansion |
330 |
echo % kwshrink with unknown file u |
|
331 |
cp a u |
|
332 |
hg --verbose kwshrink |
|
333 |
echo % cat |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
334 |
cat a b |
5816 | 335 |
echo % hg cat |
336 |
hg cat sym a b |
|
337 |
echo |
|
338 |
rm $HGRCPATH |
|
339 |
echo % cat |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
340 |
cat a b |
5816 | 341 |
echo % hg cat |
342 |
hg cat sym a b |
|
343 |
echo |