Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-ssh @ 1700:e2f91e0acbb8
hgmerge: add cleanup functions
This patch adds functions cleanup, success and failure.
The last two of these should be used instead of exit.
Current code was changed to use them.
It also moves $HGTMP to the top of the file (it's used in the cleanup
function), changes the comment and removes now unneeded trap
in the diff+patch merge.
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Mon, 06 Feb 2006 17:32:06 -0600 |
parents | 235e0effa672 |
children | 7544700fd931 |
rev | line source |
---|---|
1110 | 1 #!/bin/sh |
2 | |
3 # This test tries to exercise the ssh functionality with a dummy script | |
4 | |
5 cat <<'EOF' > dummyssh | |
6 #!/bin/sh | |
7 # this attempts to deal with relative pathnames | |
8 cd `dirname $0` | |
9 | |
10 # check for proper args | |
11 if [ $1 != "user@dummy" ] ; then | |
12 exit -1 | |
13 fi | |
14 | |
15 # check that we're in the right directory | |
1168
235e0effa672
Fixed two tests to run with bourne shell.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1110
diff
changeset
|
16 if [ ! -x dummyssh ] ; then |
1110 | 17 exit -1 |
18 fi | |
19 | |
20 echo Got arguments 1:$1 2:$2 3:$3 4:$4 5:$5 >> dummylog | |
21 $2 | |
22 EOF | |
23 chmod +x dummyssh | |
24 | |
25 echo "# creating 'remote'" | |
26 hg init remote | |
27 cd remote | |
28 echo this > foo | |
29 hg ci -A -m "init" -d "0 0" foo | |
30 | |
31 cd .. | |
32 | |
33 echo "# clone remote" | |
34 hg clone -e ./dummyssh ssh://user@dummy/remote local | |
35 | |
36 echo "# verify" | |
37 cd local | |
38 hg verify | |
39 | |
40 echo "# empty default pull" | |
41 hg paths | |
42 hg pull -e ../dummyssh | |
43 | |
44 echo "# local change" | |
45 echo bleah > foo | |
46 hg ci -m "add" -d "0 0" | |
47 | |
48 echo "# updating rc" | |
49 echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc | |
50 echo "[ui]" >> .hg/hgrc | |
51 echo "ssh = ../dummyssh" >> .hg/hgrc | |
52 | |
53 echo "# find outgoing" | |
54 hg out ssh://user@dummy/remote | |
55 | |
56 echo "# push" | |
57 hg push | |
58 | |
59 cd ../remote | |
60 | |
61 echo "# check remote tip" | |
62 hg tip | |
63 hg verify | |
64 hg cat foo | |
65 | |
66 cd .. | |
67 cat dummylog |