Mercurial > hg
view tests/test-custom-filters @ 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 | a964ab624385 |
children |
line wrap: on
line source
#!/bin/sh hg init cat > .hg/hgrc <<EOF [extensions] prefixfilter = prefix.py [encode] *.txt = stripprefix: Copyright 2046, The Masters [decode] *.txt = insertprefix: Copyright 2046, The Masters EOF cat > prefix.py <<EOF from mercurial import util def stripprefix(s, cmd, filename, **kwargs): header = '%s\n' % cmd if s[:len(header)] != header: raise util.Abort('missing header "%s" in %s' % (cmd, filename)) return s[len(header):] def insertprefix(s, cmd): return '%s\n%s' % (cmd, s) def reposetup(ui, repo): repo.adddatafilter('stripprefix:', stripprefix) repo.adddatafilter('insertprefix:', insertprefix) EOF cat > .hgignore <<EOF .hgignore prefix.py prefix.pyc EOF cat > stuff.txt <<EOF Copyright 2046, The Masters Some stuff to ponder very carefully. EOF hg add stuff.txt hg ci -m stuff echo '% Repository data:' hg cat stuff.txt echo '% Fresh checkout:' rm stuff.txt hg up -C cat stuff.txt echo >> stuff.txt <<EOF Very very carefully. EOF hg stat cat > morestuff.txt <<EOF Unauthorized material subject to destruction. EOF echo '% Problem encoding:' hg add morestuff.txt hg ci -m morestuff hg stat