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