1 Return-Path: <bremner@unb.ca>
\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 4A673431FD0
\r
6 for <notmuch@notmuchmail.org>; Mon, 9 Jan 2012 02:38:59 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id u1HL8bH3MYDo for <notmuch@notmuchmail.org>;
\r
16 Mon, 9 Jan 2012 02:38:58 -0800 (PST)
\r
17 Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])
\r
18 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 6B63A431FB6
\r
21 for <notmuch@notmuchmail.org>; Mon, 9 Jan 2012 02:38:58 -0800 (PST)
\r
22 Received: from zancas.localnet
\r
23 (fctnnbsc36w-156034072155.pppoe-dynamic.High-Speed.nb.bellaliant.net
\r
24 [156.34.72.155]) (authenticated bits=0)
\r
25 by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id q09AcsbF015720
\r
26 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);
\r
27 Mon, 9 Jan 2012 06:38:55 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.77)
\r
29 (envelope-from <bremner@unb.ca>)
\r
30 id 1RkCcw-0007t8-Gx; Mon, 09 Jan 2012 06:38:54 -0400
\r
31 From: David Bremner <david@tethera.net>
\r
32 To: David Edmondson <dme@dme.org>, notmuch@notmuchmail.org
\r
33 Subject: Re: [PATCH v2] emacs: Helpers for notmuch developers.
\r
34 In-Reply-To: <cunboqd1dye.fsf@hotblack-desiato.hh.sledj.net>
\r
35 References: <1325685678-12710-1-git-send-email-dme@dme.org>
\r
36 <1325844199-1812-1-git-send-email-dme@dme.org>
\r
37 <87lipjk9t9.fsf@zancas.localnet>
\r
38 <cunboqd1dye.fsf@hotblack-desiato.hh.sledj.net>
\r
39 User-Agent: Notmuch/0.10.2+167~g5f51512 (http://notmuchmail.org) Emacs/23.3.1
\r
40 (x86_64-pc-linux-gnu)
\r
41 Date: Mon, 09 Jan 2012 06:38:54 -0400
\r
42 Message-ID: <87mx9xw475.fsf@zancas.localnet>
\r
44 Content-Type: text/plain; charset=us-ascii
\r
45 X-BeenThere: notmuch@notmuchmail.org
\r
46 X-Mailman-Version: 2.1.13
\r
48 List-Id: "Use and development of the notmuch mail system."
\r
49 <notmuch.notmuchmail.org>
\r
50 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
51 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
52 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
53 List-Post: <mailto:notmuch@notmuchmail.org>
\r
54 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
55 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
56 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
57 X-List-Received-Date: Mon, 09 Jan 2012 10:38:59 -0000
\r
59 On Mon, 09 Jan 2012 08:23:53 +0000, David Edmondson <dme@dme.org> wrote:
\r
60 > On Sat, 07 Jan 2012 07:53:54 -0400, David Bremner <david@tethera.net> wrote:
\r
61 > > On Fri, 6 Jan 2012 10:03:19 +0000, David Edmondson <dme@dme.org> wrote:
\r
64 > > > - Prefix the branch name with 'review/'
\r
65 > > > - Avoid `shell-command', which also results in better error reporting
\r
66 > > > when 'git-am' fails.
\r
69 > > One thing I noticed is that reviewing a patch for the second time fails
\r
70 > > because the branch already exists. I'm not sure if this is covered under
\r
71 > > "upkeep of the repo" but it is a little inconvenient.
\r
73 > Oh. It's supposed to delete the existing branch. It did in my test. What
\r
76 FWIW, I loaded notmuch-dev.el on top of current master.
\r
78 The magit buffer shows
\r
80 $ git --no-pager checkout -b review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results master
\r
81 fatal: A branch named 'review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results' already exists.
\r
85 signal(error ("Git failed"))
\r
87 magit-run*(("git" "--no-pager" "checkout" "-b" "review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results" "master"))
\r
88 #[nil "\303\304
\b B\n\"!\207" [magit-git-executable magit-git-standard-options args magit-run* append] 4]()
\r
89 magit-refresh-wrapper(#[nil "\303\304
\b B\n\"!\207" [magit-git-executable magit-git-standard-options args magit-run* append] 4])
\r
90 magit-run-git("checkout" "-b" "review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results" "master")
\r
91 magit-create-branch("review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results" "master")
\r
92 notmuch-dev-create-branch("review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results")
\r
93 (let ((default-directory notmuch-dev-temporary-repository-path)) (notmuch-dev-checkout-master) (condition-case nil (notmuch-dev-delete-branch patch-name) (error nil)) (notmuch-dev-create-branch patch-name) (with-temp-file mbox-path (erase-buffer) (call-process notmuch-command nil t nil "show" "--format=mbox" search-terms)) (magit-run* (list magit-git-executable "am" mbox-path)) (magit-status notmuch-dev-temporary-repository-path))
\r
94 (let ((patch-name ...) (mbox-path ...)) (notmuch-dev-make-temporary-repository) (let (...) (notmuch-dev-checkout-master) (condition-case nil ... ...) (notmuch-dev-create-branch patch-name) (with-temp-file mbox-path ... ...) (magit-run* ...) (magit-status notmuch-dev-temporary-repository-path)))
\r
95 notmuch-dev-review-patch("[PATCH] emacs: Don't signal an error when reaching the end of the search results." "id:\"1324370714-28545-1-git-send-email-dme@dme.org\"")
\r
96 notmuch-dev-show-review-patch()
\r
97 call-interactively(notmuch-dev-show-review-patch t nil)
\r
98 execute-extended-command(nil)
\r
99 call-interactively(execute-extended-command nil nil)
\r