Mercurial > hg
view tests/test-mq-qclone-http @ 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.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 15 Jun 2009 00:03:26 +0200 |
parents | 6a49fa7674c1 |
children | 400ffd5f2f14 |
line wrap: on
line source
#! /bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH mkdir webdir cd webdir hg init a hg --cwd a qinit -c echo a > a/a hg --cwd a ci -A -m a echo b > a/b hg --cwd a addremove hg --cwd a qnew -f b.patch hg --cwd a qcommit -m b.patch hg --cwd a log --template "{desc}\n" hg --cwd a/.hg/patches log --template "{desc}\n" root=`pwd` cd .. echo % test with recursive collection cat > collections.conf <<EOF [paths] /=$root/** EOF hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf collections.conf \ -A access-paths.log -E error-paths-1.log cat hg.pid >> $DAEMON_PIDS "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/?style=raw' hg qclone http://localhost:$HGPORT/a b hg --cwd b log --template "{desc}\n" hg --cwd b qpush -a hg --cwd b log --template "{desc}\n" echo % test with normal collection cat > collections1.conf <<EOF [paths] /=$root/* EOF hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf collections1.conf \ -A access-paths.log -E error-paths-1.log cat hg.pid >> $DAEMON_PIDS "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=raw' hg qclone http://localhost:$HGPORT1/a c hg --cwd c log --template "{desc}\n" hg --cwd c qpush -a hg --cwd c log --template "{desc}\n" echo % test with old-style collection cat > collections2.conf <<EOF [collections] $root=$root EOF hg serve -p $HGPORT2 -d --pid-file=hg.pid --webdir-conf collections2.conf \ -A access-paths.log -E error-paths-1.log cat hg.pid >> $DAEMON_PIDS "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/?style=raw' hg qclone http://localhost:$HGPORT2/a d hg --cwd d log --template "{desc}\n" hg --cwd d qpush -a hg --cwd d log --template "{desc}\n"