Mercurial > hg
annotate tests/test-bookmarks @ 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 | 18c47562d331 |
children |
rev | line source |
---|---|
7261 | 1 #!/bin/sh |
2 | |
3 echo "[extensions]" >> $HGRCPATH | |
4 echo "bookmarks=" >> $HGRCPATH | |
5 | |
6 hg init | |
7 | |
8 echo % no bookmarks | |
9 hg bookmarks | |
10 | |
11 echo % bookmark rev -1 | |
12 hg bookmark X | |
13 | |
14 echo % list bookmarks | |
15 hg bookmarks | |
16 | |
10826
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
7261
diff
changeset
|
17 echo % list bookmarks with color |
11141
df5d1d571d27
tests: force color ansi mode on Windows
Patrick Mezard <pmezard@gmail.com>
parents:
10826
diff
changeset
|
18 hg --config extensions.color= --config color.mode=ansi \ |
df5d1d571d27
tests: force color ansi mode on Windows
Patrick Mezard <pmezard@gmail.com>
parents:
10826
diff
changeset
|
19 bookmarks --color=always |
10826
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
7261
diff
changeset
|
20 |
7261 | 21 echo a > a |
22 hg add a | |
23 hg commit -m 0 | |
24 | |
25 echo % bookmark X moved to rev 0 | |
26 hg bookmarks | |
27 | |
28 echo % look up bookmark | |
29 hg log -r X | |
30 | |
31 echo % second bookmark for rev 0 | |
32 hg bookmark X2 | |
33 | |
34 echo % bookmark rev -1 again | |
35 hg bookmark -r null Y | |
36 | |
37 echo % list bookmarks | |
38 hg bookmarks | |
39 | |
40 echo b > b | |
41 hg add b | |
42 hg commit -m 1 | |
43 | |
44 echo % bookmarks X and X2 moved to rev 1, Y at rev -1 | |
45 hg bookmarks | |
46 | |
47 echo % bookmark rev 0 again | |
48 hg bookmark -r 0 Z | |
49 | |
50 echo c > c | |
51 hg add c | |
52 hg commit -m 2 | |
53 | |
54 echo % bookmarks X and X2 moved to rev 2, Y at rev -1, Z at rev 0 | |
55 hg bookmarks | |
56 | |
57 echo % rename nonexistent bookmark | |
58 hg bookmark -m A B | |
59 | |
60 echo % rename to existent bookmark | |
61 hg bookmark -m X Y | |
62 | |
63 echo % force rename to existent bookmark | |
64 hg bookmark -f -m X Y | |
65 | |
66 echo % list bookmarks | |
67 hg bookmark | |
68 | |
69 echo % rename without new name | |
70 hg bookmark -m Y | |
71 | |
72 echo % delete without name | |
73 hg bookmark -d | |
74 | |
75 echo % delete nonexistent bookmark | |
76 hg bookmark -d A | |
77 | |
78 echo % bookmark name with spaces should be stripped | |
79 hg bookmark ' x y ' | |
80 | |
81 echo % list bookmarks | |
82 hg bookmarks | |
83 | |
84 echo % look up stripped bookmark name | |
11282 | 85 hg log -r '"x y"' |
7261 | 86 |
87 echo % reject bookmark name with newline | |
88 hg bookmark ' | |
89 ' | |
90 | |
91 echo % bookmark with existing name | |
92 hg bookmark Z | |
93 | |
94 echo % force bookmark with existing name | |
95 hg bookmark -f Z | |
96 | |
97 echo % list bookmarks | |
98 hg bookmark | |
99 | |
100 echo % revision but no bookmark name | |
101 hg bookmark -r . | |
102 | |
11704
18c47562d331
bookmarks: don't allow name to contain whitespaces only
Idan Kamara <idankk86@gmail.com>
parents:
11282
diff
changeset
|
103 echo % bookmark name with whitespace only |
18c47562d331
bookmarks: don't allow name to contain whitespaces only
Idan Kamara <idankk86@gmail.com>
parents:
11282
diff
changeset
|
104 hg bookmark ' ' |
18c47562d331
bookmarks: don't allow name to contain whitespaces only
Idan Kamara <idankk86@gmail.com>
parents:
11282
diff
changeset
|
105 |
7261 | 106 true |