Mercurial > hg
annotate tests/test-http-proxy.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 | 60b42f318a6d |
children |
rev | line source |
---|---|
2337
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
1 adding a |
2612
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2337
diff
changeset
|
2 %% url for proxy, stream |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2337
diff
changeset
|
3 streaming all changes |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2337
diff
changeset
|
4 XXX files to transfer, XXX bytes of data |
3015
fa4229c60dd7
Allow for MB/sec transfer rates in test-http-proxy and test-ssh.
Lee Cantey <lcantey@gmail.com>
parents:
2612
diff
changeset
|
5 transferred XXX bytes in XXX seconds (XXX XB/sec) |
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
7919
diff
changeset
|
6 updating to branch default |
2612
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2337
diff
changeset
|
7 XXX files updated, XXX files merged, XXX files removed, XXX files unresolved |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2337
diff
changeset
|
8 checking changesets |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2337
diff
changeset
|
9 checking manifests |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2337
diff
changeset
|
10 crosschecking files in changesets and manifests |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2337
diff
changeset
|
11 checking files |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2337
diff
changeset
|
12 1 files, 1 changesets, 1 total revisions |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2337
diff
changeset
|
13 %% url for proxy, pull |
2337
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
14 requesting all changes |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
15 adding changesets |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
16 adding manifests |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
17 adding file changes |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
18 added 1 changesets with 1 changes to 1 files |
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
7919
diff
changeset
|
19 updating to branch default |
2337
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2612
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2337
diff
changeset
|
21 checking changesets |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2337
diff
changeset
|
22 checking manifests |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2337
diff
changeset
|
23 crosschecking files in changesets and manifests |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2337
diff
changeset
|
24 checking files |
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2337
diff
changeset
|
25 1 files, 1 changesets, 1 total revisions |
2337
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
26 %% host:port for proxy |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
27 requesting all changes |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
28 adding changesets |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
29 adding manifests |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
30 adding file changes |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
31 added 1 changesets with 1 changes to 1 files |
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
7919
diff
changeset
|
32 updating to branch default |
2337
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
34 %% proxy url with user name and password |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
35 requesting all changes |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
36 adding changesets |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
37 adding manifests |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
38 adding file changes |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
39 added 1 changesets with 1 changes to 1 files |
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
7919
diff
changeset
|
40 updating to branch default |
2337
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
41 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
42 %% url with user name and password |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
43 requesting all changes |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
44 adding changesets |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
45 adding manifests |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
46 adding file changes |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
47 added 1 changesets with 1 changes to 1 files |
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
7919
diff
changeset
|
48 updating to branch default |
2337
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
49 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
50 %% bad host:port for proxy |
7919
3e6206967570
Backed out changeset 490e40816cbd
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7903
diff
changeset
|
51 abort: error: Connection refused |
7269
95a53961d7a6
httprepo: factor out proxy handling
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7264
diff
changeset
|
52 %% do not use the proxy if it is in the no list |
95a53961d7a6
httprepo: factor out proxy handling
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7264
diff
changeset
|
53 requesting all changes |
95a53961d7a6
httprepo: factor out proxy handling
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7264
diff
changeset
|
54 adding changesets |
95a53961d7a6
httprepo: factor out proxy handling
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7264
diff
changeset
|
55 adding manifests |
95a53961d7a6
httprepo: factor out proxy handling
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7264
diff
changeset
|
56 adding file changes |
95a53961d7a6
httprepo: factor out proxy handling
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7264
diff
changeset
|
57 added 1 changesets with 1 changes to 1 files |
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
7919
diff
changeset
|
58 updating to branch default |
7269
95a53961d7a6
httprepo: factor out proxy handling
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7264
diff
changeset
|
59 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7268
e05092a3c2fe
test-http-proxy: hide logged URL port number, works with--jobs
Patrick Mezard <pmezard@gmail.com>
parents:
7264
diff
changeset
|
60 XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - |
e05092a3c2fe
test-http-proxy: hide logged URL port number, works with--jobs
Patrick Mezard <pmezard@gmail.com>
parents:
7264
diff
changeset
|
61 XXX "GET http://localhost:/?cmd=capabilities HTTP/1.1" - - |
e05092a3c2fe
test-http-proxy: hide logged URL port number, works with--jobs
Patrick Mezard <pmezard@gmail.com>
parents:
7264
diff
changeset
|
62 XXX "GET http://localhost:/?cmd=stream_out HTTP/1.1" - - |
e05092a3c2fe
test-http-proxy: hide logged URL port number, works with--jobs
Patrick Mezard <pmezard@gmail.com>
parents:
7264
diff
changeset
|
63 XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - |
e05092a3c2fe
test-http-proxy: hide logged URL port number, works with--jobs
Patrick Mezard <pmezard@gmail.com>
parents:
7264
diff
changeset
|
64 XXX "GET http://localhost:/?cmd=heads HTTP/1.1" - - |
10863
60b42f318a6d
clone: no race possible, we can use changegroup() and have smaller urls
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9611
diff
changeset
|
65 XXX "GET http://localhost:/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - |
7268
e05092a3c2fe
test-http-proxy: hide logged URL port number, works with--jobs
Patrick Mezard <pmezard@gmail.com>
parents:
7264
diff
changeset
|
66 XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - |
e05092a3c2fe
test-http-proxy: hide logged URL port number, works with--jobs
Patrick Mezard <pmezard@gmail.com>
parents:
7264
diff
changeset
|
67 XXX "GET http://localhost:/?cmd=heads HTTP/1.1" - - |
10863
60b42f318a6d
clone: no race possible, we can use changegroup() and have smaller urls
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9611
diff
changeset
|
68 XXX "GET http://localhost:/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - |
7268
e05092a3c2fe
test-http-proxy: hide logged URL port number, works with--jobs
Patrick Mezard <pmezard@gmail.com>
parents:
7264
diff
changeset
|
69 XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - |
e05092a3c2fe
test-http-proxy: hide logged URL port number, works with--jobs
Patrick Mezard <pmezard@gmail.com>
parents:
7264
diff
changeset
|
70 XXX "GET http://localhost:/?cmd=heads HTTP/1.1" - - |
10863
60b42f318a6d
clone: no race possible, we can use changegroup() and have smaller urls
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9611
diff
changeset
|
71 XXX "GET http://localhost:/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - |
7268
e05092a3c2fe
test-http-proxy: hide logged URL port number, works with--jobs
Patrick Mezard <pmezard@gmail.com>
parents:
7264
diff
changeset
|
72 XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - |
e05092a3c2fe
test-http-proxy: hide logged URL port number, works with--jobs
Patrick Mezard <pmezard@gmail.com>
parents:
7264
diff
changeset
|
73 XXX "GET http://localhost:/?cmd=heads HTTP/1.1" - - |
10863
60b42f318a6d
clone: no race possible, we can use changegroup() and have smaller urls
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9611
diff
changeset
|
74 XXX "GET http://localhost:/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - |