From 3124f565f9b468ff571e6763728e9f86db85929a Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Tue, 29 Oct 2013 22:55:27 +0000 Subject: [PATCH] [PATCH 00/11] Move notmuch-tree to mainline --- fb/8c8878f8e5726dc0783d8cff5ab75fe65225e8 | 151 ++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 fb/8c8878f8e5726dc0783d8cff5ab75fe65225e8 diff --git a/fb/8c8878f8e5726dc0783d8cff5ab75fe65225e8 b/fb/8c8878f8e5726dc0783d8cff5ab75fe65225e8 new file mode 100644 index 000000000..aecbcc5a6 --- /dev/null +++ b/fb/8c8878f8e5726dc0783d8cff5ab75fe65225e8 @@ -0,0 +1,151 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 82A89431FC4 + for ; Tue, 29 Oct 2013 16:01:20 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 2.7 +X-Spam-Level: ** +X-Spam-Status: No, score=2.7 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + FREEMAIL_REPLY=2.499, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id dvo0ZdPXpwNP for ; + Tue, 29 Oct 2013 16:01:16 -0700 (PDT) +Received: from mail-wg0-f54.google.com (mail-wg0-f54.google.com + [74.125.82.54]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + E6CCD431FBC for ; Tue, 29 Oct 2013 16:01:15 -0700 + (PDT) +Received: by mail-wg0-f54.google.com with SMTP id c11so543864wgh.21 + for ; Tue, 29 Oct 2013 16:01:14 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id; + bh=GByB9lb8TsaSCfFvGgwMZaELMcWeJLqBY8ocKoDfipI=; + b=w/Oq3Jbu+Lm4zXjDoL83auzEfNO7XjAL9DuecoVso5vVSPr5kTVln+RXLXyOinWqca + GrQdT/XptWC39Keu8xk0hdQtHXSJcwUmrC9X0aFTiBwGdVTrvvNq9n0jLZSdez9ZX6L3 + +ooiNqwiorMoesw485q9w9B5MlTVSz8uEvza69MhmUZP2UQUDvjjO6BzGfyBwnMFKCpF + tcJnqHKZ1AQOIk9WNMfatQEDabYZrICrf9Chw4aX9T52wiqHoiPH3JTXMx/Ul6ofg7/Q + Fz1zBj67taC/e7aP56fSFQg1AcyRYmHcR1viZCvKRvD2+ROnkRKS+Lt8oMk25QEX8mRe + trYA== +X-Received: by 10.180.211.237 with SMTP id nf13mr48197wic.55.1383087342894; + Tue, 29 Oct 2013 15:55:42 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id y20sm9516400wib.0.2013.10.29.15.55.41 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Tue, 29 Oct 2013 15:55:42 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 00/11] Move notmuch-tree to mainline +Date: Tue, 29 Oct 2013 22:55:27 +0000 +Message-Id: <1383087338-10220-1-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 29 Oct 2013 23:01:20 -0000 + +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 + -- 2.26.2