From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 7ACE5429E3D for ; Wed, 4 Jan 2012 06:01:27 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[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 1LPjc9LL7l3a for ; Wed, 4 Jan 2012 06:01:23 -0800 (PST) Received: from mail-we0-f181.google.com (mail-we0-f181.google.com [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 91E50431FD0 for ; Wed, 4 Jan 2012 06:01:23 -0800 (PST) Received: by werm12 with SMTP id m12so10884530wer.26 for ; Wed, 04 Jan 2012 06:01:22 -0800 (PST) Received: by 10.216.139.222 with SMTP id c72mr37663113wej.4.1325685682236; Wed, 04 Jan 2012 06:01:22 -0800 (PST) Received: from hotblack-desiato.hh.sledj.net (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25]) by mx.google.com with ESMTPS id 1sm134836224wiz.11.2012.01.04.06.01.20 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 04 Jan 2012 06:01:21 -0800 (PST) Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) id 4C3B9A0334; Wed, 4 Jan 2012 14:01:19 +0000 (GMT) From: David Edmondson To: notmuch@notmuchmail.org Subject: [PATCH] emacs: Helpers for notmuch developers. Date: Wed, 4 Jan 2012 14:01:18 +0000 Message-Id: <1325685678-12710-1-git-send-email-dme@dme.org> X-Mailer: git-send-email 1.7.7.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Wed, 04 Jan 2012 14:01:27 -0000 --- I've been using this for a few days and decided to share it to get feedback. Reviewing patches can be tedious, so I tried to make things a little simpler. To use this, load the file and then from `notmuch-show-mode' invoke `notmuch-dev-show-review-patch'. It assumes that any open messages contain patches and attempts to build a repository with the patches applied. General management (i.e. keeping up to date) of the repository it uses is your responsibility, as is cleaning out old branches. You can, of course, just delete the temporary repository after using it - the code will re-create it next time. If you have a slow network connection then a local copy of the main repository can be specified by changing `notmuch-dev-master-repository'. Comments? emacs/notmuch-dev.el | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) create mode 100644 emacs/notmuch-dev.el diff --git a/emacs/notmuch-dev.el b/emacs/notmuch-dev.el new file mode 100644 index 0000000..63ee490 --- /dev/null +++ b/emacs/notmuch-dev.el @@ -0,0 +1,121 @@ +;; notmuch-dev.el --- help for notmuch developers +;; +;; Copyright © David Edmondson +;; +;; This file is part of Notmuch. +;; +;; Notmuch is free software: you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Notmuch is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Notmuch. If not, see . +;; +;; Authors: David Edmondson + +(require 'notmuch-lib) +(require 'notmuch-show) +(require 'magit) + +(defgroup notmuch-dev nil + "Helpers for notmuch developers." + :group 'notmuch) + +(defcustom notmuch-dev-master-repository "git://notmuchmail.org/git/notmuch" + "The URI of the master notmuch repository." + :group 'notmuch-dev + :type 'string) + +(defcustom notmuch-dev-temporary-directory temporary-file-directory + "A directory in which to place temporary repositories." + :group 'notmuch-dev + :type 'string) + +;; + +(defvar notmuch-dev-temporary-repository-name (concat "notmuch-dev-" (user-login-name)) + "The name of the temporary repository.") + +(defvar notmuch-dev-temporary-repository-path + (file-name-as-directory (file-truename (concat notmuch-dev-temporary-directory "/" + notmuch-dev-temporary-repository-name))) + "The path of the temporary repository.") + +(defun notmuch-dev-make-temporary-repository () + (unless (file-directory-p notmuch-dev-temporary-repository-path) + (message "Cloning %s into %s..." + notmuch-dev-master-repository notmuch-dev-temporary-repository-path) + (magit-run* (list magit-git-executable "clone" + notmuch-dev-master-repository + notmuch-dev-temporary-repository-path)) + + (unless (file-directory-p notmuch-dev-temporary-repository-path) + (error "git clone failed."))) + + ;; Causes us to switch to the magit buffer - is that unfortunate in + ;; some situations? + (magit-status notmuch-dev-temporary-repository-path)) + +(defun notmuch-dev-checkout-master () + (magit-checkout "master")) + +(defun notmuch-dev-delete-branch (name) + (magit-delete-branch name)) + +(defun notmuch-dev-create-branch (name) + ;; Switches to the new branch automatically. + (magit-create-branch name "master")) + +(defun notmuch-dev-title-to-branch (title) + (let* ((s (downcase title)) + (s (replace-regexp-in-string "[ \t]+" "-" s)) + (s (replace-regexp-in-string "[\]\[\":]" "" s)) + (s (replace-regexp-in-string ".$" "" s)) + ) + s)) + +;; + +(defun notmuch-dev-show-review-patch () + "Call this from `notmuch-show-mode'." + (interactive) + + (notmuch-dev-review-patch (notmuch-show-get-subject) + (mapconcat 'identity + (notmuch-show-get-message-ids-for-open-messages) + " | "))) + +(defun notmuch-dev-review-patch (title search-terms) + (let ((patch-name (notmuch-dev-title-to-branch title))) + + (notmuch-dev-make-temporary-repository) + + ;; Switch to the repository directory. + (let ((default-directory notmuch-dev-temporary-repository-path)) + + (notmuch-dev-checkout-master) + ;; Delete the branch if it exists. + (condition-case nil + (notmuch-dev-delete-branch patch-name) + (error nil)) + (notmuch-dev-create-branch patch-name) + + ;; Have notmuch generate mailbox format output for the search + ;; terms and feed that to git-am. + (shell-command + (concat + notmuch-command " show --format=mbox " (shell-quote-argument search-terms) + " | " + "git am --quiet")) + + (magit-status notmuch-dev-temporary-repository-path)))) + +;; + +(provide 'notmuch-dev) -- 1.7.7.3