# HG changeset patch
# User Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
# Date 1226495267 -3600
# Node ID 982b55ec80beef1be75b4910b2e82800362c0237
# Parent  6c336e7dc14523770990af00bb63f12d7e019bbb
patchbomb: make `hg email` reusable for other patch sources

Adds two internal options, patches and patchnames, which allow other extensions
to email a given set of patches. The pbranch extension needs this to send its
patches which are diffs between topic branches.

diff -r 6c336e7dc145 -r 982b55ec80be hgext/patchbomb.py
--- a/hgext/patchbomb.py	Wed Nov 12 14:01:09 2008 +0100
+++ b/hgext/patchbomb.py	Wed Nov 12 14:07:47 2008 +0100
@@ -159,7 +159,7 @@
             s = ''
         return s
 
-    def makepatch(patch, idx, total):
+    def makepatch(patch, idx, total, patchname=None):
         desc = []
         node = None
         body = ''
@@ -171,7 +171,7 @@
             if line.startswith('diff -r') or line.startswith('diff --git'):
                 break
             desc.append(line)
-        if not node:
+        if not patchname and not node:
             raise ValueError
 
         if opts.get('attach'):
@@ -197,15 +197,16 @@
                                    opts.get('test'))
             binnode = bin(node)
             # if node is mq patch, it will have patch file name as tag
-            patchname = [t for t in repo.nodetags(binnode)
-                         if t.endswith('.patch') or t.endswith('.diff')]
-            if patchname:
-                patchname = patchname[0]
-            elif total > 1:
-                patchname = cmdutil.make_filename(repo, '%b-%n.patch',
-                                                  binnode, idx, total)
-            else:
-                patchname = cmdutil.make_filename(repo, '%b.patch', binnode)
+            if not patchname:
+                patchtags = [t for t in repo.nodetags(binnode)
+                             if t.endswith('.patch') or t.endswith('.diff')]
+                if patchtags:
+                    patchname = patchtags[0]
+                elif total > 1:
+                    patchname = cmdutil.make_filename(repo, '%b-%n.patch',
+                                                      binnode, idx, total)
+                else:
+                    patchname = cmdutil.make_filename(repo, '%b.patch', binnode)
             disposition = 'inline'
             if opts.get('attach'):
                 disposition = 'attachment'
@@ -256,7 +257,8 @@
         mail.validateconfig(ui)
 
     if not (revs or opts.get('rev')
-            or opts.get('outgoing') or opts.get('bundle')):
+            or opts.get('outgoing') or opts.get('bundle')
+            or opts.get('patches')):
         raise util.Abort(_('specify at least one changeset with -r or -o'))
 
     cmdutil.setremoteconfig(ui, opts)
@@ -298,22 +300,19 @@
             body = ui.edit(body, sender)
         return body
 
-    def getexportmsgs():
-        patches = []
-        commands.export(ui, repo, *revs, **{'output': exportee(patches),
-                                            'switch_parent': False,
-                                            'text': None,
-                                            'git': opts.get('git')})
-
+    def getpatchmsgs(patches, patchnames=None):
         jumbo = []
         msgs = []
 
         ui.write(_('This patch series consists of %d patches.\n\n')
                  % len(patches))
 
+        name = None
         for p, i in zip(patches, xrange(len(patches))):
             jumbo.extend(p)
-            msgs.append(makepatch(p, i + 1, len(patches)))
+            if patchnames:
+                name = patchnames[i]
+            msgs.append(makepatch(p, i + 1, len(patches), name))
 
         if len(patches) > 1:
             tlen = len(str(len(patches)))
@@ -359,10 +358,18 @@
               ui.config('patchbomb', 'from') or
               prompt('From', ui.username()))
 
-    if opts.get('bundle'):
+    patches = opts.get('patches')
+    if patches:
+        msgs = getpatchmsgs(patches, opts.get('patchnames'))
+    elif opts.get('bundle'):
         msgs = getbundlemsgs(getbundle(dest))
     else:
-        msgs = getexportmsgs()
+        patches = []
+        commands.export(ui, repo, *revs, **{'output': exportee(patches),
+                                            'switch_parent': False,
+                                            'text': None,
+                                            'git': opts.get('git')})
+        msgs = getpatchmsgs(patches)
 
     def getaddrs(opt, prpt, default = None):
         addrs = opts.get(opt) or (ui.config('email', opt) or