tests/test-keyword
author Christian Ebert <blacktrash@gmx.net>
Sun, 24 Aug 2008 20:13:45 +0200
branch0.9.2compat
changeset 489 f3514954d3c6
parent 486 a6f4e1367978
child 638 439e096ce144
permissions -rwxr-xr-x
(0.9.2compat) remove new verbose commit message for backwards compatibility
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
489
f3514954d3c6 (0.9.2compat) remove new verbose commit message for backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 486
diff changeset
    67
hg --debug commit -mab -d '0 0' -u 'User Name <user@example.com>' \
f3514954d3c6 (0.9.2compat) remove new verbose commit message for backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 486
diff changeset
    68
    | grep -v '^committed changeset'
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    69
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    70
hg status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    71
echo % identify
420
25f2d4cedd4c (0.9.2compat) get fix from stable branch
Christian Ebert <blacktrash@gmx.net>
parents: 397
diff changeset
    72
hg debugrebuildstate
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    73
hg --quiet identify
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    74
echo % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    75
cat a b
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
    76
echo % hg cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
    77
hg cat a b
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    78
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    79
echo
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    80
echo % diff a hooktest
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    81
diff a hooktest
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    82
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    83
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
    84
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
    85
mv $HGRCPATH.nohook $HGRCPATH
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    86
rm hooktest
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
    87
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    88
echo % bundle
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    89
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
    90
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    91
cd ..
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    92
hg init Test
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    93
cd Test
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    94
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    95
echo % pull from bundle
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    96
hg pull -u ../kw.hg
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
    97
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    98
echo % touch
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    99
touch a b
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   100
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   101
hg status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   102
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   103
rm a b
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   104
echo % update
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   105
hg update
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   106
echo % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   107
cat a b
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   108
339
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   109
echo % check whether expansion is filewise
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   110
echo '$Id$' > c
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   111
echo 'tests for different changenodes' >> c
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   112
echo % commit c
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   113
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
   114
echo % force expansion
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   115
hg -v kwexpand
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   116
echo % compare changenodes in a c
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   117
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
   118
387
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   119
echo % qinit -c
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   120
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
   121
echo % qimport
f5927e5574e6 (0.9.2compat) get mq support, improved diff output from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 339
diff changeset
   122
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
   123
echo % qcommit
ecb2935f9bb8 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 380
diff changeset
   124
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
   125
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
   126
cat .hg/patches/mqtest.diff
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   127
echo % qpop
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   128
hg qpop
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   129
echo % qpush
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   130
hg qpush
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   131
echo % cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   132
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
   133
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
   134
hg qpop
339
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   135
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   136
echo % copy
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   137
hg cp a c
259
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   138
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   139
echo % kwfiles added
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   140
hg kwfiles
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   141
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   142
echo % commit
489
f3514954d3c6 (0.9.2compat) remove new verbose commit message for backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 486
diff changeset
   143
hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>' \
f3514954d3c6 (0.9.2compat) remove new verbose commit message for backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 486
diff changeset
   144
    | grep -v '^committed changeset'
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   145
echo % cat a c
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   146
cat a c
249
8df281c5ca8b Make kwfilelog.cmp test reliable
Christian Ebert <blacktrash@gmx.net>
parents: 247
diff changeset
   147
echo % touch copied c after 1 second
8df281c5ca8b Make kwfilelog.cmp test reliable
Christian Ebert <blacktrash@gmx.net>
parents: 247
diff changeset
   148
sleep 1
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   149
touch c
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   150
echo % status
214
b2e63ec251a9 Add forgotten status for touch copy test
Christian Ebert <blacktrash@gmx.net>
parents: 210
diff changeset
   151
hg status
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   152
247
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   153
echo % kwfiles
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   154
hg kwfiles
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   155
224
fd98a9bffcbe Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents: 223
diff changeset
   156
echo % diff --rev
397
db7cc16560d4 (0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 387
diff changeset
   157
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
   158
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   159
echo % rollback
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   160
hg rollback
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   161
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   162
hg status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   163
echo % update -C
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   164
hg update --clean
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   165
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   166
echo % custom keyword expansion
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   167
echo % try with kwdemo
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   168
hg --quiet kwdemo "Xinfo = {author}: {desc}"
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   169
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   170
cat <<EOF >>$HGRCPATH
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   171
[keywordmaps]
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   172
Id = {file} {node|short} {date|rfc822date} {author|user}
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   173
Xinfo = {author}: {desc}
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   174
EOF
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 % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   177
cat a b
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   178
echo % hg cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   179
hg cat a b
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   180
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   181
echo '$Xinfo$' >> a
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   182
cat <<EOF >> log
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   183
firstline
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   184
secondline
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   185
EOF
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   186
339
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   187
#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
   188
#hg commit
311
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   189
#echo % status
6160401f94f2 (0.9.2compat) implement context based changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 303
diff changeset
   190
#hg status
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   191
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   192
echo % commit
489
f3514954d3c6 (0.9.2compat) remove new verbose commit message for backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 486
diff changeset
   193
hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' \
f3514954d3c6 (0.9.2compat) remove new verbose commit message for backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 486
diff changeset
   194
    | grep -v '^committed changeset'
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   195
rm log
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   196
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   197
hg status
480
c5e1178401c5 (0.9.2compat) add verify to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   198
echo % verify
c5e1178401c5 (0.9.2compat) add verify to nokwcommands
Christian Ebert <blacktrash@gmx.net>
parents: 462
diff changeset
   199
hg verify
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   200
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   201
echo % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   202
cat a b
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   203
echo % hg cat
462
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 434
diff changeset
   204
hg cat sym a b
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 434
diff changeset
   205
echo
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 434
diff changeset
   206
echo % annotate
f65280d03582 (0.9.2compat) disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 434
diff changeset
   207
hg annotate a
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   208
215
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   209
echo % remove
420
25f2d4cedd4c (0.9.2compat) get fix from stable branch
Christian Ebert <blacktrash@gmx.net>
parents: 397
diff changeset
   210
hg debugrebuildstate
215
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   211
hg remove a
489
f3514954d3c6 (0.9.2compat) remove new verbose commit message for backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 486
diff changeset
   212
hg --debug commit -m rma | grep -v '^committed changeset'
215
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   213
echo % status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   214
hg status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   215
echo % rollback
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   216
hg rollback
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   217
echo % status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   218
hg status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   219
echo % revert a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   220
hg revert --no-backup --rev tip a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   221
echo % cat a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   222
cat a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   223
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   224
echo % clone to test incoming
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   225
cd ..
434
0884558504a3 (0.9.2compat) add test for web changeset
Christian Ebert <blacktrash@gmx.net>
parents: 420
diff changeset
   226
# remove updating status for backwards compatibility
0884558504a3 (0.9.2compat) add test for web changeset
Christian Ebert <blacktrash@gmx.net>
parents: 420
diff changeset
   227
hg clone -r1 Test Test-a | grep -v 'working directory'
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   228
cd Test-a
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   229
cat <<EOF >> .hg/hgrc
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   230
[paths]
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   231
default = ../Test
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   232
EOF
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   233
echo % incoming
209
430837dbe7f4 Adapt to recent changes in Hg (locks handling, dirstate.update gone)
Christian Ebert <blacktrash@gmx.net>
parents: 208
diff changeset
   234
# 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
   235
hg incoming | grep -v '^comparing with'
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   236
334
578317f9e2f0 (0.9.2compat) test: avoid "sed -i" in commented rejecttest
Christian Ebert <blacktrash@gmx.net>
parents: 326
diff changeset
   237
#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
   238
#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
   239
#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
   240
#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
   241
#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
   242
#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
   243
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   244
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
   245
#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
   246
#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
   247
#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
   248
#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
   249
#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
   250
#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
   251
#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
   252
#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
   253
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   254
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
   255
mkdir x
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   256
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
   257
hg copy a x/a
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   258
echo % kwexpand a
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   259
hg --verbose kwexpand a
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   260
echo % kwexpand x/a should abort
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   261
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
   262
cd x
489
f3514954d3c6 (0.9.2compat) remove new verbose commit message for backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 486
diff changeset
   263
hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' \
f3514954d3c6 (0.9.2compat) remove new verbose commit message for backwards compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 486
diff changeset
   264
    | grep -v '^committed changeset'
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   265
echo % cat a
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   266
cat a
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   267
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
   268
hg --verbose kwshrink a
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   269
echo % cat a
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   270
cat a
339
98336da24c5e (0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net>
parents: 334
diff changeset
   271
cd ..
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   272
279
1f00dce8de12 Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents: 267
diff changeset
   273
echo % kwexpand nonexistent
483
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   274
hg kwexpand nonexistent 2>&1 | sed 's/nonexistent:.*/nonexistent:/'
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   275
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   276
#echo % hg serve
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   277
#hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   278
#cat hg.pid >> $DAEMON_PIDS
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   279
#echo % expansion
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   280
#echo % hgweb file
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   281
#("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/a/?style=raw')
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   282
#echo % no expansion
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   283
#echo % hgweb annotate
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   284
#("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/a/?style=raw')
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   285
#echo % hgweb changeset
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   286
#("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/tip/?style=raw')
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   287
#echo % hgweb filediff
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   288
#("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/bb948857c743/a?style=raw')
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   289
#echo % errors encountered
ad766066d1bc (0.9.2compat) fix test compatibility
Christian Ebert <blacktrash@gmx.net>
parents: 480
diff changeset
   290
#cat errors.log
279
1f00dce8de12 Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents: 267
diff changeset
   291
486
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   292
#echo % merge/resolve
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   293
#echo '$Id$' > m
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   294
#hg add m
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   295
#hg commit -m 4kw 
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   296
#echo foo >> m
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   297
#hg commit -m 5foo
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   298
#echo % simplemerge
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   299
#hg update 4
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   300
#echo foo >> m
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   301
#hg commit -m 6foo
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   302
#hg merge
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   303
#hg commit -m simplemerge
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   304
#cat m
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   305
#echo % conflict
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   306
#hg update 4
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   307
#echo bar >> m
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   308
#hg commit -m 8bar
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   309
#hg merge
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   310
#echo % keyword stays outside conflict zone
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   311
#cat m
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   312
#echo % resolve to local
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   313
#HGMERGE=internal:local hg resolve
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   314
#hg commit -m localresolve
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   315
#cat m
a6f4e1367978 (0.9.2compat) add merge, resolve to restricted
Christian Ebert <blacktrash@gmx.net>
parents: 483
diff changeset
   316
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   317
echo % switch off expansion
267
4a24c3acd4f2 Tighten condition for kwshrink/kwexpand test
Christian Ebert <blacktrash@gmx.net>
parents: 259
diff changeset
   318
echo % kwshrink with unknown file u
4a24c3acd4f2 Tighten condition for kwshrink/kwexpand test
Christian Ebert <blacktrash@gmx.net>
parents: 259
diff changeset
   319
cp a u
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   320
hg --verbose kwshrink
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   321
echo % cat
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   322
cat a b
380
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   323
echo % hg cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   324
hg cat a b
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   325
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   326
rm $HGRCPATH
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   327
echo % cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   328
cat a b
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   329
echo % hg cat
0ed26effe190 (0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net>
parents: 370
diff changeset
   330
hg cat a b