Mercurial > hg
annotate tests/test-clone-failure @ 11769:ca6cebd8734e stable
dirstate: ignore symlinks when fs cannot handle them (issue1888)
When the filesystem cannot handle the executable bit, we currently
ignore it completely when looking for modified files. Similarly, it is
impossible to set or clear the bit when the filesystem ignores it.
This patch makes Mercurial treat symbolic links the same way.
Symlinks are a little different since they manifest themselves as
small files containing a filename (the symlink target). On Windows,
these files show up as regular files, and on Linux and Mac they show
up as real symlinks.
Issue1888 presents a case where the symlink files are better ignored
from the Windows side. A Linux client creates symlinks in a working
copy which is shared over a network between Linux and Windows clients.
The Samba server is helpful and defererences the symlink when the
Windows client looks at it. This means that Mercurial on the Windows
side sees file content instead of a file name in the symlink, and
hence flags the link as modified. Ignoring the change would be much
more helpful, similarly to how Mercurial does not report any changes
when executable bits are ignored in a checkout on Windows.
An initial checkout of a symbolic link on a file system that cannot
handle symbolic links will still result in a regular file containing
the target file name as its content. Sharing such a checkout with a
Linux client will not turn the file into a symlink automatically, but
'hg revert' can fix that. After the revert, the Windows client will
see the correct file content (provided by the Samba server when it
follows the link on the Linux side) and otherwise ignore the change.
Running 'hg perfstatus' 10 times gives these results:
Before: After:
min: 0.544703 min: 0.546549
med: 0.547592 med: 0.548881
avg: 0.549146 avg: 0.548549
max: 0.564112 max: 0.551504
The median time is increased about 0.24%.
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Mon, 09 Aug 2010 15:31:56 +0200 |
parents | 567648eab1dd |
children |
rev | line source |
---|---|
834
78a9f95766dc
Use sh instead of bash in tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
1 #!/bin/sh |
550 | 2 |
3 # No local source | |
4 hg clone a b | |
5 echo $? | |
6 | |
7 # No remote source | |
8 hg clone http://127.0.0.1:3121/a b | |
9 echo $? | |
10 rm -rf b # work around bug with http clone | |
11 | |
12 # Inaccessible source | |
13 mkdir a | |
14 chmod 000 a | |
15 hg clone a b | |
16 echo $? | |
17 | |
18 # Inaccessible destination | |
19 mkdir b | |
20 cd b | |
21 hg init | |
22 hg clone . ../a | |
23 echo $? | |
24 cd .. | |
25 chmod 700 a | |
3988
9dcf9d45cab8
Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
839
diff
changeset
|
26 rm -r a b |
550 | 27 |
28 # Source of wrong type | |
5071
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
29 if "$TESTDIR/hghave" -q fifo; then |
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
30 mkfifo a |
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
31 hg clone a b |
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
32 echo $? |
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
33 rm a |
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
34 else |
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
35 echo "abort: repository a not found!" |
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
36 echo 255 |
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
37 fi |
550 | 38 |
39 # Default destination, same directory | |
40 mkdir q | |
41 cd q | |
42 hg init | |
43 cd .. | |
44 hg clone q | |
45 | |
7927
a218ba5f60df
allow clone into existing but empty directories
Steve Borho <steve@borho.org>
parents:
5071
diff
changeset
|
46 # destination directory not empty |
a218ba5f60df
allow clone into existing but empty directories
Steve Borho <steve@borho.org>
parents:
5071
diff
changeset
|
47 mkdir a |
a218ba5f60df
allow clone into existing but empty directories
Steve Borho <steve@borho.org>
parents:
5071
diff
changeset
|
48 echo stuff > a/a |
a218ba5f60df
allow clone into existing but empty directories
Steve Borho <steve@borho.org>
parents:
5071
diff
changeset
|
49 hg clone q a |
a218ba5f60df
allow clone into existing but empty directories
Steve Borho <steve@borho.org>
parents:
5071
diff
changeset
|
50 echo $? |
a218ba5f60df
allow clone into existing but empty directories
Steve Borho <steve@borho.org>
parents:
5071
diff
changeset
|
51 |
7935
39566bb99a9c
on clone failure, only remove directories we created
Steve Borho <steve@borho.org>
parents:
7927
diff
changeset
|
52 # leave existing directory in place after clone failure |
39566bb99a9c
on clone failure, only remove directories we created
Steve Borho <steve@borho.org>
parents:
7927
diff
changeset
|
53 hg init c |
39566bb99a9c
on clone failure, only remove directories we created
Steve Borho <steve@borho.org>
parents:
7927
diff
changeset
|
54 cd c |
39566bb99a9c
on clone failure, only remove directories we created
Steve Borho <steve@borho.org>
parents:
7927
diff
changeset
|
55 echo c > c |
8167
6c82beaaa11a
tests: removed redundant "-d '0 0'" from test scripts
Martin Geisler <mg@lazybytes.net>
parents:
7935
diff
changeset
|
56 hg commit -A -m test |
7935
39566bb99a9c
on clone failure, only remove directories we created
Steve Borho <steve@borho.org>
parents:
7927
diff
changeset
|
57 chmod -rx .hg/store/data |
39566bb99a9c
on clone failure, only remove directories we created
Steve Borho <steve@borho.org>
parents:
7927
diff
changeset
|
58 cd .. |
39566bb99a9c
on clone failure, only remove directories we created
Steve Borho <steve@borho.org>
parents:
7927
diff
changeset
|
59 mkdir d |
39566bb99a9c
on clone failure, only remove directories we created
Steve Borho <steve@borho.org>
parents:
7927
diff
changeset
|
60 hg clone c d 2> err |
39566bb99a9c
on clone failure, only remove directories we created
Steve Borho <steve@borho.org>
parents:
7927
diff
changeset
|
61 echo $? |
39566bb99a9c
on clone failure, only remove directories we created
Steve Borho <steve@borho.org>
parents:
7927
diff
changeset
|
62 test -d d && echo "dir is still here" || echo "dir is gone" |
39566bb99a9c
on clone failure, only remove directories we created
Steve Borho <steve@borho.org>
parents:
7927
diff
changeset
|
63 test -d d/.hg && echo "repo is still here" || echo "repo is gone" |
39566bb99a9c
on clone failure, only remove directories we created
Steve Borho <steve@borho.org>
parents:
7927
diff
changeset
|
64 |
9329
567648eab1dd
test-clone-failure: reenable perm to allow deletion
Simon Heimberg <simohe@besonet.ch>
parents:
8167
diff
changeset
|
65 # reenable perm to allow deletion |
567648eab1dd
test-clone-failure: reenable perm to allow deletion
Simon Heimberg <simohe@besonet.ch>
parents:
8167
diff
changeset
|
66 chmod +rx c/.hg/store/data |
567648eab1dd
test-clone-failure: reenable perm to allow deletion
Simon Heimberg <simohe@besonet.ch>
parents:
8167
diff
changeset
|
67 |
550 | 68 true |