fb/8c8878f8e5726dc0783d8cff5ab75fe65225e8

   1 Return-Path: <markwalters1009@gmail.com>\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 82A89431FC4\r
   6         for <notmuch@notmuchmail.org>; Tue, 29 Oct 2013 16:01:20 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 2.7\r
  10 X-Spam-Level: **\r
  11 X-Spam-Status: No, score=2.7 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
  14         FREEMAIL_REPLY=2.499, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  15 Received: from olra.theworths.org ([127.0.0.1])\r
  16         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  17         with ESMTP id dvo0ZdPXpwNP for <notmuch@notmuchmail.org>;\r
  18         Tue, 29 Oct 2013 16:01:16 -0700 (PDT)\r
  19 Received: from mail-wg0-f54.google.com (mail-wg0-f54.google.com\r
  20  [74.125.82.54])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
  21  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
  22  E6CCD431FBC    for <notmuch@notmuchmail.org>; Tue, 29 Oct 2013 16:01:15 -0700\r
  23  (PDT)\r
  24 Received: by mail-wg0-f54.google.com with SMTP id c11so543864wgh.21\r
  25         for <notmuch@notmuchmail.org>; Tue, 29 Oct 2013 16:01:14 -0700 (PDT)\r
  26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
  27         h=from:to:cc:subject:date:message-id;\r
  28         bh=GByB9lb8TsaSCfFvGgwMZaELMcWeJLqBY8ocKoDfipI=;\r
  29         b=w/Oq3Jbu+Lm4zXjDoL83auzEfNO7XjAL9DuecoVso5vVSPr5kTVln+RXLXyOinWqca\r
  30         GrQdT/XptWC39Keu8xk0hdQtHXSJcwUmrC9X0aFTiBwGdVTrvvNq9n0jLZSdez9ZX6L3\r
  31         +ooiNqwiorMoesw485q9w9B5MlTVSz8uEvza69MhmUZP2UQUDvjjO6BzGfyBwnMFKCpF\r
  32         tcJnqHKZ1AQOIk9WNMfatQEDabYZrICrf9Chw4aX9T52wiqHoiPH3JTXMx/Ul6ofg7/Q\r
  33         Fz1zBj67taC/e7aP56fSFQg1AcyRYmHcR1viZCvKRvD2+ROnkRKS+Lt8oMk25QEX8mRe\r
  34         trYA==\r
  35 X-Received: by 10.180.211.237 with SMTP id nf13mr48197wic.55.1383087342894;\r
  36         Tue, 29 Oct 2013 15:55:42 -0700 (PDT)\r
  37 Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
  38         by mx.google.com with ESMTPSA id y20sm9516400wib.0.2013.10.29.15.55.41\r
  39         for <multiple recipients>\r
  40         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  41         Tue, 29 Oct 2013 15:55:42 -0700 (PDT)\r
  42 From: Mark Walters <markwalters1009@gmail.com>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH 00/11] Move notmuch-tree to mainline\r
  45 Date: Tue, 29 Oct 2013 22:55:27 +0000\r
  46 Message-Id: <1383087338-10220-1-git-send-email-markwalters1009@gmail.com>\r
  47 X-Mailer: git-send-email 1.7.9.1\r
  48 X-BeenThere: notmuch@notmuchmail.org\r
  49 X-Mailman-Version: 2.1.13\r
  50 Precedence: list\r
  51 List-Id: "Use and development of the notmuch mail system."\r
  52         <notmuch.notmuchmail.org>\r
  53 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  54         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  55 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  56 List-Post: <mailto:notmuch@notmuchmail.org>\r
  57 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  58 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  59         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  60 X-List-Received-Date: Tue, 29 Oct 2013 23:01:20 -0000\r
  61 \r
  62 This is a more complete version of the move of pick/tree to\r
  63 mainline. The previous version was at\r
  64 id:1382257699-29860-1-git-send-email-markwalters1009@gmail.com\r
  65 \r
  66 The previous version did not get the autoloading right: it all worked\r
  67 on my setup as I had stale files around in my tree which were loaded.\r
  68 This versions builds and tests pass at each stage on a fresh clone.\r
  69 \r
  70 The diffstat at the bottom of this message is huge, so I include the\r
  71 rather more informative output from git diff -stat -M here.\r
  72 \r
  73 Apart from the first patch (which moves 80 lines from notmuch.el to notmuch-lib.el) the total is:\r
  74  emacs/Makefile.local                               |    1 +\r
  75  emacs/notmuch-lib.el                               |    1 +\r
  76  emacs/notmuch-show.el                              |   10 ++++\r
  77  {contrib/notmuch-pick => emacs}/notmuch-tree.el    |   47 ++-----------------\r
  78  emacs/notmuch.el                                   |   16 +++++++\r
  79  {contrib/notmuch-pick/test => test}/emacs-tree     |   13 -----\r
  80  test/notmuch-test                                  |    1 +\r
  81  .../tree.expected-output/notmuch-tree-show-window  |    0\r
  82  .../notmuch-tree-single-thread                     |    0\r
  83  .../tree.expected-output/notmuch-tree-tag-inbox    |    0\r
  84  .../notmuch-tree-tag-inbox-tagged                  |    0\r
  85  .../notmuch-tree-tag-inbox-thread-tagged           |    0\r
  86  12 files changed, 34 insertions(+), 55 deletions(-)\r
  87 \r
  88 \r
  89 Obviously this clashes with the remap/help series at\r
  90 id:1382821479-23384-1-git-send-email-markwalters1009@gmail.com but\r
  91 rebasing either way would be easy.\r
  92 \r
  93 Best wishes\r
  94 \r
  95 Mark\r
  96 \r
  97 \r
  98 \r
  99 \r
 100 \r
 101 Mark Walters (11):\r
 102   emacs: move notmuch-help to lib\r
 103   emacs: tree: remove unneeded declarations\r
 104   emacs: move notmuch-tree from contrib to mainline\r
 105   emacs: add tree to the makefile\r
 106   test: move emacs-tree test into mainline\r
 107   emacs: tree: remove test for emacs from tree test\r
 108   emacs: minimal change to autoload notmuch-tree\r
 109   test: tree: remove require from tests\r
 110   emacs: move search based tree functions to notmuch.el\r
 111   emacs: add z to common keymap\r
 112   emacs: move the show entry to tree into show.el\r
 113 \r
 114  contrib/notmuch-pick/notmuch-tree.el               |  951 --------------------\r
 115  contrib/notmuch-pick/test/emacs-tree               |  210 -----\r
 116  .../tree.expected-output/notmuch-tree-show-window  |   40 -\r
 117  .../notmuch-tree-single-thread                     |    6 -\r
 118  .../tree.expected-output/notmuch-tree-tag-inbox    |   53 --\r
 119  .../notmuch-tree-tag-inbox-tagged                  |   53 --\r
 120  .../notmuch-tree-tag-inbox-thread-tagged           |   53 --\r
 121  emacs/Makefile.local                               |    1 +\r
 122  emacs/notmuch-lib.el                               |   88 ++\r
 123  emacs/notmuch-show.el                              |   10 +\r
 124  emacs/notmuch-tree.el                              |  914 +++++++++++++++++++\r
 125  emacs/notmuch.el                                   |  103 +--\r
 126  test/emacs-tree                                    |  197 ++++\r
 127  test/notmuch-test                                  |    1 +\r
 128  test/tree.expected-output/notmuch-tree-show-window |   40 +\r
 129  .../notmuch-tree-single-thread                     |    6 +\r
 130  test/tree.expected-output/notmuch-tree-tag-inbox   |   53 ++\r
 131  .../notmuch-tree-tag-inbox-tagged                  |   53 ++\r
 132  .../notmuch-tree-tag-inbox-thread-tagged           |   53 ++\r
 133  19 files changed, 1432 insertions(+), 1453 deletions(-)\r
 134  delete mode 100644 contrib/notmuch-pick/notmuch-tree.el\r
 135  delete mode 100755 contrib/notmuch-pick/test/emacs-tree\r
 136  delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-show-window\r
 137  delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-single-thread\r
 138  delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox\r
 139  delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-tagged\r
 140  delete mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged\r
 141  create mode 100644 emacs/notmuch-tree.el\r
 142  create mode 100755 test/emacs-tree\r
 143  create mode 100644 test/tree.expected-output/notmuch-tree-show-window\r
 144  create mode 100644 test/tree.expected-output/notmuch-tree-single-thread\r
 145  create mode 100644 test/tree.expected-output/notmuch-tree-tag-inbox\r
 146  create mode 100644 test/tree.expected-output/notmuch-tree-tag-inbox-tagged\r
 147  create mode 100644 test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged\r
 148 \r
 149 -- \r
 150 1.7.9.1\r
 151 \r