tests/test-keyword
author Christian Ebert <blacktrash@gmx.net>
Fri, 08 Feb 2008 10:14:47 +0100
branch0.9.2compat
changeset 387 ecb2935f9bb8
parent 380 0ed26effe190
child 397 db7cc16560d4
permissions -rwxr-xr-x
(0.9.2compat) incorporate changes from default branch Testing reveals no name conflict with RuleDispatch's dispatch module. At least not with 0.9.* release versions.
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
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    35
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
    36
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
    37
echo 'xxx $' >> a
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    38
echo 'ignore $Id$' > b
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    39
echo % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    40
cat a b
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    41
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    42
echo % addremove
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    43
hg addremove
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    44
echo % status
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    45
hg status
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    46
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    47
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
    48
#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
    49
#hg --debug commit
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    50
#echo % status
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    51
#hg status
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    52
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    53
echo % commit
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    54
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
    55
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    56
hg status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    57
echo % identify
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    58
hg --quiet identify
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    59
echo % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    60
cat a b
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
    61
echo % hg cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
    62
hg cat a b
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    63
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    64
echo
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    65
echo % diff a hooktest
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    66
diff a hooktest
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    67
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    68
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
    69
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
    70
mv $HGRCPATH.nohook $HGRCPATH
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    71
rm hooktest
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    72
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    73
echo % bundle
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    74
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
    75
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    76
cd ..
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    77
hg init Test
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    78
cd Test
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    79
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    80
echo % pull from bundle
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    81
hg pull -u ../kw.hg
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    82
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    83
echo % touch
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    84
touch a b
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    85
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    86
hg status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    87
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    88
rm a b
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    89
echo % update
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    90
hg update
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    91
echo % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    92
cat a b
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    93
339
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
    94
echo % check whether expansion is filewise
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
    95
echo '$Id$' > c
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
    96
echo 'tests for different changenodes' >> c
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
    97
echo % commit c
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
    98
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
    99
echo % force expansion
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   100
hg -v kwexpand
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   101
echo % compare changenodes in a c
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   102
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
   103
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   104
echo % qinit -c
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   105
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
   106
echo % qimport
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   107
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
   108
echo % qcommit
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   109
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
   110
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
   111
cat .hg/patches/mqtest.diff
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   112
echo % qpop
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   113
hg qpop
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   114
echo % qpush
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   115
hg qpush
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   116
echo % cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   117
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
   118
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
   119
hg qpop
339
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   120
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   121
echo % copy
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   122
hg cp a c
259
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   123
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   124
echo % kwfiles added
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   125
hg kwfiles
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   126
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   127
echo % commit
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   128
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
   129
echo % cat a c
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   130
cat a c
249
8df281c5ca8b Make kwfilelog.cmp test reliable
Christian Ebert <blacktrash@gmx.net>
parents: 247
diff changeset
   131
echo % touch copied c after 1 second
8df281c5ca8b Make kwfilelog.cmp test reliable
Christian Ebert <blacktrash@gmx.net>
parents: 247
diff changeset
   132
sleep 1
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   133
touch c
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   134
echo % status
214
b2e63ec251a9 Add forgotten status for touch copy test
Christian Ebert <blacktrash@gmx.net>
parents: 210
diff changeset
   135
hg status
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   136
247
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   137
echo % kwfiles
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   138
hg kwfiles
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   139
224
fd98a9bffcbe Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents: 223
diff changeset
   140
echo % diff --rev
257
1090221301cf test: use grep instead of grep -F
Christian Ebert <blacktrash@gmx.net>
parents: 256
diff changeset
   141
hg diff --rev 0 | grep -v 'b/c'
224
fd98a9bffcbe Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents: 223
diff changeset
   142
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   143
echo % rollback
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   144
hg rollback
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   145
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   146
hg status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   147
echo % update -C
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   148
hg update --clean
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   149
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   150
echo % custom keyword expansion
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   151
echo % try with kwdemo
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   152
hg --quiet kwdemo "Xinfo = {author}: {desc}"
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   153
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   154
cat <<EOF >>$HGRCPATH
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   155
[keywordmaps]
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   156
Id = {file} {node|short} {date|rfc822date} {author|user}
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   157
Xinfo = {author}: {desc}
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   158
EOF
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   159
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   160
echo % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   161
cat a b
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   162
echo % hg cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   163
hg cat a b
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   164
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   165
echo '$Xinfo$' >> a
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   166
cat <<EOF >> log
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   167
firstline
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   168
secondline
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   169
EOF
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   170
339
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   171
#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
   172
#hg commit
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   173
#echo % status
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   174
#hg status
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   175
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   176
echo % commit
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   177
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
   178
rm log
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   179
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   180
hg status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   181
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   182
echo % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   183
cat a b
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   184
echo % hg cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   185
hg cat a b
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   186
215
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   187
echo % remove
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   188
hg remove a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   189
hg --debug commit -m rma
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   190
echo % status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   191
hg status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   192
echo % rollback
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   193
hg rollback
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   194
echo % status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   195
hg status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   196
echo % revert a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   197
hg revert --no-backup --rev tip a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   198
echo % cat a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   199
cat a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   200
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   201
echo % clone to test incoming
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   202
cd ..
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   203
hg clone -r0 Test Test-a
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   204
cd Test-a
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   205
cat <<EOF >> .hg/hgrc
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   206
[paths]
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   207
default = ../Test
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   208
EOF
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   209
echo % incoming
209
430837dbe7f4 Adapt to recent changes in Hg (locks handling, dirstate.update gone)
Christian Ebert <blacktrash@gmx.net>
parents: 208
diff changeset
   210
# 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
   211
hg incoming | grep -v '^comparing with'
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   212
334
578317f9e2f0 (0.9.2compat) test: avoid "sed -i" in commented rejecttest
Christian Ebert <blacktrash@gmx.net>
parents: 326
diff changeset
   213
#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
   214
#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
   215
#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
   216
#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
   217
#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
   218
#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
   219
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   220
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
   221
#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
   222
#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
   223
#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
   224
#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
   225
#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
   226
#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
   227
#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
   228
#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
   229
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   230
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
   231
mkdir x
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   232
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
   233
hg copy a x/a
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   234
echo % kwexpand a
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   235
hg --verbose kwexpand a
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   236
echo % kwexpand x/a should abort
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   237
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
   238
cd x
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   239
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
   240
echo % cat a
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   241
cat a
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   242
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
   243
hg --verbose kwshrink a
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   244
echo % cat a
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   245
cat a
339
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   246
cd ..
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   247
279
1f00dce8de12 Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents: 267
diff changeset
   248
echo % kwexpand nonexistent
1f00dce8de12 Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents: 267
diff changeset
   249
hg kwexpand nonexistent
1f00dce8de12 Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents: 267
diff changeset
   250
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   251
echo % switch off expansion
267
4a24c3acd4f2 Tighten condition for kwshrink/kwexpand test
Christian Ebert <blacktrash@gmx.net>
parents: 259
diff changeset
   252
echo % kwshrink with unknown file u
4a24c3acd4f2 Tighten condition for kwshrink/kwexpand test
Christian Ebert <blacktrash@gmx.net>
parents: 259
diff changeset
   253
cp a u
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   254
hg --verbose kwshrink
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   255
echo % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   256
cat a b
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   257
echo % hg cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   258
hg cat a b
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   259
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   260
rm $HGRCPATH
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   261
echo % cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   262
cat a b
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   263
echo % hg cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   264
hg cat a b