[PATCH v3] send-email: Improve format of smtp initialization error message

[PATCH v3] send-email: Improve format of smtp initialization error message

[Alexander Kuleshov]

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" : "";
 		}
 
 		smtp_auth_maybe or die $smtp->message;
-- 
2.2.1.201.gbbcefff.dirty

Re: [PATCH v3] send-email: Improve format of smtp initialization error message

[Junio C Hamano]

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.

Re: [PATCH v3] send-email: Improve format of smtp initialization error message

[Alex Kuleshov]

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

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

Re: [PATCH v3] send-email: Improve format of smtp initialization error message

[Junio C Hamano]

Alex Kuleshov <kuleshovmail@gmail.com> writes:

> 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...

>
> 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

Re: [PATCH v3] send-email: Improve format of smtp initialization error message

[Alexander Kuleshov]

Yes, like this, but is it suitable for:

>>      die "msg\n",
>>             "\tvar1=val1\n",
>>             "\tvar2=val2\n",
>>             defined $var3 ? "\tvar3=val3\n" : "";

?

I finally got confused, how to print it...


2014-12-30 22:13 GMT+06:00 Junio C Hamano <gitster@pobox.com>:
> Alex Kuleshov <kuleshovmail@gmail.com> writes:
>
>> 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...
>
>>
>> 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



-- 
_________________________
0xAX