From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: gitster@pobox.com
Cc: git@vger.kernel.org, remi.lespinet@ensimag.grenoble-inp.fr,
guillaume.pages@ensimag.grenoble-inp.fr,
louis--alexandre.stuber@ensimag.grenoble-inp.fr,
antoine.delaite@ensimag.grenoble-inp.fr,
Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [PATCH v7 04/10] send-email: refactor address list process
Date: Tue, 30 Jun 2015 14:16:45 +0200 [thread overview]
Message-ID: <1435666611-18429-5-git-send-email-Matthieu.Moy@imag.fr> (raw)
In-Reply-To: <1435666611-18429-1-git-send-email-Matthieu.Moy@imag.fr>
From: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Simplify code by creating a function which transform a list of strings
containing email addresses (separated by commas, comporting aliases)
into a clean list of valid email addresses.
Signed-off-by: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
git-send-email.perl | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 3cbdb1a..994697e 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -839,12 +839,9 @@ sub expand_one_alias {
return $aliases{$alias} ? expand_aliases(@{$aliases{$alias}}) : $alias;
}
-@initial_to = expand_aliases(@initial_to);
-@initial_to = validate_address_list(sanitize_address_list(@initial_to));
-@initial_cc = expand_aliases(@initial_cc);
-@initial_cc = validate_address_list(sanitize_address_list(@initial_cc));
-@bcclist = expand_aliases(@bcclist);
-@bcclist = validate_address_list(sanitize_address_list(@bcclist));
+@initial_to = process_address_list(@initial_to);
+@initial_cc = process_address_list(@initial_cc);
+@bcclist = process_address_list(@bcclist);
if ($thread && !defined $initial_reply_to && $prompting) {
$initial_reply_to = ask(
@@ -1057,6 +1054,13 @@ sub sanitize_address_list {
return (map { sanitize_address($_) } @_);
}
+sub process_address_list {
+ my @addr_list = expand_aliases(@_);
+ @addr_list = sanitize_address_list(@addr_list);
+ @addr_list = validate_address_list(@addr_list);
+ return @addr_list;
+}
+
# Returns the local Fully Qualified Domain Name (FQDN) if available.
#
# Tightly configured MTAa require that a caller sends a real DNS
@@ -1566,10 +1570,8 @@ foreach my $t (@files) {
($confirm =~ /^(?:auto|compose)$/ && $compose && $message_num == 1));
$needs_confirm = "inform" if ($needs_confirm && $confirm_unconfigured && @cc);
- @to = expand_aliases(@to);
- @to = validate_address_list(sanitize_address_list(@to));
- @cc = expand_aliases(@cc);
- @cc = validate_address_list(sanitize_address_list(@cc));
+ @to = process_address_list(@to);
+ @cc = process_address_list(@cc);
@to = (@initial_to, @to);
@cc = (@initial_cc, @cc);
--
2.5.0.rc0.10.g7792c2a
next prev parent reply other threads:[~2015-06-30 12:17 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-30 12:16 [PATCH v7 00/10] send-email address management Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 01/10] t9001-send-email: move script creation in a setup test Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 02/10] send-email: allow aliases in patch header and command script outputs Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 03/10] t9001-send-email: refactor header variable fields replacement Matthieu Moy
2015-06-30 12:16 ` Matthieu Moy [this message]
2015-06-30 12:16 ` [PATCH v7 05/10] send-email: allow use of aliases in the From field of --compose mode Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 06/10] send-email: minor code refactoring Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 07/10] send-email: reduce dependencies impact on parse_address_line Matthieu Moy
2015-06-30 18:41 ` Junio C Hamano
2015-06-30 19:36 ` Matthieu Moy
2015-06-30 19:43 ` Junio C Hamano
2015-07-01 7:51 ` Remi Lespinet
2015-07-01 8:33 ` Matthieu Moy
2015-07-07 9:37 ` Torsten Bögershausen
2015-07-07 13:27 ` Matthieu Moy
2015-07-07 13:38 ` [PATCH v8 " Matthieu Moy
2015-07-08 7:16 ` Torsten Bögershausen
2015-07-08 7:28 ` Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 08/10] send-email: consider quote as delimiter instead of character Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 09/10] send-email: allow multiple emails using --cc, --to and --bcc Matthieu Moy
2015-06-30 12:16 ` [PATCH v7 10/10] send-email: suppress meaningless whitespaces in from field Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435666611-18429-5-git-send-email-Matthieu.Moy@imag.fr \
--to=matthieu.moy@imag.fr \
--cc=antoine.delaite@ensimag.grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=guillaume.pages@ensimag.grenoble-inp.fr \
--cc=louis--alexandre.stuber@ensimag.grenoble-inp.fr \
--cc=remi.lespinet@ensimag.grenoble-inp.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).