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