# HG changeset patch # User Bryan O'Sullivan # Date 1180302826 25200 # Node ID 6d2d1dcd5f74acccb43e41ef2e24334a824047b2 # Parent c927c568a5ade7f36cc425ce85ad33a29dd64d98 patchbomb: Hoist sender config higher. diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py --- a/hgext/patchbomb.py +++ b/hgext/patchbomb.py @@ -325,15 +325,15 @@ def patchbomb(ui, repo, *revs, **opts): msg['Subject'] = subj return [msg] + sender = (opts['from'] or ui.config('email', 'from') or + ui.config('patchbomb', 'from') or + prompt('From', ui.username())) + if opts.get('bundle'): msgs = getbundlemsgs(getbundle(dest)) else: msgs = getexportmsgs() - sender = (opts['from'] or ui.config('email', 'from') or - ui.config('patchbomb', 'from') or - prompt('From', ui.username())) - def getaddrs(opt, prpt, default = None): addrs = opts[opt] or (ui.config('email', opt) or ui.config('patchbomb', opt) or