1 Return-Path: <tomi.ollila@iki.fi>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 58730431FD6
\r
6 for <notmuch@notmuchmail.org>; Wed, 30 Oct 2013 11:02:08 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id dUX81p3ZL+sp for <notmuch@notmuchmail.org>;
\r
16 Wed, 30 Oct 2013 11:02:00 -0700 (PDT)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by olra.theworths.org (Postfix) with ESMTP id BBB60431FCF
\r
19 for <notmuch@notmuchmail.org>; Wed, 30 Oct 2013 11:01:59 -0700 (PDT)
\r
20 Received: from guru.guru-group.fi (localhost [IPv6:::1])
\r
21 by guru.guru-group.fi (Postfix) with ESMTP id 7E11C1000B2;
\r
22 Wed, 30 Oct 2013 20:01:51 +0200 (EET)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org
\r
25 Subject: Re: [PATCH 00/11] Move notmuch-tree to mainline
\r
26 In-Reply-To: <1383087338-10220-1-git-send-email-markwalters1009@gmail.com>
\r
27 References: <1383087338-10220-1-git-send-email-markwalters1009@gmail.com>
\r
28 User-Agent: Notmuch/0.16+119~g219c55f (http://notmuchmail.org) Emacs/24.3.1
\r
29 (x86_64-unknown-linux-gnu)
\r
30 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
31 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
32 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
33 Date: Wed, 30 Oct 2013 20:01:51 +0200
\r
34 Message-ID: <m2bo26eiy8.fsf@guru.guru-group.fi>
\r
36 Content-Type: text/plain
\r
37 X-BeenThere: notmuch@notmuchmail.org
\r
38 X-Mailman-Version: 2.1.13
\r
40 List-Id: "Use and development of the notmuch mail system."
\r
41 <notmuch.notmuchmail.org>
\r
42 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
44 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
45 List-Post: <mailto:notmuch@notmuchmail.org>
\r
46 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
47 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
49 X-List-Received-Date: Wed, 30 Oct 2013 18:02:08 -0000
\r
51 On Wed, Oct 30 2013, Mark Walters <markwalters1009@gmail.com> wrote:
\r
53 > This is a more complete version of the move of pick/tree to
\r
54 > mainline. The previous version was at
\r
55 > id:1382257699-29860-1-git-send-email-markwalters1009@gmail.com
\r
57 This series looks pretty good to me. IMO patches 1-6 are ready...
\r
59 > The previous version did not get the autoloading right: it all worked
\r
60 > on my setup as I had stale files around in my tree which were loaded.
\r
61 > This versions builds and tests pass at each stage on a fresh clone.
\r
63 You and Me seem to have different understanding what "autoload"ing means.
\r
64 To me autoloading means using (autoload ...) function. In patch 7
\r
65 ( id:1383087338-10220-8-git-send-email-markwalters1009@gmail.com )
\r
66 (require 'notmuch-tree) is used.
\r
68 To me it is fine if this approach is taken, but then calling it autoloading
\r
69 in commit message (in patches 7 and 8) is confusing.
\r
71 However, if (autoload ...) syntax were actually used, it could be done
\r
72 the somewhat the following way:
\r
74 * Don't add (require 'notmuch-tree) in notmuch.el (Patch 7)
\r
76 * Add (autoload 'notmuch-tree-from-search-current-query "notmuch-tree" "docstring" t)
\r
77 to notmuch.el (maybe we can live without declare-function ?)
\r
79 * Add (autoload 'notmuch-tree "notmuch-tree" "docstring" t) to
\r
82 * Now Patch 9 is good as it is now.
\r
84 * Don't move the functions mentioned in Patch 9 from notmuch-tree.el to
\r
85 notmuch.el but write autoload (for notmuch-tree-from-search-thread) to
\r
88 * Now Patch 10 is good as it is now.
\r
90 * Leave notmuch-tree-from-show-current-query in notmuch-tree.el, and add
\r
91 autoload for it in notmuch-show.el. Now you can also drop
\r
92 (declare-function notmuch-tree ...) out from notmuch-show.el (Patch 11).
\r
98 > The diffstat at the bottom of this message is huge, so I include the
\r
99 > rather more informative output from git diff -stat -M here.
\r
101 > Apart from the first patch (which moves 80 lines from notmuch.el to notmuch-lib.el) the total is:
\r
102 > emacs/Makefile.local | 1 +
\r
103 > emacs/notmuch-lib.el | 1 +
\r
104 > emacs/notmuch-show.el | 10 ++++
\r
105 > {contrib/notmuch-pick => emacs}/notmuch-tree.el | 47 ++-----------------
\r
106 > emacs/notmuch.el | 16 +++++++
\r
107 > {contrib/notmuch-pick/test => test}/emacs-tree | 13 -----
\r
108 > test/notmuch-test | 1 +
\r
109 > .../tree.expected-output/notmuch-tree-show-window | 0
\r
110 > .../notmuch-tree-single-thread | 0
\r
111 > .../tree.expected-output/notmuch-tree-tag-inbox | 0
\r
112 > .../notmuch-tree-tag-inbox-tagged | 0
\r
113 > .../notmuch-tree-tag-inbox-thread-tagged | 0
\r
114 > 12 files changed, 34 insertions(+), 55 deletions(-)
\r
117 > Obviously this clashes with the remap/help series at
\r
118 > id:1382821479-23384-1-git-send-email-markwalters1009@gmail.com but
\r
119 > rebasing either way would be easy.
\r
129 > Mark Walters (11):
\r
130 > emacs: move notmuch-help to lib
\r
131 > emacs: tree: remove unneeded declarations
\r
132 > emacs: move notmuch-tree from contrib to mainline
\r
133 > emacs: add tree to the makefile
\r
134 > test: move emacs-tree test into mainline
\r
135 > emacs: tree: remove test for emacs from tree test
\r
136 > emacs: minimal change to autoload notmuch-tree
\r
137 > test: tree: remove require from tests
\r
138 > emacs: move search based tree functions to notmuch.el
\r
139 > emacs: add z to common keymap
\r
140 > emacs: move the show entry to tree into show.el
\r
142 > contrib/notmuch-pick/notmuch-tree.el | 951 --------------------
\r
143 > contrib/notmuch-pick/test/emacs-tree | 210 -----
\r
144 > .../tree.expected-output/notmuch-tree-show-window | 40 -
\r
145 > .../notmuch-tree-single-thread | 6 -
\r
146 > .../tree.expected-output/notmuch-tree-tag-inbox | 53 --
\r
147 > .../notmuch-tree-tag-inbox-tagged | 53 --
\r
148 > .../notmuch-tree-tag-inbox-thread-tagged | 53 --
\r
149 > emacs/Makefile.local | 1 +
\r
150 > emacs/notmuch-lib.el | 88 ++
\r
151 > emacs/notmuch-show.el | 10 +
\r
152 > emacs/notmuch-tree.el | 914 +++++++++++++++++++
\r
153 > emacs/notmuch.el | 103 +--
\r
154 > test/emacs-tree | 197 ++++
\r
155 > test/notmuch-test | 1 +
\r
156 > test/tree.expected-output/notmuch-tree-show-window | 40 +
\r
157 > .../notmuch-tree-single-thread | 6 +
\r
158 > test/tree.expected-output/notmuch-tree-tag-inbox | 53 ++
\r
159 > .../notmuch-tree-tag-inbox-tagged | 53 ++
\r
160 > .../notmuch-tree-tag-inbox-thread-tagged | 53 ++
\r
161 > 19 files changed, 1432 insertions(+), 1453 deletions(-)
\r
162 > delete mode 100644 contrib/notmuch-pick/notmuch-tree.el
\r
163 > delete mode 100755 contrib/notmuch-pick/test/emacs-tree
\r
164 > delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-show-window
\r
165 > delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-single-thread
\r
166 > delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox
\r
167 > delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-tagged
\r
168 > delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged
\r
169 > create mode 100644 emacs/notmuch-tree.el
\r
170 > create mode 100755 test/emacs-tree
\r
171 > create mode 100644 test/tree.expected-output/notmuch-tree-show-window
\r
172 > create mode 100644 test/tree.expected-output/notmuch-tree-single-thread
\r
173 > create mode 100644 test/tree.expected-output/notmuch-tree-tag-inbox
\r
174 > create mode 100644 test/tree.expected-output/notmuch-tree-tag-inbox-tagged
\r
175 > create mode 100644 test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged
\r
180 > _______________________________________________
\r
181 > notmuch mailing list
\r
182 > notmuch@notmuchmail.org
\r
183 > http://notmuchmail.org/mailman/listinfo/notmuch
\r