From: Felix Geller <fgeller@gmail.com>
To: Jameson Graef Rollins <jrollins@finestructure.net>,
 notmuch@notmuchmail.org
Subject: Re: [PATCH] Emacs: Add variable to toggle message indentation in a
	thread
In-Reply-To: <87aackwzf6.fsf@servo.factory.finestructure.net>
References: <m2r55xi4yr.fsf@gmail.com>
	<87aackwzf6.fsf@servo.factory.finestructure.net>
User-Agent: Emacs/23.3.1 (x86_64-apple-darwin10.7.0)
Date: Wed, 13 Jul 2011 01:46:24 +0200
Message-ID: <m2ipr7nju7.fsf@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
	micalg=pgp-sha1; protocol="application/pgp-signature"
Precedence: list

--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="

--=-=-=
Content-Transfer-Encoding: quoted-printable

On Mon, 11 Jul 2011 09:32:45 -0700, Jameson Graef Rollins <jrollins@finestr=
ucture.net> wrote:

> On Mon, 11 Jul 2011 10:42:04 +0200, Felix Geller <fgeller@gmail.com> wrot=
e:
> > I added a variable to toggle message indentation in Emacs.
>=20
> Hi, Felix.  Thanks for submitting this patch.  I think it's a good idea.
> I have a couple of comments below, a couple of which echo what Dmitry
> has already pointed out.
>=20
> > diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
>=20
> This patch doesn't include a commit log, which is something we generally
> require.  The preferred way to send patches is with git format-patch or
> send-email, both of which format patches in such a way that they can be
> immediately applied to a git repo, including with the commit log.

Ok, tried again :)=20

I attached two commits. One that includes the changes (which have most
comments incorporated, only that I stick to when rather than if) and one
that includes a test. I still can't run the tests myself, I attached an
excerpt of what errors come up for the emacs subset, so I haven't tested
the test itself :( However, it is a simple copy of an existing one, but
I use a let to change the value of the new variable and adapted one of
the existing expected outputs to lack indentation. I'd be grateful if
someone could test it...

Didn't know about format-patch, thanks :)=20


Cheers,
Felix


>
>=20
> > +(defcustom notmuch-show-indent-messages-in-thread nil
> > +  "Should the messages in a thread be indented according to their resp=
ective depth in the thread?"
> > +  :group 'notmuch
> > +  :type 'boolean)
>=20
> I agres with Dmitry that this should default to 't', to be consistent
> with the current default behavior.
>=20
> > -    (insert (notmuch-show-spaces-n depth)
> > +    (insert (if notmuch-show-indent-messages-in-thread
> > +		(notmuch-show-spaces-n depth)
> > +	      "")
>=20
> I also agree with Dmitry's suggestion here to use the following slightly
> simpler construct:
>=20
>  (if notmuch-show-indent-messages-in-thread
>      (insert (notmuch-show-spaces-n depth)))
>=20
> Finally, as Dmitry also points out, you'll almost certainly need to
> construct a test for this feature, since it constitutes a pretty big
> formatting change.  It should probably test for both cases of the
> customization variable.  Check out the tests in tests/emacs for
> guidance.
>=20
> hth.
>=20
> jamie.
Non-text part: application/pgp-signature


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment;
 filename=0001-Added-variable-to-toggle-message-indendation-in-Emac.patch
Content-Transfer-Encoding: quoted-printable

From=2094570ada2eae1ff1a1feebbda5dff04d223da6b4 Mon Sep 17 00:00:00 2001
From: Felix Geller <fgeller@gmail.com>
Date: Wed, 13 Jul 2011 01:30:51 +0200
Subject: [PATCH 1/2] Added variable to toggle message indendation in Emacs'
 notmuch-show

=2D--
 emacs/notmuch-show.el |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index f96743b..48df4c5 100644
=2D-- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -90,6 +90,11 @@ any given message."
   :group 'notmuch
   :type 'boolean)
=20
+(defcustom notmuch-show-indent-messages-in-thread t
+  "Should messages be indented according to their depth in a thread?"
+  :group 'notmuch
+  :type 'boolean)
+
 (defcustom notmuch-show-indent-multipart nil
   "Should the sub-parts of a multipart/* part be indented?"
   ;; dme: Not sure which is a good default.
@@ -237,8 +242,9 @@ unchanged ADDRESS if parsing fails."
   "Insert a notmuch style headerline based on HEADERS for a
 message at DEPTH in the current thread."
   (let ((start (point)))
=2D    (insert (notmuch-show-spaces-n depth)
=2D	    (notmuch-show-clean-address (plist-get headers :From))
+    (when notmuch-show-indent-messages-in-thread
+      (insert (notmuch-show-spaces-n depth)))
+    (insert (notmuch-show-clean-address (plist-get headers :From))
 	    " ("
 	    date
 	    ") ("
@@ -733,7 +739,8 @@ current buffer, if possible."
     (setq content-end (point-marker))
=20
     ;; Indent according to the depth in the thread.
=2D    (indent-rigidly content-start content-end depth)
+    (when notmuch-show-indent-messages-in-thread
+      (indent-rigidly content-start content-end depth))
=20
     (setq message-end (point-max-marker))
=20
=2D-=20
1.7.6


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment;
 filename=0002-Test-for-toggling-message-indentation.patch
Content-Transfer-Encoding: quoted-printable

From=20016ee41930eed6b53e10c35c62c40fa6bb35b79e Mon Sep 17 00:00:00 2001
From: Felix Geller <fgeller@gmail.com>
Date: Wed, 13 Jul 2011 01:32:14 +0200
Subject: [PATCH 2/2] Test for toggling message indentation

=2D--
 test/emacs                                         |    7 +
 ...show-thread-maildir-storage-without-indentation |  215 ++++++++++++++++=
++++
 2 files changed, 222 insertions(+), 0 deletions(-)
 create mode 100644 test/emacs.expected-output/notmuch-show-thread-maildir-=
storage-without-indentation

diff --git a/test/emacs b/test/emacs
index 53f455a..c65d6d8 100755
=2D-- a/test/emacs
+++ b/test/emacs
@@ -55,6 +55,13 @@ test_emacs "(notmuch-show \"$maildir_storage_thread\")
 	    (test-output)"
 test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
=20
+test_begin_subtest "Basic notmuch-show view in emacs without indentation"
+maildir_storage_thread=3D$(notmuch search --output=3Dthreads id:2009111719=
0054.GU3165@dottiness.seas.harvard.edu)
+test_emacs "(let ((notmuch-show-indent-messages-in-thread nil))
+	      (notmuch-show \"$maildir_storage_thread\")
+	      (test-output))"
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storag=
e-without-indentation
+
 test_begin_subtest "notmuch-show for message with invalid From"
 add_message "[subject]=3D\"message-with-invalid-from\"" \
 	    "[from]=3D\"\\\"Invalid \\\" From\\\" <test_suite@notmuchmail.org>\""
diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage=
-without-indentation b/test/emacs.expected-output/notmuch-show-thread-maild=
ir-storage-without-indentation
new file mode 100644
index 0000000..cdc8fbd
=2D-- /dev/null
+++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-withou=
t-indentation
@@ -0,0 +1,215 @@
+Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed)
+Subject: [notmuch] Working with Maildir storage?
+To: notmuch@notmuchmail.org
+Date: Tue, 17 Nov 2009 14:00:54 -0500
+
+[ multipart/mixed ]
+[ multipart/signed ]
+[ text/plain ]
+I saw the LWN article and decided to take a look at notmuch.  I'm
+currently using mutt and mairix to index and read a collection of
+Maildir mail folders (around 40,000 messages total).
+
+notmuch indexed the messages without complaint, but my attempt at
+searching bombed out. Running, for example:
+
+  notmuch search storage
+
+Resulted in 4604 lines of errors along the lines of:
+
+  Error opening
+  /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=
=3D3026:2,S:
+  Too many open files
+
+I'm curious if this is expected behavior (i.e., notmuch does not work
+with Maildir) or if something else is going on.
+
+Cheers,
+
+[ 5-line signature. Click/Enter to show. ]
+--=20
+Lars Kellogg-Stedman <lars@seas.harvard.edu>
+Senior Technologist, Computing and Information Technology
+Harvard University School of Engineering and Applied Sciences
+
+[ application/pgp-signature ]
+[ text/plain ]
+[ 4-line signature. Click/Enter to show. ]
+_______________________________________________
+notmuch mailing list
+notmuch@notmuchmail.org
+http://notmuchmail.org/mailman/listinfo/notmuch
+Mikhail Gusarov <dottedmag@dottedmag.net> (2009-11-17) (inbox signed unrea=
d)
+Subject: Re: [notmuch] Working with Maildir storage?
+To: notmuch@notmuchmail.org
+Date: Wed, 18 Nov 2009 01:02:38 +0600
+
+[ multipart/mixed ]
+[ multipart/signed ]
+[ text/plain ]
+
+Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did =
gyre and gimble:
+
+ LK> Resulted in 4604 lines of errors along the lines of:
+
+ LK>   Error opening
+ LK>   /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostn=
ame,U=3D3026:2,S:
+ LK>   Too many open files
+
+See the patch just posted here.
+
+[ 2-line signature. Click/Enter to show. ]
+--=20
+http://fossarchy.blogspot.com/
+[ application/pgp-signature ]
+[ text/plain ]
+[ 4-line signature. Click/Enter to show. ]
+_______________________________________________
+notmuch mailing list
+notmuch@notmuchmail.org
+http://notmuchmail.org/mailman/listinfo/notmuch
+Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed un=
read)
+Subject: Re: [notmuch] Working with Maildir storage?
+To: Mikhail Gusarov <dottedmag@dottedmag.net>
+Cc: notmuch@notmuchmail.org
+Date: Tue, 17 Nov 2009 15:33:01 -0500
+
+[ multipart/mixed ]
+[ multipart/signed ]
+[ text/plain ]
+> See the patch just posted here.
+
+Is the list archived anywhere?  The obvious archives
+(http://notmuchmail.org/pipermail/notmuch/) aren't available, and I
+think I subscribed too late to get the patch (I only just saw the
+discussion about it).
+
+It doesn't look like the patch is in git yet.
+
+-- Lars
+
+[ 5-line signature. Click/Enter to show. ]
+--=20
+Lars Kellogg-Stedman <lars@seas.harvard.edu>
+Senior Technologist, Computing and Information Technology
+Harvard University School of Engineering and Applied Sciences
+
+[ application/pgp-signature ]
+[ text/plain ]
+[ 4-line signature. Click/Enter to show. ]
+_______________________________________________
+notmuch mailing list
+notmuch@notmuchmail.org
+http://notmuchmail.org/mailman/listinfo/notmuch
+ikhail Gusarov <dottedmag@dottedmag.net> (2009-11-17) (inbox unread)
+ubject: [notmuch] Working with Maildir storage?
+o: notmuch@notmuchmail.org
+ate: Wed, 18 Nov 2009 02:50:48 +0600
+
+
+was brillig at 15:33:01 17.11.2009 UTC-05 when lars at seas.harvard.edu di=
d gyre and gimble:
+
+LK> Is the list archived anywhere?  The obvious archives
+LK> (http://notmuchmail.org/pipermail/notmuch/) aren't available, and I
+LK> think I subscribed too late to get the patch (I only just saw the
+LK> discussion about it).
+
+LK> It doesn't look like the patch is in git yet.
+
+ust has been pushed
+
+ 10-line signature. Click/Enter to show. ]
+-=20
+ttp://fossarchy.blogspot.com/
+------------- next part --------------
+ non-text attachment was scrubbed...
+ame: not available
+ype: application/pgp-signature
+ize: 834 bytes
+esc: not available
+RL: <http://notmuchmail.org/pipermail/notmuch/attachments/20091118/0e33d96=
4/attachment.pgp>
+
+eith Packard <keithp@keithp.com> (2009-11-17) (inbox unread)
+ubject: [notmuch] Working with Maildir storage?
+o: notmuch@notmuchmail.org
+ate: Tue, 17 Nov 2009 13:24:13 -0800
+
+n Tue, 17 Nov 2009 15:33:01 -0500, Lars Kellogg-Stedman <lars at seas.harv=
ard.edu> wrote:
+ > See the patch just posted here.
+
+'ve also pushed a slightly more complicated (and complete) fix to my
+rivate notmuch repository
+
+it://keithp.com/git/notmuch
+
+ Is the list archived anywhere?
+
+ops. Looks like Carl's mail server is broken. He's traveling to
+arcelona today and so it won't get fixed for a while.
+
+hanks to everyone for trying out notmuch!
+
+keith
+
+Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-18) (inbox signed un=
read)
+Subject: Re: [notmuch] Working with Maildir storage?
+To: Keith Packard <keithp@keithp.com>
+Cc: notmuch@notmuchmail.org
+Date: Tue, 17 Nov 2009 19:50:40 -0500
+
+[ multipart/mixed ]
+[ multipart/signed ]
+[ text/plain ]
+> I've also pushed a slightly more complicated (and complete) fix to my
+> private notmuch repository
+
+The version of lib/messages.cc in your repo doesn't build because it's
+missing "#include <stdint.h>" (for the uint32_t on line 466).
+
+[ 5-line signature. Click/Enter to show. ]
+--=20
+Lars Kellogg-Stedman <lars@seas.harvard.edu>
+Senior Technologist, Computing and Information Technology
+Harvard University School of Engineering and Applied Sciences
+
+[ application/pgp-signature ]
+[ text/plain ]
+[ 4-line signature. Click/Enter to show. ]
+_______________________________________________
+notmuch mailing list
+notmuch@notmuchmail.org
+http://notmuchmail.org/mailman/listinfo/notmuch
+Carl Worth <cworth@cworth.org> (2009-11-18) (inbox unread)
+Subject: [notmuch] Working with Maildir storage?
+To: notmuch@notmuchmail.org
+Date: Wed, 18 Nov 2009 02:08:10 -0800
+
+On Tue, 17 Nov 2009 14:00:54 -0500, Lars Kellogg-Stedman <lars at seas.har=
vard.edu> wrote:
+> I saw the LWN article and decided to take a look at notmuch.  I'm
+> currently using mutt and mairix to index and read a collection of
+> Maildir mail folders (around 40,000 messages total).
+
+Welcome, Lars!
+
+I hadn't even seen that Keith's blog post had been picked up by lwn.net.
+That's very interesting. So, thanks for coming and trying out notmuch.
+
+>   Error opening
+>   /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname=
,U=3D3026:2,S:
+>   Too many open files
+
+Sadly, the lwn article coincided with me having just introduced this
+bug, and then getting on a Trans-Atlantic flight. So I fixed the bug
+fairly quickly, but there was quite a bit of latency before I could push
+the fix out. It should be fixed now.
+
+> I'm curious if this is expected behavior (i.e., notmuch does not work
+> with Maildir) or if something else is going on.
+
+Notmuch works just fine with maildir---it's one of the things that it
+likes the best.
+
+Happy hacking,
+
+-Carl
+
=2D-=20
1.7.6


--=-=-=--

--==-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.17 (Darwin)

iEYEARECAAYFAk4c3NAACgkQMxgKfMb9y5ahegCeMBevomiTLs71WyhBPyKDwwfL
7zUAoOsusK6uYhUCfsBFpoKkxnNhX9Pt
=X0pR
-----END PGP SIGNATURE-----
--==-=-=--