[PATCH 2 of 2] patchbomb: with --verbose display series summary and ask for confirmation

Christian Ebert blacktrash at gmx.net
Sat Jan 30 06:07:03 CST 2010


# HG changeset patch
# User sender
# Date 1264852764 0
# Node ID 244554a734aa8c951b6a1bfeede0939d93590c70
# Parent  b0d68e68c9185059432a31b0357aaf2aedcd975f
patchbomb: with --verbose display series summary and ask for confirmation

Confirmation check summary:

Subject: [patch 0 of x [flags]] subject of intro or single patch
Subject: [patch 1 of x [flags]] subject
[ ... ]
From: sender
To: recipient(s) or prompt for To
Cc: carbon copy recipients
Bcc: blind carbon copy recipients

diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py
--- a/hgext/patchbomb.py
+++ b/hgext/patchbomb.py
@@ -386,20 +386,35 @@
 
     def getaddrs(opt, prpt=None, default=None):
         if opts.get(opt):
+            ui.note('%s: %s\n' % (opt.capitalize(), ', '.join(opts.get(opt))))
             return mail.addrlistencode(ui, opts.get(opt), _charsets,
                                        opts.get('test'))
 
-        addrs = (ui.config('email', opt) or
-                 ui.config('patchbomb', opt) or '')
+        addrs = ui.config('email', opt) or ui.config('patchbomb', opt) or ''
         if not addrs and prpt:
             addrs = prompt(ui, prpt, default)
+        elif addrs:
+            ui.note('%s: %s\n' % (opt.capitalize(), addrs))
 
         return mail.addrlistencode(ui, [addrs], _charsets, opts.get('test'))
 
+    # verbose: display 1st subject only when
+    # 1) subject was not prompted for or 2) returning from editing intro
+    displaymsgs = ((opts.get('subject') or not opts.get('desc')) and
+                   msgs or msgs[1:])
+    for m, subj in displaymsgs:
+        ui.note('Subject: %s\n' % subj)
+    ui.note('From: %s\n' % sender)
+
     to = getaddrs('to', 'To')
     cc = getaddrs('cc', not opts.get('to') and 'Cc', '')
     bcc = getaddrs('bcc')
 
+    if ui.verbose:
+        resp = prompt(ui, _('are you sure you want to send?'), 'y')
+        if resp.lower() != 'y':
+            return
+
     ui.write('\n')
 
     parent = opts.get('in_reply_to') or None


More information about the Mercurial-devel mailing list