1 Return-Path: <dme@dme.org>
\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 9110A414395
\r
6 for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 05:28:22 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 5hrdxIYpJOOh for <notmuch@notmuchmail.org>;
\r
16 Fri, 13 Jan 2012 05:28:22 -0800 (PST)
\r
17 Received: from mail-we0-f181.google.com (mail-we0-f181.google.com
\r
18 [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 0CD24414393
\r
21 for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 05:28:21 -0800 (PST)
\r
22 Received: by werm13 with SMTP id m13so436286wer.26
\r
23 for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 05:28:20 -0800 (PST)
\r
24 Received: by 10.216.133.142 with SMTP id q14mr393630wei.57.1326461300670;
\r
25 Fri, 13 Jan 2012 05:28:20 -0800 (PST)
\r
26 Received: from hotblack-desiato.hh.sledj.net
\r
27 (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])
\r
28 by mx.google.com with ESMTPS id f19sm11074250wbo.13.2012.01.13.05.28.18
\r
29 (version=TLSv1/SSLv3 cipher=OTHER);
\r
30 Fri, 13 Jan 2012 05:28:19 -0800 (PST)
\r
31 Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)
\r
32 id A90F4A0CED; Fri, 13 Jan 2012 13:28:17 +0000 (GMT)
\r
33 From: David Edmondson <dme@dme.org>
\r
34 To: notmuch@notmuchmail.org
\r
35 Subject: [PATCH 2/2] notmuch-dev: Update the master branch when requested.
\r
36 Date: Fri, 13 Jan 2012 13:28:14 +0000
\r
37 Message-Id: <1326461294-25546-2-git-send-email-dme@dme.org>
\r
38 X-Mailer: git-send-email 1.7.7.3
\r
39 In-Reply-To: <1326461294-25546-1-git-send-email-dme@dme.org>
\r
40 References: <87wr8v23ib.fsf@zancas.localnet>
\r
41 <1326461294-25546-1-git-send-email-dme@dme.org>
\r
42 X-BeenThere: notmuch@notmuchmail.org
\r
43 X-Mailman-Version: 2.1.13
\r
45 List-Id: "Use and development of the notmuch mail system."
\r
46 <notmuch.notmuchmail.org>
\r
47 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
49 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
50 List-Post: <mailto:notmuch@notmuchmail.org>
\r
51 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
52 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
54 X-List-Received-Date: Fri, 13 Jan 2012 13:28:22 -0000
\r
56 If `notmuch-dev-show-review-patch' is called with a prefix argument,
\r
57 pull updates for the 'master' branch of the temporary repository.
\r
59 emacs/notmuch-dev.el | 8 +++++++-
\r
60 1 files changed, 7 insertions(+), 1 deletions(-)
\r
62 diff --git a/emacs/notmuch-dev.el b/emacs/notmuch-dev.el
\r
63 index 465846f..3a15bf4 100644
\r
64 --- a/emacs/notmuch-dev.el
\r
65 +++ b/emacs/notmuch-dev.el
\r
67 (error "git clone failed."))))
\r
69 (defun notmuch-dev-checkout-master ()
\r
70 - (magit-checkout "master"))
\r
71 + (magit-checkout "master")
\r
72 + (when current-prefix-arg
\r
73 + (message "Updating master...")
\r
74 + ;; Don't use `magit-pull' because it runs asynchronously.
\r
75 + (magit-run-git "pull" "-v")
\r
76 + (message "Updating master...done.")))
\r
78 (defun notmuch-dev-delete-branch (name)
\r
79 ;; `magit-delete-branch' uses "-d", which is not sufficiently
\r
81 (let ((default-directory notmuch-dev-temporary-repository-path))
\r
83 (notmuch-dev-checkout-master)
\r
85 ;; Delete the branch if it exists.
\r
87 (notmuch-dev-delete-branch patch-name)
\r