tests/test-keyword
author Christian Ebert <blacktrash@gmx.net>
Wed, 23 Dec 2009 12:04:04 +0000
changeset 667 52b03aad673b
parent 653 f4b2fe9d23df
child 668 13a6a2c0440f
permissions -rwxr-xr-x
Do not monkeypatch diff when in restricted mode kw_diff actually disabled restricted mode when 2 revisions were given, because it effectively disables the extension in this case. But the commands working with diff and patch need restricted mode always enabled, i.e. expansion enabled when writing to the working directory and - crucial for these commands - no expansion when reading the filelog.
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 =
342
abf7ccaf0788 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents: 338
diff changeset
     6
hgext.mq =
409
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
     7
hgext.notify =
643
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
     8
EOF
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
     9
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    10
# demo before [keyword] files are set up
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    11
# would succeed without uisetup otherwise
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    12
echo % hg kwdemo
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    13
hg --quiet kwdemo \
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    14
| sed -e 's![^ ][^ ]*demo.txt,v!/TMP/demo.txt,v!' \
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    15
 -e 's/,v [a-z0-9][a-z0-9]* /,v xxxxxxxxxxxx /' \
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    16
 -e '/[$]Revision/ s/: [a-z0-9][a-z0-9]* /: xxxxxxxxxxxx /' \
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    17
 -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!'
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    18
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    19
hg --quiet kwdemo "Branch = {branches}"
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    20
0c7f033354c7 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents: 634
diff changeset
    21
cat <<EOF >> $HGRCPATH
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    22
[keyword]
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    23
* =
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    24
b = ignore
294
343c5dd8dcda Add commit hook test
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
    25
[hooks]
343c5dd8dcda Add commit hook test
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
    26
commit=
343c5dd8dcda Add commit hook test
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
    27
commit.test=cp a hooktest
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    28
EOF
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    29
384
482c91f8c230 Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents: 381
diff changeset
    30
hg init Test-bndl
482c91f8c230 Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents: 381
diff changeset
    31
cd Test-bndl
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    32
378
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
    33
echo % kwshrink should exit silently in empty/invalid repo
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
    34
hg kwshrink
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    35
392
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
    36
# Symlinks cannot be created on Windows. The bundle was made with:
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
    37
#
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
    38
# hg init t
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
    39
# cd t
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
    40
# echo a > a
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
    41
# ln -s a sym
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
    42
# hg add sym
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
    43
# hg ci -m addsym -u mercurial
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
    44
# hg bundle --base null ../test-keyword.hg
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
    45
#
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
    46
hg pull -u "$TESTDIR/test-keyword.hg" \
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
    47
    | sed 's/pulling from.*test-keyword.hg/pulling from test-keyword.hg/'
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
    48
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    49
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
    50
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
    51
echo 'xxx $' >> a
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    52
echo 'ignore $Id$' > b
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    53
echo % cat
392
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
    54
cat a b
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    55
653
f4b2fe9d23df Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents: 643
diff changeset
    56
echo % no kwfiles
f4b2fe9d23df Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents: 643
diff changeset
    57
hg kwfiles
f4b2fe9d23df Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents: 643
diff changeset
    58
echo % untracked candidates
f4b2fe9d23df Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents: 643
diff changeset
    59
hg -v kwfiles --unknown
f4b2fe9d23df Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents: 643
diff changeset
    60
305
d3cdaa49a644 Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents: 302
diff changeset
    61
echo % addremove
d3cdaa49a644 Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents: 302
diff changeset
    62
hg addremove
d3cdaa49a644 Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents: 302
diff changeset
    63
echo % status
d3cdaa49a644 Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents: 302
diff changeset
    64
hg status
d3cdaa49a644 Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents: 302
diff changeset
    65
294
343c5dd8dcda Add commit hook test
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
    66
echo % default keyword expansion including commit hook
305
d3cdaa49a644 Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents: 302
diff changeset
    67
echo % interrupted commit should not change state or run commit hook
337
67b4decdee67 Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 333
diff changeset
    68
hg --debug commit
305
d3cdaa49a644 Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents: 302
diff changeset
    69
echo % status
d3cdaa49a644 Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents: 302
diff changeset
    70
hg status
d3cdaa49a644 Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents: 302
diff changeset
    71
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    72
echo % commit
536
af1cbe3a9141 tests: removed redundant "-d '0 0'" from test scripts
Martin Geisler <mg@lazybytes.net>
parents: 511
diff changeset
    73
hg --debug commit -mabsym -u 'User Name <user@example.com>'
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    74
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    75
hg status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    76
echo % identify
419
2f179ea3a9aa keyword: remove "identify" and "remove" from nokwcommands
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 409
diff changeset
    77
hg debugrebuildstate
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    78
hg --quiet identify
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    79
echo % cat
392
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
    80
cat a b
378
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
    81
echo % hg cat
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
    82
hg cat sym a b
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
    83
290
b05795ad5632 Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents: 281
diff changeset
    84
echo
294
343c5dd8dcda Add commit hook test
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
    85
echo % diff a hooktest
343c5dd8dcda Add commit hook test
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
    86
diff a hooktest
343c5dd8dcda Add commit hook test
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
    87
343c5dd8dcda Add commit hook test
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
    88
echo % removing commit hook from config
343c5dd8dcda Add commit hook test
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
    89
sed -e '/\[hooks\]/,$ d' $HGRCPATH > $HGRCPATH.nohook
343c5dd8dcda Add commit hook test
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
    90
mv $HGRCPATH.nohook $HGRCPATH
343c5dd8dcda Add commit hook test
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
    91
rm hooktest
343c5dd8dcda Add commit hook test
Christian Ebert <blacktrash@gmx.net>
parents: 290
diff changeset
    92
384
482c91f8c230 Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents: 381
diff changeset
    93
echo % bundle
482c91f8c230 Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents: 381
diff changeset
    94
hg bundle --base null ../kw.hg
482c91f8c230 Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents: 381
diff changeset
    95
482c91f8c230 Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents: 381
diff changeset
    96
cd ..
482c91f8c230 Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents: 381
diff changeset
    97
hg init Test
482c91f8c230 Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents: 381
diff changeset
    98
cd Test
482c91f8c230 Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents: 381
diff changeset
    99
409
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   100
echo % notify on pull to check whether keywords stay as is in email
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   101
echo % ie. if patch.diff wrapper acts as it should
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   102
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   103
cat <<EOF >> $HGRCPATH
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   104
[hooks]
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   105
incoming.notify = python:hgext.notify.hook
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   106
[notify]
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   107
sources = pull
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   108
diffstat = False
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   109
[reposubs]
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   110
* = Test
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   111
EOF
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   112
384
482c91f8c230 Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents: 381
diff changeset
   113
echo % pull from bundle
511
fbe7b0409072 notify: mime-encode messages
Christian Ebert <blacktrash@gmx.net>
parents: 485
diff changeset
   114
hg pull -u ../kw.hg 2>&1 | sed -e '/^Content-Type:/,/^diffs (/ d'
409
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   115
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   116
echo % remove notify config
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   117
sed -e '/\[hooks\]/,$ d' $HGRCPATH > $HGRCPATH.nonotify
6e2293f7b9f7 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents: 392
diff changeset
   118
mv $HGRCPATH.nonotify $HGRCPATH
384
482c91f8c230 Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents: 381
diff changeset
   119
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   120
echo % touch
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   121
touch a b
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   122
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   123
hg status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   124
290
b05795ad5632 Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents: 281
diff changeset
   125
rm sym a b
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   126
echo % update
571
4895a3df2098 merge: allow merging going backwards
Matt Mackall <mpm@selenic.com>
parents: 558
diff changeset
   127
hg update -C
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   128
echo % cat
392
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
   129
cat a b
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   130
336
46f5cf3e1a7f Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents: 333
diff changeset
   131
echo % check whether expansion is filewise
46f5cf3e1a7f Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents: 333
diff changeset
   132
echo '$Id$' > c
46f5cf3e1a7f Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents: 333
diff changeset
   133
echo 'tests for different changenodes' >> c
46f5cf3e1a7f Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents: 333
diff changeset
   134
echo % commit c
378
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   135
hg commit -A -mcndiff -d '1 0' -u 'User Name <user@example.com>'
336
46f5cf3e1a7f Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents: 333
diff changeset
   136
echo % force expansion
46f5cf3e1a7f Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents: 333
diff changeset
   137
hg -v kwexpand
46f5cf3e1a7f Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents: 333
diff changeset
   138
echo % compare changenodes in a c
46f5cf3e1a7f Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents: 333
diff changeset
   139
cat a c
342
abf7ccaf0788 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents: 338
diff changeset
   140
381
17e94f77de6a Prevent expansion in queue repo and for email
Christian Ebert <blacktrash@gmx.net>
parents: 378
diff changeset
   141
echo % qinit -c
17e94f77de6a Prevent expansion in queue repo and for email
Christian Ebert <blacktrash@gmx.net>
parents: 378
diff changeset
   142
hg qinit -c
342
abf7ccaf0788 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents: 338
diff changeset
   143
echo % qimport
abf7ccaf0788 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents: 338
diff changeset
   144
hg qimport -r tip -n mqtest.diff
381
17e94f77de6a Prevent expansion in queue repo and for email
Christian Ebert <blacktrash@gmx.net>
parents: 378
diff changeset
   145
echo % qcommit
17e94f77de6a Prevent expansion in queue repo and for email
Christian Ebert <blacktrash@gmx.net>
parents: 378
diff changeset
   146
hg qcommit -mqtest
342
abf7ccaf0788 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents: 338
diff changeset
   147
echo % keywords should not be expanded in patch
abf7ccaf0788 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents: 338
diff changeset
   148
cat .hg/patches/mqtest.diff
abf7ccaf0788 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents: 338
diff changeset
   149
echo % qpop
abf7ccaf0788 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents: 338
diff changeset
   150
hg qpop
abf7ccaf0788 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents: 338
diff changeset
   151
echo % qgoto - should imply qpush
abf7ccaf0788 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents: 338
diff changeset
   152
hg qgoto mqtest.diff
abf7ccaf0788 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents: 338
diff changeset
   153
echo % cat
abf7ccaf0788 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents: 338
diff changeset
   154
cat c
abf7ccaf0788 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents: 338
diff changeset
   155
echo % qpop and move on
abf7ccaf0788 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents: 338
diff changeset
   156
hg qpop
336
46f5cf3e1a7f Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents: 333
diff changeset
   157
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   158
echo % copy
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   159
hg cp a c
259
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   160
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   161
echo % kwfiles added
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   162
hg kwfiles
76402fc0fb58 Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents: 257
diff changeset
   163
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   164
echo % commit
378
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   165
hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>'
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   166
echo % cat a c
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   167
cat a c
426
671d2e27d388 tests: remove some unnecessary sleeps
Matt Mackall <mpm@selenic.com>
parents: 419
diff changeset
   168
echo % touch copied c
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   169
touch c
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   170
echo % status
214
b2e63ec251a9 Add forgotten status for touch copy test
Christian Ebert <blacktrash@gmx.net>
parents: 210
diff changeset
   171
hg status
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   172
247
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   173
echo % kwfiles
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   174
hg kwfiles
653
f4b2fe9d23df Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents: 643
diff changeset
   175
echo % ignored files
f4b2fe9d23df Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents: 643
diff changeset
   176
hg -v kwfiles --ignore
f4b2fe9d23df Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents: 643
diff changeset
   177
echo % all files
f4b2fe9d23df Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents: 643
diff changeset
   178
hg kwfiles --all
247
fc091591de7e Test kwfiles command
Christian Ebert <blacktrash@gmx.net>
parents: 241
diff changeset
   179
224
fd98a9bffcbe Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents: 223
diff changeset
   180
echo % diff --rev
392
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
   181
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
   182
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   183
echo % rollback
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   184
hg rollback
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   185
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   186
hg status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   187
echo % update -C
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   188
hg update --clean
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   190
echo % custom keyword expansion
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   191
echo % try with kwdemo
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   192
hg --quiet kwdemo "Xinfo = {author}: {desc}"
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   193
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   194
cat <<EOF >>$HGRCPATH
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   195
[keywordmaps]
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   196
Id = {file} {node|short} {date|rfc822date} {author|user}
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   197
Xinfo = {author}: {desc}
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   198
EOF
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   199
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   200
echo % cat
392
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
   201
cat a b
378
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   202
echo % hg cat
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   203
hg cat sym a b
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   204
290
b05795ad5632 Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents: 281
diff changeset
   205
echo
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   206
echo '$Xinfo$' >> a
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   207
cat <<EOF >> log
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   208
firstline
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   209
secondline
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   210
EOF
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   211
305
d3cdaa49a644 Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents: 302
diff changeset
   212
echo % interrupted commit should not change state
337
67b4decdee67 Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 333
diff changeset
   213
hg commit
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   214
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   215
hg status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   216
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   217
echo % commit
378
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   218
hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   219
rm log
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   220
echo % status
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   221
hg status
479
18f235294dda Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents: 461
diff changeset
   222
echo % verify
18f235294dda Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents: 461
diff changeset
   223
hg verify
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   224
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   225
echo % cat
392
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
   226
cat a b
378
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   227
echo % hg cat
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   228
hg cat sym a b
290
b05795ad5632 Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents: 281
diff changeset
   229
echo
461
2275041e7deb keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 429
diff changeset
   230
echo % annotate
2275041e7deb keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents: 429
diff changeset
   231
hg annotate a
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   232
215
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   233
echo % remove
419
2f179ea3a9aa keyword: remove "identify" and "remove" from nokwcommands
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 409
diff changeset
   234
hg debugrebuildstate
215
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   235
hg remove a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   236
hg --debug commit -m rma
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   237
echo % status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   238
hg status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   239
echo % rollback
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   240
hg rollback
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   241
echo % status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   242
hg status
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   243
echo % revert a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   244
hg revert --no-backup --rev tip a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   245
echo % cat a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   246
cat a
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   247
ff719fcc10a3 Test remove
Christian Ebert <blacktrash@gmx.net>
parents: 214
diff changeset
   248
echo % clone to test incoming
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   249
cd ..
392
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
   250
hg clone -r1 Test Test-a
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   251
cd Test-a
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   252
cat <<EOF >> .hg/hgrc
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   253
[paths]
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   254
default = ../Test
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   255
EOF
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   256
echo % incoming
290
b05795ad5632 Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents: 281
diff changeset
   257
# remove path to temp dir
b05795ad5632 Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents: 281
diff changeset
   258
hg incoming | sed -e 's/^\(comparing with \).*\(test-keyword.*\)/\1\2/'
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   259
333
c1521ff40eda Don't use the -i option with sed
Will Maier <willmaier@ml1.net>
parents: 325
diff changeset
   260
sed -e 's/Id.*/& rejecttest/' a > a.new
c1521ff40eda Don't use the -i option with sed
Will Maier <willmaier@ml1.net>
parents: 325
diff changeset
   261
mv a.new a
323
9107f7a3fd12 test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents: 316
diff changeset
   262
echo % commit rejecttest
378
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   263
hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>'
316
98656ffb1cec Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents: 313
diff changeset
   264
echo % export
323
9107f7a3fd12 test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents: 316
diff changeset
   265
hg export -o ../rejecttest.diff tip
316
98656ffb1cec Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents: 313
diff changeset
   266
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   267
cd ../Test
316
98656ffb1cec Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents: 313
diff changeset
   268
echo % import
323
9107f7a3fd12 test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net>
parents: 316
diff changeset
   269
hg import ../rejecttest.diff
316
98656ffb1cec Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents: 313
diff changeset
   270
echo % cat
392
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
   271
cat a b
316
98656ffb1cec Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents: 313
diff changeset
   272
echo
98656ffb1cec Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents: 313
diff changeset
   273
echo % rollback
98656ffb1cec Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents: 313
diff changeset
   274
hg rollback
98656ffb1cec Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents: 313
diff changeset
   275
echo % clean update
98656ffb1cec Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents: 313
diff changeset
   276
hg update --clean
98656ffb1cec Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents: 313
diff changeset
   277
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   278
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
   279
mkdir x
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   280
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
   281
hg copy a x/a
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   282
echo % kwexpand a
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   283
hg --verbose kwexpand a
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   284
echo % kwexpand x/a should abort
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   285
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
   286
cd x
378
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   287
hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>'
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   288
echo % cat a
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   289
cat a
281
c6314b110e67 Detailed test of kwexpand/kwshrink w/ file arguments
Christian Ebert <blacktrash@gmx.net>
parents: 279
diff changeset
   290
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
   291
hg --verbose kwshrink a
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   292
echo % cat a
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   293
cat a
337
67b4decdee67 Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 333
diff changeset
   294
cd ..
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   295
279
1f00dce8de12 Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents: 267
diff changeset
   296
echo % kwexpand nonexistent
392
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
   297
hg kwexpand nonexistent 2>&1 | sed 's/nonexistent:.*/nonexistent:/'
279
1f00dce8de12 Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents: 267
diff changeset
   298
482
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   299
echo % hg serve
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   300
hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   301
cat hg.pid >> $DAEMON_PIDS
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   302
echo % expansion
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   303
echo % hgweb file
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   304
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/a/?style=raw')
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   305
echo % no expansion
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   306
echo % hgweb annotate
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   307
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/a/?style=raw')
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   308
echo % hgweb changeset
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   309
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/tip/?style=raw')
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   310
echo % hgweb filediff
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   311
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/bb948857c743/a?style=raw')
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   312
echo % errors encountered
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   313
cat errors.log
18dc6c3588ea Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents: 479
diff changeset
   314
485
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   315
echo % merge/resolve
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   316
echo '$Id$' > m
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   317
hg add m
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   318
hg commit -m 4kw 
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   319
echo foo >> m
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   320
hg commit -m 5foo
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   321
echo % simplemerge
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   322
hg update 4
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   323
echo foo >> m
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   324
hg commit -m 6foo
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   325
hg merge
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   326
hg commit -m simplemerge
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   327
cat m
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   328
echo % conflict
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   329
hg update 4
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   330
echo bar >> m
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   331
hg commit -m 8bar
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   332
hg merge
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   333
echo % keyword stays outside conflict zone
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   334
cat m
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   335
echo % resolve to local
558
e86eaa71219d resolve: require -a switch to resolve all files
Matt Mackall <mpm@selenic.com>
parents: 536
diff changeset
   336
HGMERGE=internal:local hg resolve -a
485
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   337
hg commit -m localresolve
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   338
cat m
5c3637b12e88 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents: 482
diff changeset
   339
378
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   340
echo % switch off expansion
267
4a24c3acd4f2 Tighten condition for kwshrink/kwexpand test
Christian Ebert <blacktrash@gmx.net>
parents: 259
diff changeset
   341
echo % kwshrink with unknown file u
4a24c3acd4f2 Tighten condition for kwshrink/kwexpand test
Christian Ebert <blacktrash@gmx.net>
parents: 259
diff changeset
   342
cp a u
241
e0a846f9f095 Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents: 224
diff changeset
   343
hg --verbose kwshrink
189
247159261ba5 Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
   344
echo % cat
392
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
   345
cat a b
378
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   346
echo % hg cat
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   347
hg cat sym a b
290
b05795ad5632 Make keyword against current Mercurial available as standalone extension
Christian Ebert <blacktrash@gmx.net>
parents: 281
diff changeset
   348
echo
378
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   349
rm $HGRCPATH
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   350
echo % cat
392
45a318c5ea20 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents: 384
diff changeset
   351
cat a b
378
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   352
echo % hg cat
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   353
hg cat sym a b
0683aaf458d8 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net>
parents: 376
diff changeset
   354
echo