view tests/test-convert-hg-source @ 8810:ac92775b3b80

Add patch.eol to ignore EOLs when patching (issue1019)

The intent is to fix many issues involving patching when win32ext is enabled.
With win32ext, the working directory and repository files EOLs are not the same
which means that patches made on a non-win32ext host do not apply cleanly
because of EOLs discrepancies. A theorically correct approach would be
transform either the patched file or the patch content with the
encoding/decoding filters used by win32ext. This solution is tricky to
implement and invasive, instead we prefer to address the win32ext case, by
offering a way to ignore input EOLs when patching and rewriting them when
saving the patched result.

#!/bin/sh

cat >> $HGRCPATH <<EOF
[extensions]
convert=
[convert]
hg.saverev=False
EOF

hg init orig
cd orig

echo foo > foo
echo bar > bar
hg ci -qAm 'add foo bar' -d '0 0'

echo >> foo
hg ci -m 'change foo' -d '1 0'

hg up -qC 0
hg copy --after --force foo bar
hg copy foo baz
hg ci -m 'make bar and baz copies of foo' -d '2 0'

hg merge
hg ci -m 'merge local copy' -d '3 0'

hg up -C 1
hg merge 2
hg ci -m 'merge remote copy' -d '4 0'

chmod +x baz
hg ci -m 'mark baz executable' -d '5 0'

cd ..
hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
cd new
hg out ../orig
cd ..

echo % init broken repository
hg init broken
cd broken
echo a >> a
echo b >> b
hg ci -qAm init
echo a >> a
echo b >> b
hg copy b c
hg ci -qAm changeall
hg up -qC 0
echo bc >> b
hg ci -m changebagain
HGMERGE=internal:local hg -q merge
hg ci -m merge
hg mv b d
hg ci -m moveb
echo % break it
rm .hg/store/data/b.*
cd ..

hg --config convert.hg.ignoreerrors=True convert broken fixed
hg -R fixed verify
echo '% manifest -r 0'
hg -R fixed manifest -r 0
echo '% manifest -r tip'
hg -R fixed manifest -r tip

true