annotate tests/test-convert-cvsnt-mergepoints @ 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%.

#!/bin/sh

"$TESTDIR/hghave" cvs || exit 80

filterpath()
{
    eval "$@" | sed "s:$CVSROOT:*REPO*:g"
}

cvscall()
{
    echo cvs -f "$@"
    cvs -f "$@"
}

# output of 'cvs ci' varies unpredictably, so discard most of it
# -- just keep the part that matters
cvsci()
{
    echo cvs -f ci -f "$@"
    cvs -f ci -f "$@" 2>&1 | egrep "^(new|initial) revision:"
}

hgcat()
{
    hg --cwd src-hg cat -r tip "$1"
}

echo "[extensions]" >> $HGRCPATH
echo "convert = " >> $HGRCPATH
echo "graphlog = " >> $HGRCPATH

echo "% create cvs repository"
mkdir cvsmaster
cd cvsmaster
CVSROOT=`pwd`
export CVSROOT
CVS_OPTIONS=-f
export CVS_OPTIONS
cd ..
filterpath cvscall -Q -d "$CVSROOT" init

echo "% checkout #1: add foo.txt"
cvscall -Q checkout -d cvsworktmp .
cd cvsworktmp
mkdir foo
cvscall -Q add foo
cd foo
echo foo > foo.txt
cvscall -Q add foo.txt 
cvsci -m "add foo.txt" foo.txt
 
cd ../..
rm -rf cvsworktmp

echo "% checkout #2: create MYBRANCH1 and modify foo.txt on it"
cvscall -Q checkout -d cvswork foo

cd cvswork

cvscall -q rtag -b -R MYBRANCH1 foo
cvscall -Q update -P -r MYBRANCH1
echo bar > foo.txt
cvsci -m "bar" foo.txt
echo baz > foo.txt
cvsci -m "baz" foo.txt

echo "% create MYBRANCH1_2 and modify foo.txt some more"
cvscall -q rtag -b -R -r MYBRANCH1 MYBRANCH1_2 foo
cvscall -Q update -P -r MYBRANCH1_2

echo bazzie > foo.txt
cvsci -m "bazzie" foo.txt

echo "% create MYBRANCH1_1 and modify foo.txt yet again"
cvscall -q rtag -b -R MYBRANCH1_1 foo
cvscall -Q update -P -r MYBRANCH1_1

echo quux > foo.txt
cvsci -m "quux" foo.txt

echo "% merge MYBRANCH1 to MYBRANCH1_1"
filterpath cvscall -Q update -P -jMYBRANCH1
# carefully placed sleep to dodge cvs bug (optimization?) where it
# sometimes ignores a "commit" command if it comes too fast (the -f
# option in cvsci seems to work for all the other commits in this
# script)
sleep 1
echo xyzzy > foo.txt
cvsci -m "merge1+clobber" foo.txt

echo "% return to trunk and merge MYBRANCH1_2"
cvscall -Q update -P -A
filterpath cvscall -Q update -P -jMYBRANCH1_2
cvsci -m "merge2" foo.txt

REALCVS=`which cvs`
echo "for x in \$*; do if [ \"\$x\" = \"rlog\" ]; then echo \"RCS file: $CVSROOT/foo/foo.txt,v\"; cat $TESTDIR/test-convert-cvsnt-mergepoints.rlog; exit 0; fi; done; $REALCVS \$*" > ../cvs
chmod +x ../cvs
PATH=..:${PATH} hg debugcvsps --parents foo | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/'

cd ..