Mercurial > hg
annotate tests/test-hgrc.out @ 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 | 037d910734de |
children |
rev | line source |
---|---|
11292 | 1 hg: parse error at $HGRCPATH:1: invalid |
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
9470
diff
changeset
|
2 updating to branch default |
7044
e51c0f41f271
Escape '%' when writing to hgrc (issue1199)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1474
diff
changeset
|
3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e51c0f41f271
Escape '%' when writing to hgrc (issue1199)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1474
diff
changeset
|
4 [paths] |
8179
0f3b8404051b
clone: config escaping no longer needed
Matt Mackall <mpm@selenic.com>
parents:
8144
diff
changeset
|
5 default = .../foo%bar |
0f3b8404051b
clone: config escaping no longer needed
Matt Mackall <mpm@selenic.com>
parents:
8144
diff
changeset
|
6 default = .../foo%bar |
7044
e51c0f41f271
Escape '%' when writing to hgrc (issue1199)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1474
diff
changeset
|
7 bundle.mainreporoot=.../foobar |
8179
0f3b8404051b
clone: config escaping no longer needed
Matt Mackall <mpm@selenic.com>
parents:
8144
diff
changeset
|
8 paths.default=.../foo%bar |
11292 | 9 hg: parse error at $HGRCPATH:2: x = y |
10295
44c923eeb81d
config: handle short continuations (issue1999)
Matt Mackall <mpm@selenic.com>
parents:
10042
diff
changeset
|
10 foo.bar=a\nb\nc\nde\nfg |
44c923eeb81d
config: handle short continuations (issue1999)
Matt Mackall <mpm@selenic.com>
parents:
10042
diff
changeset
|
11 foo.baz=bif cb |
11292 | 12 hg: parse error at $HGRCPATH:1: cannot include /path/to/nowhere/no-such-file (No such file or directory) |
11225
d6dbd5e4ee72
ui.username(): expand environment variables in username configuration value.
Chad Dombrova <chadrik@gmail.com>
parents:
11224
diff
changeset
|
13 % username expansion |
d6dbd5e4ee72
ui.username(): expand environment variables in username configuration value.
Chad Dombrova <chadrik@gmail.com>
parents:
11224
diff
changeset
|
14 John Doe |
d6dbd5e4ee72
ui.username(): expand environment variables in username configuration value.
Chad Dombrova <chadrik@gmail.com>
parents:
11224
diff
changeset
|
15 ui.username=$FAKEUSER |
10455
40dfd46d098f
ui: add HGPLAIN environment variable for easier scripting
Brodie Rao <me+hg@dackz.net>
parents:
10296
diff
changeset
|
16 % customized hgrc |
11048
9e643a0c3278
showconfig: show rc paths with --debug
Mads Kiilerich <mads@kiilerich.com>
parents:
10567
diff
changeset
|
17 read config from: .../.hgrc |
10567
992723445a29
ui: ignore ui.logtemplate and ui.style when HGPLAIN is set
Yuya Nishihara <yuya@tcha.org>
parents:
10507
diff
changeset
|
18 .../.hgrc:13: alias.log=log -g |
992723445a29
ui: ignore ui.logtemplate and ui.style when HGPLAIN is set
Yuya Nishihara <yuya@tcha.org>
parents:
10507
diff
changeset
|
19 .../.hgrc:11: defaults.identify=-n |
10455
40dfd46d098f
ui: add HGPLAIN environment variable for easier scripting
Brodie Rao <me+hg@dackz.net>
parents:
10296
diff
changeset
|
20 .../.hgrc:2: ui.debug=true |
40dfd46d098f
ui: add HGPLAIN environment variable for easier scripting
Brodie Rao <me+hg@dackz.net>
parents:
10296
diff
changeset
|
21 .../.hgrc:3: ui.fallbackencoding=ASCII |
40dfd46d098f
ui: add HGPLAIN environment variable for easier scripting
Brodie Rao <me+hg@dackz.net>
parents:
10296
diff
changeset
|
22 .../.hgrc:4: ui.quiet=true |
10507
79dd96774187
ui: unset ui.slash when HGPLAIN is set
Brodie Rao <me+hg@dackz.net>
parents:
10506
diff
changeset
|
23 .../.hgrc:5: ui.slash=true |
79dd96774187
ui: unset ui.slash when HGPLAIN is set
Brodie Rao <me+hg@dackz.net>
parents:
10506
diff
changeset
|
24 .../.hgrc:6: ui.traceback=true |
79dd96774187
ui: unset ui.slash when HGPLAIN is set
Brodie Rao <me+hg@dackz.net>
parents:
10506
diff
changeset
|
25 .../.hgrc:7: ui.verbose=true |
10567
992723445a29
ui: ignore ui.logtemplate and ui.style when HGPLAIN is set
Yuya Nishihara <yuya@tcha.org>
parents:
10507
diff
changeset
|
26 .../.hgrc:8: ui.style=~/.hgstyle |
992723445a29
ui: ignore ui.logtemplate and ui.style when HGPLAIN is set
Yuya Nishihara <yuya@tcha.org>
parents:
10507
diff
changeset
|
27 .../.hgrc:9: ui.logtemplate={node} |
10455
40dfd46d098f
ui: add HGPLAIN environment variable for easier scripting
Brodie Rao <me+hg@dackz.net>
parents:
10296
diff
changeset
|
28 % plain hgrc |
11048
9e643a0c3278
showconfig: show rc paths with --debug
Mads Kiilerich <mads@kiilerich.com>
parents:
10567
diff
changeset
|
29 read config from: .../.hgrc |
10455
40dfd46d098f
ui: add HGPLAIN environment variable for easier scripting
Brodie Rao <me+hg@dackz.net>
parents:
10296
diff
changeset
|
30 none: ui.traceback=True |
40dfd46d098f
ui: add HGPLAIN environment variable for easier scripting
Brodie Rao <me+hg@dackz.net>
parents:
10296
diff
changeset
|
31 none: ui.verbose=False |
40dfd46d098f
ui: add HGPLAIN environment variable for easier scripting
Brodie Rao <me+hg@dackz.net>
parents:
10296
diff
changeset
|
32 none: ui.debug=True |
40dfd46d098f
ui: add HGPLAIN environment variable for easier scripting
Brodie Rao <me+hg@dackz.net>
parents:
10296
diff
changeset
|
33 none: ui.quiet=False |