Mercurial > hg
view tests/test-hgwebdir.out @ 11638:79231258503b stable
transplant: crash if repo.commit() finds nothing to commit
(makes issue2135, issue2264 more obvious, but does nothing to fix
either one)
This seems to happen in two distinct cases:
* patch.patch() claims success but changes nothing (e.g.
the transplanted changeset adds an empty file that already
exists)
* patch.patch() makes changes, but repo.status() fails to report them
Both of these seem like bugs in other parts of Mercurial, so arguably
it's not transplant's job to detect the failure to commit. However:
* detecting the problem as soon as possible is desirable
* it prevents a more obscure crash later, in transplants.write()
* there might be other lurking (or future) bugs that cause
repo.commit() to do nothing
Also, in the case of issue2264 (source changesets silently dropped by
transplant), the only way to spot the problem currently is the crash
in transplants.write(). Failure to transplant a patch should abort
immediately, whether it's user error (patch does not apply) or a
Mercurial bug (e.g. repo.status() failing to report changes).
| author | Greg Ward <greg-hg@gerg.ca> |
|---|---|
| date | Sun, 18 Jul 2010 21:29:29 -0400 |
| parents | 6d87c20cd7a8 |
| children | 8f8a7976f4bc |
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 % atom-log without basedir <link rel="self" href="http://example.com:8080/a/atom-log"/> <link rel="alternate" href="http://example.com:8080/a/"/> <link href="http://example.com:8080/a/rev/8580ff50825a"/> % rss-log without basedir <guid isPermaLink="true">http://example.com:8080/a/rev/8580ff50825a</guid> % should succeed, slashy names 200 Script output follows /t/a/ /b/ /coll/a/ /coll/a/.hg/patches/ /coll/b/ /coll/c/ /rcoll/a/ /rcoll/a/.hg/patches/ /rcoll/b/ /rcoll/b/d/ /rcoll/c/ 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://mercurial.selenic.com/"> <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 modified</a></th> <th> </th> </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> <tr class="parity1"> <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="parity0"> <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="parity1"> <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="parity0"> <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="parity1"> <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="parity0"> <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="parity1"> <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="parity0"> <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="parity1"> <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="parity0"> <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> </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://mercurial.selenic.com/"> <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 modified</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/8580ff50825a"/> <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/8580ff50825a"/> <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 % test descend = False 200 Script output follows /c/ 200 Script output follows /t/a/ /t/b/ % 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 % atom-log with basedir / <link rel="self" href="http://example.com:8080/a/atom-log"/> <link rel="alternate" href="http://example.com:8080/a/"/> <link href="http://example.com:8080/a/rev/8580ff50825a"/> % rss-log with basedir / <guid isPermaLink="true">http://example.com:8080/a/rev/8580ff50825a</guid> % atom-log with basedir /foo/ <link rel="self" href="http://example.com:8080/foo/a/atom-log"/> <link rel="alternate" href="http://example.com:8080/foo/a/"/> <link href="http://example.com:8080/foo/a/rev/8580ff50825a"/> % rss-log with basedir /foo/ <guid isPermaLink="true">http://example.com:8080/foo/a/rev/8580ff50825a</guid> % paths errors 1 % paths errors 2 % paths errors 3 % collections errors % collections errors 2