diff -r 1f3acc30bdfe -r c2d9ef43ff6c mercurial/patch.py
--- a/mercurial/patch.py	Sun May 13 13:17:50 2012 +0200
+++ b/mercurial/patch.py	Sun May 13 13:18:06 2012 +0200
@@ -245,7 +245,7 @@
                         tmpfp.write('\n')
             elif not diffs_seen and message and content_type == 'text/plain':
                 message += '\n' + payload
-    except:
+    except: # re-raises
         tmpfp.close()
         os.unlink(tmpname)
         raise