Re: [PATCH v3] send-email: Improve format of smtp initialization error message
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 30, 2014, 16:13 UTC
- Message-ID
- <xmqqa925t8sl.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <87iogt4d53.fsf@gmail.com>
Alex Kuleshov <kuleshovmail@gmail.com> writes:
Show 9 quoted lines
> What's about output like this: > > Unable to initialize SMTP properly. Check config and use --smtp-debug. > > VALUES: > server=smtp.gmail.com > encryption= > hello=localhost.localdomain > port=587
Hmmm, maybe I am being slow but what's about it? I thought that was what you are trying to give with your patch since the first iteration.
Puzzled...
Show 49 quoted lines
>
> Junio C Hamano <gitster@pobox.com> @ 2014-12-30 00:50 QYZT:
>
>> Alexander Kuleshov <kuleshovmail@gmail.com> writes:
>>
>>> Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
>>> ---
>>> git-send-email.perl | 8 ++++----
>>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/git-send-email.perl b/git-send-email.perl
>>> index 82c6fea..60dcd8d 100755
>>> --- a/git-send-email.perl
>>> +++ b/git-send-email.perl
>>> @@ -1275,10 +1275,10 @@ X-Mailer: git-send-email $gitversion
>>>
>>> if (!$smtp) {
>>> die "Unable to initialize SMTP properly. Check config and use --smtp-debug. ",
>>> - "VALUES: server=$smtp_server ",
>>> - "encryption=$smtp_encryption ",
>>> - "hello=$smtp_domain",
>>> - defined $smtp_server_port ? " port=$smtp_server_port" : "";
>>> + "\nVALUES: \n\tserver=$smtp_server ",
>>> + "\n\tencryption=$smtp_encryption ",
>>> + "\n\thello=$smtp_domain",
>>> + defined $smtp_server_port ? " \n\tport=$smtp_server_port" : "";
>>
>> It may be a good convention to have LF at the beginning of a new
>> string (i.e. we terminate the old line only when we have something
>> more to say), but that is true only when we want to end the sentence
>> without the final newline. I wonder if that is true in this case;
>> do we want perl to say "at line # in file X" at the end?
>>
>> In any case, you have two output lines that ends with a trailing SP
>> just before LF, which is probably not what you wanted.
>>
>> If we want to see all lines end with LF, it may be far easier to
>> read this way:
>>
>> die "msg\n",
>> "\tvar1=val1\n",
>> "\tvar2=val2\n",
>> defined $var3 ? "\tvar3=val3\n" : "";
>>
>> I dunno.
>
> --
> Best regards.
> 0xAX