Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-ssh @ 1564:34579a67fa71
Re: [PATCH 2 of 3] remove walk warning about nonexistent files
On 11/15/05, Robin Farine <robin.farine@terminus.org> wrote:
> # HG changeset patch
> # User Robin Farine <robin.farine@terminus.org>
> # Node ID ce0a3cc309a8d1e81278ec01a3c61fbb99c691f4
> # Parent feb77e0951e74d75c213e8471f107fdcc124c876
> remove walk warning about nonexistent files
>
> diff -r feb77e0951e7 -r ce0a3cc309a8 mercurial/dirstate.py
> --- a/mercurial/dirstate.py Tue Nov 15 08:42:45 2005 +0100
> +++ b/mercurial/dirstate.py Tue Nov 15 08:59:50 2005 +0100
> @@ -336,9 +336,6 @@
> try:
> st = os.lstat(f)
> except OSError, inst:
> - if ff not in dc: self.ui.warn('%s: %s\n' % (
> - util.pathto(self.getcwd(), ff),
> - inst.strerror))
> continue
> if stat.S_ISDIR(st.st_mode):
> cmp1 = (lambda x, y: cmp(x[1], y[1]))
this break some tests,
a better fix would be to check if ff can be a directory prefix from files in dc
you can try the attached patch.
Benoit
| author | Benoit Boissinot <bboissin@gmail.com> |
|---|---|
| date | Thu, 01 Dec 2005 10:48:29 -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 |