tests/test-keyword
author Christian Ebert <blacktrash@gmx.net>
Thu, 14 Feb 2008 18:55:49 +0100
branch0.9.2compat
changeset 414 13043607c6ae
parent 397 db7cc16560d4
child 420 25f2d4cedd4c
permissions -rwxr-xr-x
(0.9.2compat) FIX typo in hgweb monkeys
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     1
#!/bin/sh
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     2
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     3
cat <<EOF >> $HGRCPATH
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     4
[extensions]
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     5
hgext.keyword =
343
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
     6
hgext.mq =
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     7
[keyword]
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     8
* =
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     9
b = ignore
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    10
[hooks]
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    11
commit=
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    12
commit.test=cp a hooktest
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    13
EOF
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    14
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    15
echo % help
218
d7ddb4e378f3 test: use grep -v instead of sed to delete lines
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
    16
# grep for backwards compatibility
202
e2a2f9ca8271 Make test more adaptive to different Hg versions
Christian Ebert <blacktrash@gmx.net>
parents: 189
diff changeset
    17
hg help keyword \
218
d7ddb4e378f3 test: use grep -v instead of sed to delete lines
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
    18
| grep -E -v '^list of commands|hg -v help keyword|^$'
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    19
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    20
echo % hg kwdemo
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    21
hg --quiet kwdemo --default \
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    22
| sed -e 's![^ ][^ ]*demo.txt,v!/TMP/demo.txt,v!' \
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    23
 -e 's/,v [a-z0-9][a-z0-9]* /,v xxxxxxxxxxxx /' \
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    24
 -e '/[$]Revision/ s/: [a-z0-9][a-z0-9]* /: xxxxxxxxxxxx /' \
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    25
 -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!'
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    26
210
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
    27
hg --quiet kwdemo "Branch = {branches}"
304f9ac35869 kwdemo fixes and tweaks
Christian Ebert <blacktrash@gmx.net>
parents: 209
diff changeset
    28
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    29
hg init Test-bndl
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    30
cd Test-bndl
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    31
250
b28a2832cba4 Reduce verbosity of kwexpand/kwshrink
Christian Ebert <blacktrash@gmx.net>
parents: 249
diff changeset
    32
echo % kwshrink should exit silently in empty/invalid repo
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    33
hg kwshrink
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    34
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    35
# Symlinks cannot be created on Windows. The bundle was made with:
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    36
#
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    37
# hg init t
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    38
# cd t
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    39
# echo a > a
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    40
# ln -s a sym
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    41
# hg add sym
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    42
# hg ci -m addsym -u mercurial
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    43
# hg bundle --base null ../test-keyword.hg
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    44
#
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    45
hg pull -u "$TESTDIR/test-keyword.hg" \
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    46
    | sed 's/pulling from.*test-keyword.hg/pulling from test-keyword.hg/'
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
    47
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    48
echo 'expand $Id$' > a
223
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 218
diff changeset
    49
echo 'do not process $Id:' >> a
65a01675a944 Test that pattern does not span more than 1 line
Christian Ebert <blacktrash@gmx.net>
parents: 218
diff changeset
    50
echo 'xxx $' >> a
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    51
echo 'ignore $Id$' > b
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    52
echo % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    53
cat a b
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    54
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    55
echo % addremove
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    56
hg addremove
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    57
echo % status
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    58
hg status
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    59
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    60
echo % default keyword expansion including commit hook
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    61
#echo % interrupted commit should not change state or run commit hook
339
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
    62
#hg --debug commit
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    63
#echo % status
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    64
#hg status
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    65
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    66
echo % commit
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    67
hg --debug commit -mab -d '0 0' -u 'User Name <user@example.com>'
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    68
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    69
hg status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    70
echo % identify
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    71
hg --quiet identify
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    72
echo % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    73
cat a b
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
    74
echo % hg cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
    75
hg cat a b
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    76
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    77
echo
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    78
echo % diff a hooktest
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    79
diff a hooktest
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    80
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    81
echo % removing commit hook from config
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    82
sed -e '/\[hooks\]/,$ d' $HGRCPATH > $HGRCPATH.nohook
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    83
mv $HGRCPATH.nohook $HGRCPATH
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    84
rm hooktest
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    85
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    86
echo % bundle
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    87
hg --quiet bundle --base null ../kw.hg
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    88
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    89
cd ..
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    90
hg init Test
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    91
cd Test
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    92
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    93
echo % pull from bundle
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    94
hg pull -u ../kw.hg
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    95
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    96
echo % touch
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    97
touch a b
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    98
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    99
hg status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   100
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   101
rm a b
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   102
echo % update
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   103
hg update
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   104
echo % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   105
cat a b
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   106
339
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   107
echo % check whether expansion is filewise
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   108
echo '$Id$' > c
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   109
echo 'tests for different changenodes' >> c
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   110
echo % commit c
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   111
hg commit -A -mcndiff -d '1 0' -u 'User Name <user@example.com>'
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   112
echo % force expansion
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   113
hg -v kwexpand
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   114
echo % compare changenodes in a c
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   115
cat a c
343
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   116
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   117
echo % qinit -c
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   118
hg qinit -c
343
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   119
echo % qimport
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   120
hg qimport -r tip -n mqtest.diff
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   121
echo % qcommit
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   122
hg qcommit -mqtest
343
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   123
echo % keywords should not be expanded in patch
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   124
cat .hg/patches/mqtest.diff
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   125
echo % qpop
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   126
hg qpop
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   127
echo % qpush
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   128
hg qpush
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   129
echo % cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   130
cat c
343
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   131
echo % qpop and move on
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   132
hg qpop
339
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   133
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   134
echo % copy
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   135
hg cp a c
259
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   136
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   137
echo % kwfiles added
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   138
hg kwfiles
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   139
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   140
echo % commit
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   141
hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>'
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   142
echo % cat a c
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   143
cat a c
249
8df281c5ca8b Make kwfilelog.cmp test reliable
Christian Ebert <blacktrash@gmx.net>
parents: 247
diff changeset
   144
echo % touch copied c after 1 second
8df281c5ca8b Make kwfilelog.cmp test reliable
Christian Ebert <blacktrash@gmx.net>
parents: 247
diff changeset
   145
sleep 1
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   146
touch c
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   147
echo % status
214
b2e63ec251a9 Add forgotten status for touch copy test
Christian Ebert <blacktrash@gmx.net>
parents: 210
diff changeset
   148
hg status
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   149
247
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   150
echo % kwfiles
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   151
hg kwfiles
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   152
224
fd98a9bffcbe Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents: 223
diff changeset
   153
echo % diff --rev
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   154
hg diff --rev 1 | grep -v 'b/c'
224
fd98a9bffcbe Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents: 223
diff changeset
   155
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   156
echo % rollback
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   157
hg rollback
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   158
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   159
hg status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   160
echo % update -C
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   161
hg update --clean
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   162
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   163
echo % custom keyword expansion
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   164
echo % try with kwdemo
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   165
hg --quiet kwdemo "Xinfo = {author}: {desc}"
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   166
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   167
cat <<EOF >>$HGRCPATH
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   168
[keywordmaps]
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   169
Id = {file} {node|short} {date|rfc822date} {author|user}
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   170
Xinfo = {author}: {desc}
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   171
EOF
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   172
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   173
echo % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   174
cat a b
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   175
echo % hg cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   176
hg cat a b
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   177
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   178
echo '$Xinfo$' >> a
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   179
cat <<EOF >> log
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   180
firstline
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   181
secondline
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   182
EOF
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   183
339
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   184
#echo % interrupted commit should not change state
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   185
#hg commit
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   186
#echo % status
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   187
#hg status
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   188
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   189
echo % commit
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   190
hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   191
rm log
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   192
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   193
hg status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   194
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   195
echo % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   196
cat a b
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   197
echo % hg cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   198
hg cat a b
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   199
215
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   200
echo % remove
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   201
hg remove a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   202
hg --debug commit -m rma
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   203
echo % status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   204
hg status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   205
echo % rollback
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   206
hg rollback
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   207
echo % status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   208
hg status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   209
echo % revert a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   210
hg revert --no-backup --rev tip a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   211
echo % cat a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   212
cat a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   213
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   214
echo % clone to test incoming
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   215
cd ..
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   216
hg clone -r1 Test Test-a
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   217
cd Test-a
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   218
cat <<EOF >> .hg/hgrc
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   219
[paths]
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   220
default = ../Test
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   221
EOF
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   222
echo % incoming
209
430837dbe7f4 Adapt to recent changes in Hg (locks handling, dirstate.update gone)
Christian Ebert <blacktrash@gmx.net>
parents: 208
diff changeset
   223
# remove path to temp dir for backwards compatibility
218
d7ddb4e378f3 test: use grep -v instead of sed to delete lines
Christian Ebert <blacktrash@gmx.net>
parents: 215
diff changeset
   224
hg incoming | grep -v '^comparing with'
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   225
334
578317f9e2f0 (0.9.2compat) test: avoid "sed -i" in commented rejecttest
Christian Ebert <blacktrash@gmx.net>
parents: 326
diff changeset
   226
#sed -e 's/Id.*/& rejecttest/' a > a.new
578317f9e2f0 (0.9.2compat) test: avoid "sed -i" in commented rejecttest
Christian Ebert <blacktrash@gmx.net>
parents: 326
diff changeset
   227
#mv a.new a
324
b3abbb5cf61c (0.9.2compat) add rejecttest as comment, as it is not working in this branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   228
#echo % commit rejecttest
b3abbb5cf61c (0.9.2compat) add rejecttest as comment, as it is not working in this branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   229
#hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>'
b3abbb5cf61c (0.9.2compat) add rejecttest as comment, as it is not working in this branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   230
#echo % export
b3abbb5cf61c (0.9.2compat) add rejecttest as comment, as it is not working in this branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   231
#hg export -o ../rejecttest.diff tip
b3abbb5cf61c (0.9.2compat) add rejecttest as comment, as it is not working in this branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   232
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   233
cd ../Test
324
b3abbb5cf61c (0.9.2compat) add rejecttest as comment, as it is not working in this branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   234
#echo % import
b3abbb5cf61c (0.9.2compat) add rejecttest as comment, as it is not working in this branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   235
#hg import ../rejecttest.diff
b3abbb5cf61c (0.9.2compat) add rejecttest as comment, as it is not working in this branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   236
#echo % cat
b3abbb5cf61c (0.9.2compat) add rejecttest as comment, as it is not working in this branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   237
#cat a b
b3abbb5cf61c (0.9.2compat) add rejecttest as comment, as it is not working in this branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   238
#echo % rollback
b3abbb5cf61c (0.9.2compat) add rejecttest as comment, as it is not working in this branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   239
#hg rollback
b3abbb5cf61c (0.9.2compat) add rejecttest as comment, as it is not working in this branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   240
#echo % clean update
b3abbb5cf61c (0.9.2compat) add rejecttest as comment, as it is not working in this branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   241
#hg update --clean
b3abbb5cf61c (0.9.2compat) add rejecttest as comment, as it is not working in this branch
Christian Ebert <blacktrash@gmx.net>
parents: 311
diff changeset
   242
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   243
echo % kwexpand/kwshrink on selected files
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   244
mkdir x
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   245
echo % copy a x/a
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   246
hg copy a x/a
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   247
echo % kwexpand a
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   248
hg --verbose kwexpand a
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   249
echo % kwexpand x/a should abort
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   250
hg --verbose kwexpand x/a
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   251
cd x
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   252
hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>'
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   253
echo % cat a
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   254
cat a
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   255
echo % kwshrink a inside directory x
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   256
hg --verbose kwshrink a
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   257
echo % cat a
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   258
cat a
339
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   259
cd ..
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   260
279
1f00dce8de12 Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents: 267
diff changeset
   261
echo % kwexpand nonexistent
1f00dce8de12 Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents: 267
diff changeset
   262
hg kwexpand nonexistent
1f00dce8de12 Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents: 267
diff changeset
   263
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   264
echo % switch off expansion
267
4a24c3acd4f2 Tighten condition for kwshrink/kwexpand test
Christian Ebert <blacktrash@gmx.net>
parents: 259
diff changeset
   265
echo % kwshrink with unknown file u
4a24c3acd4f2 Tighten condition for kwshrink/kwexpand test
Christian Ebert <blacktrash@gmx.net>
parents: 259
diff changeset
   266
cp a u
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   267
hg --verbose kwshrink
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   268
echo % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   269
cat a b
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   270
echo % hg cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   271
hg cat a b
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   272
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   273
rm $HGRCPATH
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   274
echo % cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   275
cat a b
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   276
echo % hg cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   277
hg cat a b