Mercurial > hg
view tests/test-hgwebdir.out @ 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 | 783c8c78db86 |
| children | 1de6e7e1bb9f |
line wrap: on
line source
adding a adding b adding d adding c % should give a 404 - file does not exist 404 Not Found error: bork@8580ff50825a: not found in manifest % should succeed 200 Script output follows /a/ /b/ 200 Script output follows a 200 Script output follows b % should give a 404 - repo is not published 404 Not Found error: repository c not found % should succeed, slashy names 200 Script output follows /b/ /coll/a/ /coll/a/.hg/patches/ /coll/b/ /coll/c/ /rcoll/a/ /rcoll/a/.hg/patches/ /rcoll/b/ /rcoll/b/d/ /rcoll/c/ /t/a/ 200 Script output follows <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> <link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> <title>Mercurial repositories index</title> </head> <body> <div class="container"> <div class="menu"> <a href="http://www.selenic.com/mercurial/"> <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a> </div> <div class="main"> <h2>Mercurial Repositories</h2> <table class="bigtable"> <tr> <th><a href="?sort=-name">Name</a></th> <th><a href="?sort=description">Description</a></th> <th><a href="?sort=contact">Contact</a></th> <th><a href="?sort=lastchange">Last change</a></th> <th> </th> </tr> <tr class="parity0"> <td><a href="/b/?style=paper">b</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">seconds ago</td> <td class="indexlinks"></td> </tr> <tr class="parity1"> <td><a href="/coll/a/?style=paper">coll/a</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">seconds ago</td> <td class="indexlinks"></td> </tr> <tr class="parity0"> <td><a href="/coll/a/.hg/patches/?style=paper">coll/a/.hg/patches</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">seconds ago</td> <td class="indexlinks"></td> </tr> <tr class="parity1"> <td><a href="/coll/b/?style=paper">coll/b</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">seconds ago</td> <td class="indexlinks"></td> </tr> <tr class="parity0"> <td><a href="/coll/c/?style=paper">coll/c</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">seconds ago</td> <td class="indexlinks"></td> </tr> <tr class="parity1"> <td><a href="/rcoll/a/?style=paper">rcoll/a</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">seconds ago</td> <td class="indexlinks"></td> </tr> <tr class="parity0"> <td><a href="/rcoll/a/.hg/patches/?style=paper">rcoll/a/.hg/patches</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">seconds ago</td> <td class="indexlinks"></td> </tr> <tr class="parity1"> <td><a href="/rcoll/b/?style=paper">rcoll/b</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">seconds ago</td> <td class="indexlinks"></td> </tr> <tr class="parity0"> <td><a href="/rcoll/b/d/?style=paper">rcoll/b/d</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">seconds ago</td> <td class="indexlinks"></td> </tr> <tr class="parity1"> <td><a href="/rcoll/c/?style=paper">rcoll/c</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">seconds ago</td> <td class="indexlinks"></td> </tr> <tr class="parity0"> <td><a href="/t/a/?style=paper">t/a</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">seconds ago</td> <td class="indexlinks"></td> </tr> </table> </div> </div> </body> </html> 200 Script output follows /t/a/ 200 Script output follows /t/a/ 200 Script output follows <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> <link rel="icon" href="/static/hgicon.png" type="image/png" /> <meta name="robots" content="index, nofollow" /> <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> <title>Mercurial repositories index</title> </head> <body> <div class="container"> <div class="menu"> <a href="http://www.selenic.com/mercurial/"> <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a> </div> <div class="main"> <h2>Mercurial Repositories</h2> <table class="bigtable"> <tr> <th><a href="?sort=-name">Name</a></th> <th><a href="?sort=description">Description</a></th> <th><a href="?sort=contact">Contact</a></th> <th><a href="?sort=lastchange">Last change</a></th> <th> </th> </tr> <tr class="parity0"> <td><a href="/t/a/?style=paper">a</a></td> <td>unknown</td> <td>Foo Bar <foo.bar@example.com></td> <td class="age">seconds ago</td> <td class="indexlinks"></td> </tr> </table> </div> </div> </body> </html> 200 Script output follows <?xml version="1.0" encoding="ascii"?> <feed xmlns="http://127.0.0.1/2005/Atom"> <!-- Changelog --> <id>http://127.0.0.1/t/a/</id> <link rel="self" href="http://127.0.0.1/t/a/atom-log"/> <link rel="alternate" href="http://127.0.0.1/t/a/"/> <title>t/a Changelog</title> <updated>1970-01-01T00:00:01+00:00</updated> <entry> <title>a</title> <id>http://127.0.0.1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> <link href="http://127.0.0.1/t/a/rev/8580ff50825a50c8f716709acdf8de0deddcd6ab"/> <author> <name>test</name> <email>test</email> </author> <updated>1970-01-01T00:00:01+00:00</updated> <published>1970-01-01T00:00:01+00:00</published> <content type="xhtml"> <div xmlns="http://127.0.0.1/1999/xhtml"> <pre xml:space="preserve">a</pre> </div> </content> </entry> </feed> 200 Script output follows <?xml version="1.0" encoding="ascii"?> <feed xmlns="http://127.0.0.1/2005/Atom"> <!-- Changelog --> <id>http://127.0.0.1/t/a/</id> <link rel="self" href="http://127.0.0.1/t/a/atom-log"/> <link rel="alternate" href="http://127.0.0.1/t/a/"/> <title>t/a Changelog</title> <updated>1970-01-01T00:00:01+00:00</updated> <entry> <title>a</title> <id>http://127.0.0.1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> <link href="http://127.0.0.1/t/a/rev/8580ff50825a50c8f716709acdf8de0deddcd6ab"/> <author> <name>test</name> <email>test</email> </author> <updated>1970-01-01T00:00:01+00:00</updated> <published>1970-01-01T00:00:01+00:00</published> <content type="xhtml"> <div xmlns="http://127.0.0.1/1999/xhtml"> <pre xml:space="preserve">a</pre> </div> </content> </entry> </feed> 200 Script output follows a 200 Script output follows /coll/a/ /coll/a/.hg/patches/ /coll/b/ /coll/c/ 200 Script output follows a 200 Script output follows /rcoll/a/ /rcoll/a/.hg/patches/ /rcoll/b/ /rcoll/b/d/ /rcoll/c/ 200 Script output follows d % collections: should succeed 200 Script output follows /a/ /a/.hg/patches/ /b/ /c/ 200 Script output follows a 200 Script output follows b 200 Script output follows c % paths errors 1 % paths errors 2 % collections errors