Mercurial > hg
changeset 3886:d83b125b7d7e
merge with crew-stable
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Thu, 14 Dec 2006 19:30:52 +0100 |
| parents | a04f304eeded (diff) 6081b4c68baf (current diff) |
| children | 57b797601b61 79e5a6e7c451 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/patchbomb.py Thu Dec 14 19:30:18 2006 +0100 +++ b/hgext/patchbomb.py Thu Dec 14 19:30:52 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
--- a/setup.py Thu Dec 14 19:30:18 2006 +0100 +++ b/setup.py Thu Dec 14 19:30:52 2006 +0100 @@ -37,7 +37,7 @@ # Due to the use of demandload py2exe is not finding the modules. # packagescan.getmodules creates a list of modules included in - # the mercurial package plus depdent modules. + # the mercurial package plus dependant modules. from py2exe.build_exe import py2exe as build_exe class py2exe_for_demandload(build_exe):