From: Mark Walters <markwalters1009@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH 00/11] Move notmuch-tree to mainline
Date: Tue, 29 Oct 2013 22:55:27 +0000 [thread overview]
Message-ID: <1383087338-10220-1-git-send-email-markwalters1009@gmail.com> (raw)
This is a more complete version of the move of pick/tree to
mainline. The previous version was at
id:1382257699-29860-1-git-send-email-markwalters1009@gmail.com
The previous version did not get the autoloading right: it all worked
on my setup as I had stale files around in my tree which were loaded.
This versions builds and tests pass at each stage on a fresh clone.
The diffstat at the bottom of this message is huge, so I include the
rather more informative output from git diff -stat -M here.
Apart from the first patch (which moves 80 lines from notmuch.el to notmuch-lib.el) the total is:
emacs/Makefile.local | 1 +
emacs/notmuch-lib.el | 1 +
emacs/notmuch-show.el | 10 ++++
{contrib/notmuch-pick => emacs}/notmuch-tree.el | 47 ++-----------------
emacs/notmuch.el | 16 +++++++
{contrib/notmuch-pick/test => test}/emacs-tree | 13 -----
test/notmuch-test | 1 +
.../tree.expected-output/notmuch-tree-show-window | 0
.../notmuch-tree-single-thread | 0
.../tree.expected-output/notmuch-tree-tag-inbox | 0
.../notmuch-tree-tag-inbox-tagged | 0
.../notmuch-tree-tag-inbox-thread-tagged | 0
12 files changed, 34 insertions(+), 55 deletions(-)
Obviously this clashes with the remap/help series at
id:1382821479-23384-1-git-send-email-markwalters1009@gmail.com but
rebasing either way would be easy.
Best wishes
Mark
Mark Walters (11):
emacs: move notmuch-help to lib
emacs: tree: remove unneeded declarations
emacs: move notmuch-tree from contrib to mainline
emacs: add tree to the makefile
test: move emacs-tree test into mainline
emacs: tree: remove test for emacs from tree test
emacs: minimal change to autoload notmuch-tree
test: tree: remove require from tests
emacs: move search based tree functions to notmuch.el
emacs: add z to common keymap
emacs: move the show entry to tree into show.el
contrib/notmuch-pick/notmuch-tree.el | 951 --------------------
contrib/notmuch-pick/test/emacs-tree | 210 -----
.../tree.expected-output/notmuch-tree-show-window | 40 -
.../notmuch-tree-single-thread | 6 -
.../tree.expected-output/notmuch-tree-tag-inbox | 53 --
.../notmuch-tree-tag-inbox-tagged | 53 --
.../notmuch-tree-tag-inbox-thread-tagged | 53 --
emacs/Makefile.local | 1 +
emacs/notmuch-lib.el | 88 ++
emacs/notmuch-show.el | 10 +
emacs/notmuch-tree.el | 914 +++++++++++++++++++
emacs/notmuch.el | 103 +--
test/emacs-tree | 197 ++++
test/notmuch-test | 1 +
test/tree.expected-output/notmuch-tree-show-window | 40 +
.../notmuch-tree-single-thread | 6 +
test/tree.expected-output/notmuch-tree-tag-inbox | 53 ++
.../notmuch-tree-tag-inbox-tagged | 53 ++
.../notmuch-tree-tag-inbox-thread-tagged | 53 ++
19 files changed, 1432 insertions(+), 1453 deletions(-)
delete mode 100644 contrib/notmuch-pick/notmuch-tree.el
delete mode 100755 contrib/notmuch-pick/test/emacs-tree
delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-show-window
delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-single-thread
delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox
delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-tagged
delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged
create mode 100644 emacs/notmuch-tree.el
create mode 100755 test/emacs-tree
create mode 100644 test/tree.expected-output/notmuch-tree-show-window
create mode 100644 test/tree.expected-output/notmuch-tree-single-thread
create mode 100644 test/tree.expected-output/notmuch-tree-tag-inbox
create mode 100644 test/tree.expected-output/notmuch-tree-tag-inbox-tagged
create mode 100644 test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged
--
1.7.9.1
next reply other threads:[~2013-10-29 23:01 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-29 22:55 Mark Walters [this message]
2013-10-29 22:55 ` [PATCH 01/11] emacs: move notmuch-help to lib Mark Walters
2013-10-29 22:55 ` [PATCH 02/11] emacs: tree: remove unneeded declarations Mark Walters
2013-10-29 22:55 ` [PATCH 03/11] emacs: move notmuch-tree from contrib to mainline Mark Walters
2013-10-29 22:55 ` [PATCH 04/11] emacs: add tree to the makefile Mark Walters
2013-10-29 22:55 ` [PATCH 05/11] test: move emacs-tree test into mainline Mark Walters
2013-10-29 22:55 ` [PATCH 06/11] emacs: tree: remove test for emacs from tree test Mark Walters
2013-10-29 22:55 ` [PATCH 07/11] emacs: minimal change to autoload notmuch-tree Mark Walters
2013-10-29 22:55 ` [PATCH 08/11] test: tree: remove require from tests Mark Walters
2013-10-29 22:55 ` [PATCH 09/11] emacs: move search based tree functions to notmuch.el Mark Walters
2013-10-29 22:55 ` [PATCH 10/11] emacs: add z to common keymap Mark Walters
2013-10-29 22:55 ` [PATCH 11/11] emacs: move the show entry to tree into show.el Mark Walters
2013-10-30 18:01 ` [PATCH 00/11] Move notmuch-tree to mainline Tomi Ollila
2013-10-30 18:48 ` Mark Walters
2013-11-01 9:23 ` [PATCH v2 7-11] Fix commit messages Mark Walters
2013-11-01 9:23 ` [PATCH v2 7/11] emacs: minimal change to load notmuch-tree by default Mark Walters
2013-11-01 9:23 ` [PATCH v2 8/11] test: tree: remove require from tests Mark Walters
2013-11-01 9:23 ` [PATCH v2 9/11] emacs: move search based tree functions to notmuch.el Mark Walters
2013-11-01 9:23 ` [PATCH v2 10/11] emacs: add z to common keymap Mark Walters
2013-11-01 9:23 ` [PATCH v2 11/11] emacs: move the show entry to tree into show.el Mark Walters
2013-11-01 12:04 ` [PATCH v2 7-11] Fix commit messages Tomi Ollila
2013-11-07 12:20 ` [PATCH 00/11] Move notmuch-tree to mainline David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1383087338-10220-1-git-send-email-markwalters1009@gmail.com \
--to=markwalters1009@gmail.com \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).