From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Phillip Wood <phillip.wood123@gmail.com>
Subject: [PATCH v3] send-email: prompt-dependent exit codes
Date: Mon, 7 Aug 2023 18:58:50 +0200 [thread overview]
Message-ID: <20230807165850.2335067-1-oswald.buddenhagen@gmx.de> (raw)
In-Reply-To: <xmqqttx1l3zp.fsf@gitster.g>
From the perspective of a scripted caller, failure to send (some) mails
is an error even if it was interactively requested, so it should be
indicated by the exit code.
To make it somewhat specific, the exit code is 10 when only some mails
were skipped, and 11 if the user quit on the first prompt.
For interactive calls from the command line, interactive cancellation is
arguably not really an error, but there the exit code will be more or
less ignored anyway.
Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
---
v3:
- use a tally instead of flags after all, as my seemingly simple idea
apparently requires lots of thinking to grasp fully
- correct exit code when zero messages are to be sent. this cannot
actually happen, as it induces an exit via usage() earlier on.
- unfold nested ternary to save junio's sanity (who proved his point by
unfolding it slightly incorrectly)
- expand commit message
v2:
- fix do_quit() not resetting $sent_all
Cc: Junio C Hamano <gitster@pobox.com>
Cc: Phillip Wood <phillip.wood123@gmail.com>
---
git-send-email.perl | 32 ++++++++++++++++++++++++++++----
1 file changed, 28 insertions(+), 4 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index affbb88509..cd4db84b7f 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -256,6 +256,26 @@ sub system_or_die {
die $msg if $msg;
}
+my $sent_files = 0;
+
+sub do_exit {
+ if ($sent_files == @files) {
+ # All specified messages were sent
+ exit(0);
+ } elsif ($sent_files) {
+ # At least some messages were sent
+ exit(10);
+ } else {
+ # User cancelled on first message already
+ exit(11);
+ }
+}
+
+sub do_quit {
+ cleanup_compose_files();
+ do_exit();
+}
+
sub do_edit {
if (!defined($editor)) {
$editor = Git::command_oneline('var', 'GIT_EDITOR');
@@ -1195,8 +1215,7 @@ sub validate_address {
if (/^d/i) {
return undef;
} elsif (/^q/i) {
- cleanup_compose_files();
- exit(0);
+ do_quit();
}
$address = ask("$to_whom ",
default => "",
@@ -1619,8 +1638,7 @@ sub send_message {
} elsif (/^e/i) {
return -1;
} elsif (/^q/i) {
- cleanup_compose_files();
- exit(0);
+ do_quit();
} elsif (/^a/i) {
$confirm = 'never';
}
@@ -2001,6 +2019,10 @@ sub process_file {
return 0;
}
+ if ($message_was_sent) {
+ $sent_files++;
+ }
+
# set up for the next message
if ($thread) {
if ($message_was_sent &&
@@ -2278,3 +2300,5 @@ sub body_or_subject_has_nonascii {
}
return 0;
}
+
+do_exit();
--
2.40.0.152.g15d061e6df
next prev parent reply other threads:[~2023-08-07 16:59 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-26 6:16 [PATCH v2] send-email: prompt-dependent exit codes Oswald Buddenhagen
2023-04-27 15:49 ` Junio C Hamano
2023-05-02 19:04 ` Felipe Contreras
2023-08-07 16:58 ` Oswald Buddenhagen [this message]
2023-08-07 18:55 ` [PATCH v3] " Junio C Hamano
2023-08-08 10:55 ` Oswald Buddenhagen
2023-08-08 16:08 ` Junio C Hamano
2023-08-08 19:11 ` Oswald Buddenhagen
2023-08-09 17:15 ` [PATCH v4] " Oswald Buddenhagen
2023-08-09 19:15 ` Junio C Hamano
2023-08-10 10:00 ` Oswald Buddenhagen
2023-08-10 19:56 ` Junio C Hamano
2023-08-11 12:11 ` Oswald Buddenhagen
2023-08-21 17:07 ` [PATCH v5] " Oswald Buddenhagen
2023-08-21 17:57 ` Junio C Hamano
2023-08-21 18:57 ` Oswald Buddenhagen
2023-08-30 0:46 ` Junio C Hamano
2023-08-30 10:06 ` Oswald Buddenhagen
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=20230807165850.2335067-1-oswald.buddenhagen@gmx.de \
--to=oswald.buddenhagen@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood123@gmail.com \
/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).