[PATCH 00/11] Move notmuch-tree to mainline

[Mark Walters]

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