annotate tests/test-hgweb-descend-empties.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 1de6e7e1bb9f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7305
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
1 % Set up the repo
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
2 adding a1/a2/a3/a4/foo
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
3 adding b1/b2/b3/b4/foo
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
4 adding b1/b2/c3/c4/foo
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
5 adding d1/d2/d3/d4/foo
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
6 adding d1/d2/foo
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
7 % manifest with descending
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
8 200 Script output follows
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
9
7725
6a888d491eaf coal/paper: switch to XHTML 1.1
Benoit Allard <benoit@aeteurope.nl>
parents: 7347
diff changeset
10 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
6a888d491eaf coal/paper: switch to XHTML 1.1
Benoit Allard <benoit@aeteurope.nl>
parents: 7347
diff changeset
11 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
7305
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
12 <head>
7725
6a888d491eaf coal/paper: switch to XHTML 1.1
Benoit Allard <benoit@aeteurope.nl>
parents: 7347
diff changeset
13 <link rel="icon" href="/static/hgicon.png" type="image/png" />
7305
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
14 <meta name="robots" content="index, nofollow" />
7339
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
15 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
7305
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
16
7339
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
17 <title>test: 9087c84a0f5d /</title>
7305
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
18 </head>
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
19 <body>
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
20
7339
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
21 <div class="container">
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
22 <div class="menu">
7305
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
23 <div class="logo">
8936
1de6e7e1bb9f change wiki/bts URLs to point to new hostname
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8372
diff changeset
24 <a href="http://mercurial.selenic.com/">
7725
6a888d491eaf coal/paper: switch to XHTML 1.1
Benoit Allard <benoit@aeteurope.nl>
parents: 7347
diff changeset
25 <img src="/static/hglogo.png" alt="mercurial" /></a>
7305
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
26 </div>
7339
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
27 <ul>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
28 <li><a href="/shortlog/9087c84a0f5d">log</a></li>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
29 <li><a href="/graph/9087c84a0f5d">graph</a></li>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
30 <li><a href="/tags">tags</a></li>
8353
6058d291abdf paper/coal: add branches page
Sune Foldager <cryo@cyanite.org>
parents: 7725
diff changeset
31 <li><a href="/branches">branches</a></li>
7339
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
32 </ul>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
33 <ul>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
34 <li><a href="/rev/9087c84a0f5d">changeset</a></li>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
35 <li class="active">browse</li>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
36 </ul>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
37 <ul>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
38
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
39 </ul>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
40 </div>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
41
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
42 <div class="main">
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
43 <h2><a href="/">test</a></h2>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
44 <h3>directory / @ 0:9087c84a0f5d <span class="tag">tip</span> </h3>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
45
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
46 <form class="search" action="/log">
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
47
7725
6a888d491eaf coal/paper: switch to XHTML 1.1
Benoit Allard <benoit@aeteurope.nl>
parents: 7347
diff changeset
48 <p><input name="rev" id="search1" type="text" size="30" /></p>
6a888d491eaf coal/paper: switch to XHTML 1.1
Benoit Allard <benoit@aeteurope.nl>
parents: 7347
diff changeset
49 <div id="hint">find changesets by author, revision,
6a888d491eaf coal/paper: switch to XHTML 1.1
Benoit Allard <benoit@aeteurope.nl>
parents: 7347
diff changeset
50 files, or words in the commit message</div>
7339
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
51 </form>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
52
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
53 <table class="bigtable">
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
54 <tr>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
55 <th class="name">name</th>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
56 <th class="size">size</th>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
57 <th class="permissions">permissions</th>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
58 </tr>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
59 <tr class="fileline parity0">
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
60 <td class="name"><a href="/file/9087c84a0f5d/">[up]</a></td>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
61 <td class="size"></td>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
62 <td class="permissions">drwxr-xr-x</td>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
63 </tr>
8372
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
64
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
65 <tr class="fileline parity1">
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
66 <td class="name">
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
67 <a href="/file/9087c84a0f5d/a1">
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
68 <img src="/static/coal-folder.png" alt="dir."/> a1/
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
69 </a>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
70 <a href="/file/9087c84a0f5d/a1/a2/a3/a4">
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
71 a2/a3/a4
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
72 </a>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
73 </td>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
74 <td class="size"></td>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
75 <td class="permissions">drwxr-xr-x</td>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
76 </tr>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
77 <tr class="fileline parity0">
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
78 <td class="name">
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
79 <a href="/file/9087c84a0f5d/b1">
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
80 <img src="/static/coal-folder.png" alt="dir."/> b1/
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
81 </a>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
82 <a href="/file/9087c84a0f5d/b1/b2">
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
83 b2
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
84 </a>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
85 </td>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
86 <td class="size"></td>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
87 <td class="permissions">drwxr-xr-x</td>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
88 </tr>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
89 <tr class="fileline parity1">
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
90 <td class="name">
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
91 <a href="/file/9087c84a0f5d/d1">
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
92 <img src="/static/coal-folder.png" alt="dir."/> d1/
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
93 </a>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
94 <a href="/file/9087c84a0f5d/d1/d2">
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
95 d2
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
96 </a>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
97 </td>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
98 <td class="size"></td>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
99 <td class="permissions">drwxr-xr-x</td>
783c8c78db86 paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents: 8353
diff changeset
100 </tr>
7339
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
101
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
102 </table>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
103 </div>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
104 </div>
d11473955d30 hgweb: update tests for paper style
Matt Mackall <mpm@selenic.com>
parents: 7305
diff changeset
105
7305
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
106
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
107 </body>
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
108 </html>
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
109
c21d236ca897 hgweb: descend empty directories in web view
Ry4an Brase <ry4an-hg@ry4an.org>
parents:
diff changeset
110 % ERRORS ENCOUNTERED