Mercurial > hg
annotate tests/test-verify @ 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 | b33d70849a20 |
children | 581066a319e5 |
rev | line source |
---|---|
6893 | 1 #!/bin/sh |
2 | |
3 echo % prepare repo | |
8016
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
4 hg init a |
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
5 cd a |
6893 | 6 echo "some text" > FOO.txt |
7 echo "another text" > bar.txt | |
8 echo "more text" > QUICK.txt | |
9 hg add | |
8167
6c82beaaa11a
tests: removed redundant "-d '0 0'" from test scripts
Martin Geisler <mg@lazybytes.net>
parents:
8016
diff
changeset
|
10 hg ci -mtest1 |
6893 | 11 |
12 echo | |
13 echo % verify | |
14 hg verify | |
15 | |
16 echo | |
9690
b33d70849a20
verify: report existence of journal
Sune Foldager <cryo@cyanite.org>
parents:
8720
diff
changeset
|
17 echo % verify with journal |
b33d70849a20
verify: report existence of journal
Sune Foldager <cryo@cyanite.org>
parents:
8720
diff
changeset
|
18 touch .hg/store/journal |
b33d70849a20
verify: report existence of journal
Sune Foldager <cryo@cyanite.org>
parents:
8720
diff
changeset
|
19 hg verify |
b33d70849a20
verify: report existence of journal
Sune Foldager <cryo@cyanite.org>
parents:
8720
diff
changeset
|
20 rm .hg/store/journal |
b33d70849a20
verify: report existence of journal
Sune Foldager <cryo@cyanite.org>
parents:
8720
diff
changeset
|
21 |
b33d70849a20
verify: report existence of journal
Sune Foldager <cryo@cyanite.org>
parents:
8720
diff
changeset
|
22 echo |
6893 | 23 echo % introduce some bugs in repo |
24 cd .hg/store/data | |
25 mv _f_o_o.txt.i X_f_o_o.txt.i | |
26 mv bar.txt.i xbar.txt.i | |
27 rm _q_u_i_c_k.txt.i | |
28 | |
29 echo | |
30 echo % verify | |
31 hg verify | |
32 | |
8016
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
33 cd .. |
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
34 |
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
35 echo % test revlog corruption |
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
36 hg init b |
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
37 cd b |
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
38 |
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
39 touch a |
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
40 hg add a |
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
41 hg ci -m a |
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
42 |
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
43 echo 'corrupted' > b |
8720
da1b93583855
Make test-verify SUSv3 compatible.
Will Maier <willmaier@ml1.net>
parents:
8167
diff
changeset
|
44 dd if=.hg/store/data/a.i of=start bs=1 count=20 2>/dev/null |
8016
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
45 cat start b > .hg/store/data/a.i |
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
46 |
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
47 echo |
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
48 echo % verify |
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
49 hg verify |
baaa832fd253
raise RevlogError when parser can't parse the revlog index
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6898
diff
changeset
|
50 |
6898
69aeaaaf6e07
store: simplify class hierarchy
Matt Mackall <mpm@selenic.com>
parents:
6893
diff
changeset
|
51 exit 0 |