[PATCH] Clarify usage of `additional_headers' in test/test-lib.sh:generate_message.

[PATCH] Clarify usage of `additional_headers' in test/test-lib.sh:generate_message.

[Thomas Schwinge]

Signed-off-by: Thomas Schwinge <thomas@schwinge.name>
---
 test/test-lib.sh |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/test/test-lib.sh b/test/test-lib.sh
index d179426..f536172 100755
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -351,8 +351,11 @@ ${additional_headers}"
 ${additional_headers}"
     fi
 
+    # Note that in the way we're setting it above and using it below,
+    # `additional_headers' will also serve as the header / body separator
+    # (empty line in between).
 
-cat <<EOF >"$gen_msg_filename"
+    cat <<EOF >"$gen_msg_filename"
 From: ${template[from]}
 To: ${template[to]}
 Message-Id: <${gen_msg_id}>
-- 
1.7.1

Re: [PATCH] Clarify usage of `additional_headers' in test/test-lib.sh:generate_message.

[Michal Sojka]

On Thu, 27 Jan 2011, Thomas Schwinge wrote:
> Signed-off-by: Thomas Schwinge <thomas@schwinge.name>
> ---
>  test/test-lib.sh |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/test/test-lib.sh b/test/test-lib.sh
> index d179426..f536172 100755
> --- a/test/test-lib.sh
> +++ b/test/test-lib.sh
> @@ -351,8 +351,11 @@ ${additional_headers}"
>  ${additional_headers}"
>      fi
>  
> +    # Note that in the way we're setting it above and using it below,
> +    # `additional_headers' will also serve as the header / body separator
> +    # (empty line in between).

Yes, this will definitely help the future readers of this code. Thanks.

-Michal

Re: [PATCH] Clarify usage of `additional_headers' in test/test-lib.sh:generate_message.

[Carl Worth]

[-- Attachment #1: Type: text/plain, Size: 628 bytes --]

On Thu, 27 Jan 2011 02:17:21 -0700, Thomas Schwinge <thomas@schwinge.name> wrote:
> +    # Note that in the way we're setting it above and using it below,
> +    # `additional_headers' will also serve as the header / body separator
> +    # (empty line in between).

Thanks, Thomas.

I've merged this now.

I'd even prefer to have the newline explicitly in the HERE document, but
it's awkward to avoid having the "extra" newline at the end of
${additional_headers} the way I'm constructing it incrementally. So just
documenting the current approach is probably best for now.

-Carl

-- 
carl.d.worth@intel.com

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] Clarify usage of `additional_headers' in test/test-lib.sh:generate_message.

[Thomas Schwinge]

[-- Attachment #1: Type: text/plain, Size: 1622 bytes --]

Hallo!

On Fri, 28 Jan 2011 15:36:25 +1000, Carl Worth <cworth@cworth.org> wrote:
> On Thu, 27 Jan 2011 02:17:21 -0700, Thomas Schwinge <thomas@schwinge.name> wrote:
> > +    # Note that in the way we're setting it above and using it below,
> > +    # `additional_headers' will also serve as the header / body separator
> > +    # (empty line in between).

> I'd even prefer to have the newline explicitly in the HERE document, but
> it's awkward to avoid having the "extra" newline at the end of
> ${additional_headers} the way I'm constructing it incrementally. So just
> documenting the current approach is probably best for now.

Matches my thoughts :-) -- and as it occurs to me right now, doing it in
one here document should be possible like this, if additional_headers is
changed to have the newline *at the beginning* of the string:

    cat <<EOF >"$gen_msg_filename"
    From: ${template[from]}
    To: ${template[to]}
    Message-Id: <${gen_msg_id}>
    Subject: ${template[subject]}
    Date: ${template[date]}${additional_headers}
    
    ${template[body]}
    EOF

Or, of course, we could split the here document: base header,
conditionally (if set at all) additional_headers, new line, body.

If you'd like me to prepare (and test) any of these, please tell.


Grüße,
 Thomas


PS: Didn't know you'd be doing a presentation of notmuch at LCA2011 -- I
saw your announcement on the IRC channel (re live stream) what it was too
late already.  But then, it would have been a rather inconvenient time /
timezone anyways, being based in Germany.  So, how has it been?

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH] Clarify usage of `additional_headers' in test/test-lib.sh:generate_message.

[Carl Worth]

[-- Attachment #1: Type: text/plain, Size: 2080 bytes --]

On Fri, 28 Jan 2011 08:45:35 +0100, Thomas Schwinge <thomas@schwinge.name> wrote:
> Matches my thoughts :-) -- and as it occurs to me right now, doing it in
> one here document should be possible like this, if additional_headers is
> changed to have the newline *at the beginning* of the string:
...
>     Date: ${template[date]}${additional_headers}
>     
>     ${template[body]}

That looks quite reasonable. I hadn't thought of that one myself.

> If you'd like me to prepare (and test) any of these, please tell.

Please feel free! I would appreciate it.

> PS: Didn't know you'd be doing a presentation of notmuch at LCA2011 -- I
> saw your announcement on the IRC channel (re live stream) what it was too
> late already.  But then, it would have been a rather inconvenient time /
> timezone anyways, being based in Germany.  So, how has it been?

I probably could have done a better job of letting people know that I
would be giving a talk. But then again, there wasn't that much in the
talk that people who read this list regularly don't already know[*].

For anyone interested, a video of the talk should be appearing on
http://linux.conf.au at some point.

The talk went fairly well, I think. But I spent a bit too much at the
beginning just explaining why we need notmuch, so I didn't have enough
time at the end to really show off notmuch well. And I didn't have the
demonstration portions of the talk as rehearsed as I should have, so
some parts of it were not smooth.

Ah well, I'll get better for the next talk.

-Carl

[*] Then again, Eric works right next to me two days a week and uses
exclusively notmuch for email; as we were attending the conference
together this week I mentioned two features in conversation with others
and he said, "What!? Notmuch can do that?! That's awesome". So that was
fun.

I think the two features were tab completion of tag names (which is a
really old feature by now) and the display of an error message if a pipe
fails (which is a fairly new feature).

-- 
carl.d.worth@intel.com

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]