view tests/test-eol-clone @ 11715:4f9dfb54c8b5 stable

qpush --move: move the right patch even with comment lines

88fc876a4833 caused that we find the index of the moving patch in self.series
but look it up in self.full_series. The difference between these is that
full_series also contains comment lines, and we thus moved the wrong patch.

Use back self.full_series to find the moving patch, but take care of striping
the patch guard markers before comparing the patch name. Test cases have been
added for comments and empty lines in self.full_series, and for the case of
guarded patches.

Original patch contributed by Mads Kiilerich <[e-mail]>

#!/bin/sh

cat > $HGRCPATH <<EOF
[diff]
git = True

[extensions]
eol =

[eol]
native = CRLF
EOF

echo "% setup repository"
hg init repo
cd repo

cat > .hgeol <<EOF
[patterns]
**.txt = native
EOF

printf "first\r\nsecond\r\nthird\r\n" > a.txt
hg commit --addremove -m 'checkin'
cd ..

echo "% hg clone repo repo-2"
hg clone repo repo-2
cd repo-2

echo '% printrepr.py a.txt'
python $TESTDIR/printrepr.py < a.txt
echo '% hg cat a.txt'
hg cat a.txt | python $TESTDIR/printrepr.py

hg remove .hgeol
hg commit -m 'remove eol'
hg push --quiet

cd ..

# Test clone of repo with .hgeol in working dir, but no .hgeol in tip
echo "% hg clone repo repo-3"
hg clone repo repo-3
cd repo-3

echo '% printrepr.py a.txt'
python $TESTDIR/printrepr.py < a.txt

cd ..

# Test clone of revision with .hgeol
echo "% hg clone -r 1 repo repo-4"
hg clone -r 0 repo repo-4
cd repo-4

echo '% cat .hgeol'
cat .hgeol

echo '% printrepr.py a.txt'
python $TESTDIR/printrepr.py < a.txt

cd ..