view tests/test-convert-hg-startrev @ 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

echo '[extensions]' >> $HGRCPATH
echo 'hgext.graphlog =' >> $HGRCPATH
echo 'hgext.convert =' >> $HGRCPATH

glog()
{
    hg -R "$1" glog --template '{rev} "{desc}" files: {files}\n'
}

hg init source
cd source

echo a > a
echo b > b
hg ci -d '0 0' -qAm '0: add a b'
echo c > c
hg ci -d '1 0' -qAm '1: add c'
hg copy a e
echo b >> b
hg ci -d '2 0' -qAm '2: copy e from a, change b'
hg up -C 0
echo a >> a
hg ci -d '3 0' -qAm '3: change a'
hg merge
hg copy b d
hg ci -d '4 0' -qAm '4: merge 2 and 3, copy d from b'
echo a >> a
hg ci -d '5 0' -qAm '5: change a'
cd ..

echo % convert from null revision
hg convert --config convert.hg.startrev=null source empty
glog empty

echo % convert from zero revision
hg convert --config convert.hg.startrev=0 source full
glog full

echo % convert from merge parent
hg convert --config convert.hg.startrev=1 source conv1
glog conv1
cd conv1
echo % check copy preservation
hg log --follow --copies e
echo % check copy removal on missing parent
hg log --follow --copies d
hg cat -r tip a b
hg -q verify
cd ..

echo % convert from merge
hg convert --config convert.hg.startrev=4 source conv4
glog conv4
cd conv4
hg up -C
hg cat -r tip a b
hg -q verify
cd ..