# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1166099447 -3600
# Node ID 59ec9c38f614085b1c02f3a6d9ff091b83b866b5
# Parent  5f05157bf9be876bfa32e6db64e38320b5099405# Parent  ff49da8bd6ae59aea016f612b0b968af4bda0641
merge with crew

diff -r 5f05157bf9be -r 59ec9c38f614 hgext/patchbomb.py
--- a/hgext/patchbomb.py	Thu Dec 14 00:41:11 2006 +0100
+++ b/hgext/patchbomb.py	Thu Dec 14 13:30:47 2006 +0100
@@ -216,8 +216,6 @@
     bcc = [a.strip() for a in bcc if a.strip()]
 
     if len(patches) > 1:
-        ui.write(_('\nWrite the introductory message for the patch series.\n\n'))
-
         tlen = len(str(len(patches)))
 
         subj = '[PATCH %0*d of %d] %s' % (
@@ -227,21 +225,13 @@
             prompt('Subject:', rest = ' [PATCH %0*d of %d] ' % (tlen, 0,
                 len(patches))))
 
-        ui.write(_('Finish with ^D or a dot on a line by itself.\n\n'))
-
-        body = []
-
-        while True:
-            try: l = raw_input()
-            except EOFError: break
-            if l == '.': break
-            body.append(l)
-
+        body = ''
         if opts['diffstat']:
             d = cdiffstat(_('Final summary:\n'), jumbo)
-            if d: body.append('\n' + d)
+            if d: body = '\n' + d
 
-        body = '\n'.join(body) + '\n'
+        ui.write(_('\nWrite the introductory message for the patch series.\n\n'))
+        body = ui.edit(body, sender)
 
         msg = email.MIMEText.MIMEText(body)
         msg['Subject'] = subj