Mercurial > hg
changeset 4095:6fa7a2d0fc2e
hgweb: catch util.Abort raised by addchangegroup
Right now, if a pretxnchangegroup hook fails, we send some HTML
error message to the client and the transaction is not rolled back
(issue499).
Catching util.Abort allows us to send a decent message to the client
and for some reason makes the rollback complete.
This patch is not perfect since it doesn't fix the reason why the
transaction wasn't rolled back (maybe some circular references?).
Also, the transaction is aborted only after we've sent the response
back to the client and the "transaction aborted" message ends up in
the logs of the web server.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Fri, 16 Feb 2007 05:10:43 -0200 |
| parents | fbf0e9acfd83 |
| children | 49237d6ae97d 544838cc1158 |
| files | mercurial/hgweb/hgweb_mod.py |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hgweb/hgweb_mod.py Fri Feb 16 04:54:49 2007 -0200 +++ b/mercurial/hgweb/hgweb_mod.py Fri Feb 16 05:10:43 2007 -0200 @@ -1147,8 +1147,12 @@ try: url = 'remote:%s:%s' % (proto, req.env.get('REMOTE_HOST', '')) - ret = self.repo.addchangegroup(util.chunkbuffer(gen), - 'serve', url) + try: + ret = self.repo.addchangegroup(util.chunkbuffer(gen), + 'serve', url) + except util.Abort, inst: + sys.stdout.write("abort: %s\n" % inst) + ret = 0 finally: val = sys.stdout.getvalue() sys.stdout = old_stdout