view tests/test-mq-qdelete @ 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 "mq=" >> $HGRCPATH

hg init a
cd a

echo 'base' > base
hg ci -Ambase -d '1 0'

hg qnew -d '1 0' a
hg qnew -d '1 0' b
hg qnew -d '1 0' c

hg qdel

hg qdel c
hg qpop
hg qdel c
hg qseries
ls .hg/patches
hg qpop
hg qdel -k b
ls .hg/patches
hg qdel -r a
hg qapplied
hg log --template '{rev} {desc}\n'

hg qnew d
hg qnew e
hg qnew f

hg qdel -r e
hg qdel -r qbase:e
hg qapplied
hg log --template '{rev} {desc}\n'

cd ..
hg init b
cd b

echo 'base' > base
hg ci -Ambase -d '1 0'

hg qfinish
hg qfinish -a

hg qnew -d '1 0' a
hg qnew -d '1 0' b
hg qnew c # XXX fails to apply by /usr/bin/patch if we put a date

hg qfinish 0
hg qfinish b

hg qpop
hg qfinish -a c
hg qpush

hg qfinish qbase:b
hg qapplied
hg log --template '{rev} {desc}\n'

hg qfinish -a c
hg qapplied
hg log --template '{rev} {desc}\n'
ls .hg/patches