view tests/test-subrepo-deep-nested-change.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%.

% Preparing the subrepository sub2
adding sub2/sub2
% Preparing the sub1 repo which depends on the subrepo sub2
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding sub1/.hgsub
adding sub1/sub1
committing subrepository sub2
% Preparing the main repo which depends on the subrepo sub1
updating to branch default
pulling ...sub2
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding main/.hgsub
adding main/main
committing subrepository sub1
% Cleaning both repositories, just as a clone -U
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
% Clone main
updating to branch default
pulling ...sub1
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
pulling ...sub2
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
% Checking cloned repo ids
cloned 7f491f53a367 tip
cloned/sub1 fc3b4ce2696f tip
cloned/sub1/sub2 c57a0840e3ba tip
% debugsub output for main and sub1
path sub1
 source   ../sub1
 revision fc3b4ce2696f7741438c79207583768f2ce6b0dd
path sub2
 source   ../sub2
 revision c57a0840e3badd667ef3c3ef65471609acb2ba3c
% Modifying deeply nested sub2
committing subrepository sub1
committing subrepository sub1/sub2
% Checking modified node ids
cloned ffe6649062fe tip
cloned/sub1 2ecb03bf44a9 tip
cloned/sub1/sub2 53dd3430bcaf tip
% debugsub output for main and sub1
path sub1
 source   ../sub1
 revision 2ecb03bf44a94e749e8669481dd9069526ce7cb9
path sub2
 source   ../sub2
 revision 53dd3430bcaf5ab4a7c48262bcad6d441f510487