view tests/test-convert-svn-move.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%.

% convert trunk and branches
initializing destination A-hg repository
scanning source...
sorting...
converting...
13 createtrunk
12 moved1
11 moved1
10 moved2
9 changeb and rm d2
8 changeb and rm d2
7 moved1again
6 moved1again
5 copyfilefrompast
4 copydirfrompast
3 add d3
2 copy dir and remove subdir
1 add d4old
0 rename d4old into d4new
o  13 rename d4old into d4new files: d4new/g d4old/g
|
o  12 add d4old files: d4old/g
|
o  11 copy dir and remove subdir files: d3/d31/e d4/d31/e d4/f
|
o  10 add d3 files: d3/d31/e d3/f
|
o  9 copydirfrompast files: d2/d
|
o  8 copyfilefrompast files: d
|
o  7 moved1again files: d1/b d1/c
|
| o  6 moved1again files:
| |
o |  5 changeb and rm d2 files: d1/b d2/d
| |
| o  4 changeb and rm d2 files: b
| |
o |  3 moved2 files: d2/d
| |
o |  2 moved1 files: d1/b d1/c
| |
| o  1 moved1 files: b c
|
o  0 createtrunk files:

% check move copy records
A d4new/g
  d4old/g
R d4old/g
% check branches
default                       13:
d1                             6:
% convert files being replaced by directories
initializing destination hg-repo repository
scanning source...
sorting...
converting...
3 initial
2 clobber symlink
1 clobber1
0 clobber2
% manifest before
644   a
644   d/b
644 @ dlink
644 @ dlink2
644   dlink3
% manifest after clobber1
644   a/b
644   d/b
644   dlink/b
644 @ dlink2
644   dlink3
% manifest after clobber2
644   a/b
644   d/b
644   dlink/b
644 @ dlink2
644 @ dlink3
% try updating
% test convert progress bar

scanning [ <=>                                                              ] 1
scanning [  <=>                                                             ] 2
scanning [   <=>                                                            ] 3
scanning [    <=>                                                           ] 4
                                                                                
converting [                                                              ] 0/4
getting files [==========>                                                ] 1/5
getting files [======================>                                    ] 2/5
getting files [==================================>                        ] 3/5
getting files [==============================================>            ] 4/5
getting files [==========================================================>] 5/5
                                                                                
converting [==============>                                               ] 1/4
scanning paths [                                                          ] 0/1
                                                                                
getting files [==========================================================>] 1/1
                                                                                
converting [==============================>                               ] 2/4
scanning paths [                                                          ] 0/2
scanning paths [============================>                             ] 1/2
                                                                                
getting files [=============>                                             ] 1/4
getting files [============================>                              ] 2/4
getting files [===========================================>               ] 3/4
getting files [==========================================================>] 4/4
                                                                                
converting [=============================================>                ] 3/4
scanning paths [                                                          ] 0/1
                                                                                
getting files [==========================================================>] 1/1
                                                                                
initializing destination hg-progress repository
scanning source...
sorting...
converting...
3 initial
2 clobber symlink
1 clobber1
0 clobber2