--- /dev/null
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 82A89431FC4\r
+ for <notmuch@notmuchmail.org>; Tue, 29 Oct 2013 16:01:20 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.7\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.7 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+ FREEMAIL_REPLY=2.499, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id dvo0ZdPXpwNP for <notmuch@notmuchmail.org>;\r
+ Tue, 29 Oct 2013 16:01:16 -0700 (PDT)\r
+Received: from mail-wg0-f54.google.com (mail-wg0-f54.google.com\r
+ [74.125.82.54]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client\r
+ certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
+ E6CCD431FBC for <notmuch@notmuchmail.org>; Tue, 29 Oct 2013 16:01:15 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f54.google.com with SMTP id c11so543864wgh.21\r
+ for <notmuch@notmuchmail.org>; Tue, 29 Oct 2013 16:01:14 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id;\r
+ bh=GByB9lb8TsaSCfFvGgwMZaELMcWeJLqBY8ocKoDfipI=;\r
+ b=w/Oq3Jbu+Lm4zXjDoL83auzEfNO7XjAL9DuecoVso5vVSPr5kTVln+RXLXyOinWqca\r
+ GrQdT/XptWC39Keu8xk0hdQtHXSJcwUmrC9X0aFTiBwGdVTrvvNq9n0jLZSdez9ZX6L3\r
+ +ooiNqwiorMoesw485q9w9B5MlTVSz8uEvza69MhmUZP2UQUDvjjO6BzGfyBwnMFKCpF\r
+ tcJnqHKZ1AQOIk9WNMfatQEDabYZrICrf9Chw4aX9T52wiqHoiPH3JTXMx/Ul6ofg7/Q\r
+ Fz1zBj67taC/e7aP56fSFQg1AcyRYmHcR1viZCvKRvD2+ROnkRKS+Lt8oMk25QEX8mRe\r
+ trYA==\r
+X-Received: by 10.180.211.237 with SMTP id nf13mr48197wic.55.1383087342894;\r
+ Tue, 29 Oct 2013 15:55:42 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+ by mx.google.com with ESMTPSA id y20sm9516400wib.0.2013.10.29.15.55.41\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Tue, 29 Oct 2013 15:55:42 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 00/11] Move notmuch-tree to mainline\r
+Date: Tue, 29 Oct 2013 22:55:27 +0000\r
+Message-Id: <1383087338-10220-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 29 Oct 2013 23:01:20 -0000\r
+\r
+This is a more complete version of the move of pick/tree to\r
+mainline. The previous version was at\r
+id:1382257699-29860-1-git-send-email-markwalters1009@gmail.com\r
+\r
+The previous version did not get the autoloading right: it all worked\r
+on my setup as I had stale files around in my tree which were loaded.\r
+This versions builds and tests pass at each stage on a fresh clone.\r
+\r
+The diffstat at the bottom of this message is huge, so I include the\r
+rather more informative output from git diff -stat -M here.\r
+\r
+Apart from the first patch (which moves 80 lines from notmuch.el to notmuch-lib.el) the total is:\r
+ emacs/Makefile.local | 1 +\r
+ emacs/notmuch-lib.el | 1 +\r
+ emacs/notmuch-show.el | 10 ++++\r
+ {contrib/notmuch-pick => emacs}/notmuch-tree.el | 47 ++-----------------\r
+ emacs/notmuch.el | 16 +++++++\r
+ {contrib/notmuch-pick/test => test}/emacs-tree | 13 -----\r
+ test/notmuch-test | 1 +\r
+ .../tree.expected-output/notmuch-tree-show-window | 0\r
+ .../notmuch-tree-single-thread | 0\r
+ .../tree.expected-output/notmuch-tree-tag-inbox | 0\r
+ .../notmuch-tree-tag-inbox-tagged | 0\r
+ .../notmuch-tree-tag-inbox-thread-tagged | 0\r
+ 12 files changed, 34 insertions(+), 55 deletions(-)\r
+\r
+\r
+Obviously this clashes with the remap/help series at\r
+id:1382821479-23384-1-git-send-email-markwalters1009@gmail.com but\r
+rebasing either way would be easy.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+\r
+\r
+\r
+Mark Walters (11):\r
+ emacs: move notmuch-help to lib\r
+ emacs: tree: remove unneeded declarations\r
+ emacs: move notmuch-tree from contrib to mainline\r
+ emacs: add tree to the makefile\r
+ test: move emacs-tree test into mainline\r
+ emacs: tree: remove test for emacs from tree test\r
+ emacs: minimal change to autoload notmuch-tree\r
+ test: tree: remove require from tests\r
+ emacs: move search based tree functions to notmuch.el\r
+ emacs: add z to common keymap\r
+ emacs: move the show entry to tree into show.el\r
+\r
+ contrib/notmuch-pick/notmuch-tree.el | 951 --------------------\r
+ contrib/notmuch-pick/test/emacs-tree | 210 -----\r
+ .../tree.expected-output/notmuch-tree-show-window | 40 -\r
+ .../notmuch-tree-single-thread | 6 -\r
+ .../tree.expected-output/notmuch-tree-tag-inbox | 53 --\r
+ .../notmuch-tree-tag-inbox-tagged | 53 --\r
+ .../notmuch-tree-tag-inbox-thread-tagged | 53 --\r
+ emacs/Makefile.local | 1 +\r
+ emacs/notmuch-lib.el | 88 ++\r
+ emacs/notmuch-show.el | 10 +\r
+ emacs/notmuch-tree.el | 914 +++++++++++++++++++\r
+ emacs/notmuch.el | 103 +--\r
+ test/emacs-tree | 197 ++++\r
+ test/notmuch-test | 1 +\r
+ test/tree.expected-output/notmuch-tree-show-window | 40 +\r
+ .../notmuch-tree-single-thread | 6 +\r
+ test/tree.expected-output/notmuch-tree-tag-inbox | 53 ++\r
+ .../notmuch-tree-tag-inbox-tagged | 53 ++\r
+ .../notmuch-tree-tag-inbox-thread-tagged | 53 ++\r
+ 19 files changed, 1432 insertions(+), 1453 deletions(-)\r
+ delete mode 100644 contrib/notmuch-pick/notmuch-tree.el\r
+ delete mode 100755 contrib/notmuch-pick/test/emacs-tree\r
+ delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-show-window\r
+ delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-single-thread\r
+ delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox\r
+ delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-tagged\r
+ delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged\r
+ create mode 100644 emacs/notmuch-tree.el\r
+ create mode 100755 test/emacs-tree\r
+ create mode 100644 test/tree.expected-output/notmuch-tree-show-window\r
+ create mode 100644 test/tree.expected-output/notmuch-tree-single-thread\r
+ create mode 100644 test/tree.expected-output/notmuch-tree-tag-inbox\r
+ create mode 100644 test/tree.expected-output/notmuch-tree-tag-inbox-tagged\r
+ create mode 100644 test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged\r
+\r
+-- \r
+1.7.9.1\r
+\r
projects / notmuch-archives.git / commitdiff