From 40bf05e836edd2f9a82da3da64305f4d28ebec36 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sun, 20 Oct 2013 09:28:14 +0100 Subject: [PATCH] [PATCH 0/5] Move pick into mainline --- 4d/dc0c632671fe7aece87d9c092f4ae985e41bea | 132 ++++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 4d/dc0c632671fe7aece87d9c092f4ae985e41bea diff --git a/4d/dc0c632671fe7aece87d9c092f4ae985e41bea b/4d/dc0c632671fe7aece87d9c092f4ae985e41bea new file mode 100644 index 000000000..36632b0fc --- /dev/null +++ b/4d/dc0c632671fe7aece87d9c092f4ae985e41bea @@ -0,0 +1,132 @@ +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 6AE4C431FCF + for ; Sun, 20 Oct 2013 01:28:33 -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 Ez4HAlDglKSk for ; + Sun, 20 Oct 2013 01:28:28 -0700 (PDT) +Received: from mail-we0-f171.google.com (mail-we0-f171.google.com + [74.125.82.171]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id C0835431FC7 + for ; Sun, 20 Oct 2013 01:28:27 -0700 (PDT) +Received: by mail-we0-f171.google.com with SMTP id t60so5257282wes.2 + for ; Sun, 20 Oct 2013 01:28:25 -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=K3E6LccTeBs1e9jU0TCukh5x2mzXOoPqhHACjSaIzSg=; + b=l6kTcIiaVtl68auSSwZrD+RWifVkOdakpJMDQlSl8/apGn7EviOlOCl0kpL4GE9oBw + A0nbrtSRNl1yYjdn2D6XDgfvsnD6eL+RqyjNLOrK2XiDjS8w5TVPuzwk9jawq6YO4P6P + sPPci2R2Sc6yn1l9RZzosmaA/v8ztd3OW7v7Tzrim8pASILZWMUZDJX+BK2J//Ylu0yc + q24+ozajZ8qwsBk8mrVyerBVfEOL0qp22/XVAM2X02VzLWOOTFNR0yxsSBQx7oWczv99 + 0tOcQLBL9ARTSAMZjERydz9vP9ahWIcoATwXxceNdgXlI6haKq5tB8EOaCmJKaYqVDGT + /NNA== +X-Received: by 10.194.110.138 with SMTP id ia10mr9211776wjb.3.1382257702613; + Sun, 20 Oct 2013 01:28:22 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id mw9sm44121820wib.0.2013.10.20.01.28.21 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sun, 20 Oct 2013 01:28:22 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 0/5] Move pick into mainline +Date: Sun, 20 Oct 2013 09:28:14 +0100 +Message-Id: <1382257699-29860-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: Sun, 20 Oct 2013 08:28:33 -0000 + +Hello + +I think notmuch-pick is now ready for mainline: it's not perfect but +there are no longer any significant problems in the code (ie nothing +that makes me go yuck!). + +This series just moves pick and the associated tests into +mainline. There are some changes that should follow: for example +moving the key-bindings that pick inserts into other keymaps into the +correct files but I will do this in later series. I have also left the +remnants in the directory contrib/notmuch/pick to be removed in a +later cleanup and a NEWS item will need to be added. + +Pick has been in contrib for almost exactly one year and has seen a +reasonable amount of use (I think) during this time. + +One thing to think about: do we want to keep the name "pick"? If not +then now is the last sensible time to change it. I don't have any +better suggestion however. + +Finally, it would be nice to have +id:1381498794-17000-1-git-send-email-markwalters1009@gmail.com as +well: without the key bindings that pick overrides show up twice in +help. + +Best wishes + +Mark + +Mark Walters (5): + emacs: move pick from contrib into mainline + emacs: add pick to the Makefile + test: move the pick tests to the main test directory + test: add the emacs-pick test to the list of tests + emacs: pick: remove initialisation message + + contrib/notmuch-pick/notmuch-pick.el | 946 -------------------- + contrib/notmuch-pick/test/emacs-pick | 210 ----- + .../pick.expected-output/notmuch-pick-show-window | 40 - + .../notmuch-pick-single-thread | 6 - + .../pick.expected-output/notmuch-pick-tag-inbox | 53 -- + .../notmuch-pick-tag-inbox-tagged | 53 -- + .../notmuch-pick-tag-inbox-thread-tagged | 53 -- + emacs/Makefile.local | 1 + + emacs/notmuch-pick.el | 945 +++++++++++++++++++ + test/emacs-pick | 210 +++++ + test/notmuch-test | 1 + + test/pick.expected-output/notmuch-pick-show-window | 40 + + .../notmuch-pick-single-thread | 6 + + test/pick.expected-output/notmuch-pick-tag-inbox | 53 ++ + .../notmuch-pick-tag-inbox-tagged | 53 ++ + .../notmuch-pick-tag-inbox-thread-tagged | 53 ++ + 16 files changed, 1362 insertions(+), 1361 deletions(-) + delete mode 100644 contrib/notmuch-pick/notmuch-pick.el + delete mode 100755 contrib/notmuch-pick/test/emacs-pick + delete mode 100644 contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-show-window + delete mode 100644 contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-single-thread + delete mode 100644 contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox + delete mode 100644 contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox-tagged + delete mode 100644 contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox-thread-tagged + create mode 100644 emacs/notmuch-pick.el + create mode 100755 test/emacs-pick + create mode 100644 test/pick.expected-output/notmuch-pick-show-window + create mode 100644 test/pick.expected-output/notmuch-pick-single-thread + create mode 100644 test/pick.expected-output/notmuch-pick-tag-inbox + create mode 100644 test/pick.expected-output/notmuch-pick-tag-inbox-tagged + create mode 100644 test/pick.expected-output/notmuch-pick-tag-inbox-thread-tagged + +-- +1.7.9.1 + -- 2.26.2