Mercurial > hg
annotate tests/test-filebranch @ 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 | 3f754be7abbb |
children | 4c94b6d0fb1c |
rev | line source |
---|---|
990 | 1 #!/bin/sh |
2 | |
3 # This test makes sure that we don't mark a file as merged with its ancestor | |
4 # when we do a merge. | |
5 | |
4293
b0140ead7f70
test-filebranch: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3853
diff
changeset
|
6 cat <<EOF > merge |
b0140ead7f70
test-filebranch: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3853
diff
changeset
|
7 import sys, os |
b0140ead7f70
test-filebranch: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3853
diff
changeset
|
8 print "merging for", os.path.basename(sys.argv[1]) |
990 | 9 EOF |
4293
b0140ead7f70
test-filebranch: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3853
diff
changeset
|
10 HGMERGE="python ../merge"; export HGMERGE |
990 | 11 |
12 echo creating base | |
13 hg init a | |
14 cd a | |
15 echo 1 > foo | |
16 echo 1 > bar | |
17 echo 1 > baz | |
18 echo 1 > quux | |
19 hg add foo bar baz quux | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
20 hg commit -m "base" -d "1000000 0" |
990 | 21 |
22 cd .. | |
23 hg clone a b | |
24 | |
25 echo creating branch a | |
26 cd a | |
27 echo 2a > foo | |
28 echo 2a > bar | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
29 hg commit -m "branch a" -d "1000000 0" |
990 | 30 |
31 echo creating branch b | |
32 | |
33 cd .. | |
34 cd b | |
35 echo 2b > foo | |
36 echo 2b > baz | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
37 hg commit -m "branch b" -d "1000000 0" |
990 | 38 |
39 echo "we shouldn't have anything but n state here" | |
6329
3f754be7abbb
tests: fix repeatability for test-filebranch with dirstate granularity
Matt Mackall <mpm@selenic.com>
parents:
6296
diff
changeset
|
40 hg debugstate --nodates | grep -v "^n" |
990 | 41 |
42 echo merging | |
43 hg pull ../a | |
4293
b0140ead7f70
test-filebranch: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3853
diff
changeset
|
44 hg merge -v |
990 | 45 |
46 echo 2m > foo | |
47 echo 2b > baz | |
48 echo new > quux | |
49 | |
50 echo "we shouldn't have anything but foo in merge state here" | |
6296
a9e6b8875805
debugstate: add --nodates
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5858
diff
changeset
|
51 hg debugstate --nodates | grep "^m" |
990 | 52 |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
53 hg ci -m "merge" -d "1000000 0" |
990 | 54 |
55 echo "main: we should have a merge here" | |
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3736
diff
changeset
|
56 hg debugindex .hg/store/00changelog.i |
990 | 57 |
993 | 58 echo "log should show foo and quux changed" |
59 hg log -v -r tip | |
60 | |
990 | 61 echo "foo: we should have a merge here" |
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3736
diff
changeset
|
62 hg debugindex .hg/store/data/foo.i |
990 | 63 |
64 echo "bar: we shouldn't have a merge here" | |
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3736
diff
changeset
|
65 hg debugindex .hg/store/data/bar.i |
990 | 66 |
67 echo "baz: we shouldn't have a merge here" | |
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3736
diff
changeset
|
68 hg debugindex .hg/store/data/baz.i |
990 | 69 |
70 echo "quux: we shouldn't have a merge here" | |
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3736
diff
changeset
|
71 hg debugindex .hg/store/data/quux.i |
990 | 72 |
993 | 73 echo "manifest entries should match tips of all files" |
3736 | 74 hg manifest --debug |
993 | 75 |
990 | 76 echo "everything should be clean now" |
77 hg status | |
78 | |
79 hg verify |