Mercurial > hg
annotate tests/test-pull @ 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 | 38f2ef9c134b |
children |
rev | line source |
---|---|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
522
diff
changeset
|
1 #!/bin/sh |
336 | 2 |
3 mkdir test | |
4 cd test | |
5 echo foo>foo | |
6 hg init | |
7 hg addremove | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
642
diff
changeset
|
8 hg commit -m 1 |
336 | 9 hg verify |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4891
diff
changeset
|
10 hg serve -p $HGPORT -d --pid-file=hg.pid |
2571
83cfd95eafb5
tests: add timeouts, make run-tests.py clean up dead daemon processes
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1929
diff
changeset
|
11 cat hg.pid >> $DAEMON_PIDS |
336 | 12 cd .. |
13 | |
10886
38f2ef9c134b
localrepo: do not store URL password in undo.desc
Patrick Mezard <pmezard@gmail.com>
parents:
10775
diff
changeset
|
14 hg clone --pull http://foo:bar@localhost:$HGPORT/ copy | sed -e "s,:$HGPORT/,:\$HGPORT/," |
336 | 15 cd copy |
16 hg verify | |
17 hg co | |
18 cat foo | |
3736 | 19 hg manifest --debug |
10398
ace3cf2bc991
tests: don't just silently strip port numbers
Mads Kiilerich <mads@kiilerich.com>
parents:
10154
diff
changeset
|
20 hg pull | sed -e "s,:$HGPORT/,:\$HGPORT/," |
10886
38f2ef9c134b
localrepo: do not store URL password in undo.desc
Patrick Mezard <pmezard@gmail.com>
parents:
10775
diff
changeset
|
21 hg rollback --dry-run --verbose | sed -e "s,:$HGPORT/,:\$HGPORT/," |
4891
2d545b98a7bc
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents:
3736
diff
changeset
|
22 |
2d545b98a7bc
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents:
3736
diff
changeset
|
23 echo % issue 622 |
2d545b98a7bc
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents:
3736
diff
changeset
|
24 cd .. |
2d545b98a7bc
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents:
3736
diff
changeset
|
25 hg init empty |
2d545b98a7bc
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents:
3736
diff
changeset
|
26 cd empty |
2d545b98a7bc
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents:
3736
diff
changeset
|
27 hg pull -u ../test |
9996
2770d03ae49f
handle file URIs correctly, according to RFC 2396 (issue1153)
Sune Foldager <cryo@cyanite.org>
parents:
5384
diff
changeset
|
28 |
2770d03ae49f
handle file URIs correctly, according to RFC 2396 (issue1153)
Sune Foldager <cryo@cyanite.org>
parents:
5384
diff
changeset
|
29 echo % test file: uri handling |
10470
2b57eed1be0b
Fix test-pull under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
10398
diff
changeset
|
30 hg pull -q file://../test-doesnt-exist 2>&1 \ |
2b57eed1be0b
Fix test-pull under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
10398
diff
changeset
|
31 | sed 's%abort: repository.*/test-doesnt-exist%abort: repository /test-doesnt-exist%' |
9996
2770d03ae49f
handle file URIs correctly, according to RFC 2396 (issue1153)
Sune Foldager <cryo@cyanite.org>
parents:
5384
diff
changeset
|
32 hg pull -q file:../test |
10470
2b57eed1be0b
Fix test-pull under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
10398
diff
changeset
|
33 # It's tricky to make file:// URLs working on every platforms |
2b57eed1be0b
Fix test-pull under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
10398
diff
changeset
|
34 # with regular shell commands. |
2b57eed1be0b
Fix test-pull under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
10398
diff
changeset
|
35 URL=`python -c "import os; print 'file://foobar' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"` |
10775
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10470
diff
changeset
|
36 hg pull -q "$URL" |