From: Eric Wong <e@80x24.org>
To: Drew DeVault <sir@cmpwn.com>
Cc: git@vger.kernel.org, "Simon Ser" <contact@emersion.fr>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: Re: [PATCH] git-send-email: allow re-editing of message
Date: Fri, 4 May 2018 08:19:36 +0000 [thread overview]
Message-ID: <20180504081936.GA9133@dcvr> (raw)
In-Reply-To: <20180502143200.9371-1-sir@cmpwn.com>
Drew DeVault <sir@cmpwn.com> wrote:
> When shown the email summary, an opportunity is presented for the user
> to edit the email as if they had specified --annotate. This also permits
> them to edit it multiple times.
Thanks, this seems like a good idea for the cover letter, especially.
I prefer to get the commit messages right in the git history, first,
but I more often screw up the cover letter.
I haven't looked at the code to send-email in a while,
so some thinking out loud below :>
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -1330,9 +1330,14 @@ sub file_name_is_absolute {
> return File::Spec::Functions::file_name_is_absolute($path);
> }
>
> -# Returns 1 if the message was sent, and 0 otherwise.
> -# In actuality, the whole program dies when there
> -# is an error sending a message.
> +# Prepares the email, then asks the user what to do.
> +#
> +# If the user chooses to send the email, it's sent and 1 is returned.
> +# If the user chooses not to send the email, 0 is returned.
> +# If the user decides they want to make further edits, -1 is returned and the
> +# caller is expected to call send_message again after the edits are performed.
OK, -1 is the new return value. Thanks for documenting this.
The rest of the prompt implementation looks fine and I won't quote it.
> @@ -1552,7 +1559,9 @@ $references = $initial_in_reply_to || '';
> $subject = $initial_subject;
> $message_num = 0;
>
> -foreach my $t (@files) {
> +sub process_file {
> + my ($t) = @_;
> +
> open my $fh, "<", $t or die sprintf(__("can't open file %s"), $t);
>
> my $author = undef;
OK, process_file is a new function...
> @@ -1755,6 +1764,10 @@ foreach my $t (@files) {
> }
>
> my $message_was_sent = send_message();
> + if ($message_was_sent == -1) {
> + do_edit($t);
> + return 0;
> + }
And the previously documented -1 return value is used here.
Mental note: process_file returns 0 to indicate an edit was done.
> # set up for the next message
> if ($thread && $message_was_sent &&
> @@ -1776,6 +1789,14 @@ foreach my $t (@files) {
> undef $auth;
> sleep($relogin_delay) if defined $relogin_delay;
> }
> +
> + return 1;
Mental note: process_file normally returns 1
> +}
> +
> +foreach my $t (@files) {
> + while (!process_file($t)) {
> + # This space deliberately left blank
Cute, but that comment could say something useful, instead:
# user is still editing the file
Otherwise, I think the patch is great. Thanks!
prev parent reply other threads:[~2018-05-04 8:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-02 14:32 [PATCH] git-send-email: allow re-editing of message Drew DeVault
2018-05-04 8:19 ` Eric Wong [this message]
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=20180504081936.GA9133@dcvr \
--to=e@80x24.org \
--cc=avarab@gmail.com \
--cc=contact@emersion.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sir@cmpwn.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).