1 Return-Path: <bremner@tethera.net>
\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 BBC60429E25
\r
6 for <notmuch@notmuchmail.org>; Sat, 29 Oct 2011 13:55:36 -0700 (PDT)
\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 wEqwfUhoKrEU for <notmuch@notmuchmail.org>;
\r
16 Sat, 29 Oct 2011 13:55:36 -0700 (PDT)
\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 10CFB431FB6
\r
21 for <notmuch@notmuchmail.org>; Sat, 29 Oct 2011 13:55:35 -0700 (PDT)
\r
22 Received: from zancas.localnet
\r
23 (fctnnbsc36w-156034064058.pppoe-dynamic.High-Speed.nb.bellaliant.net
\r
24 [156.34.64.58]) (authenticated bits=0)
\r
25 by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p9TKtOTT012113
\r
26 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);
\r
27 Sat, 29 Oct 2011 17:55:25 -0300
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.76)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1RKFw4-0005zn-5U; Sat, 29 Oct 2011 17:55:24 -0300
\r
31 From: David Bremner <david@tethera.net>
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH] docs: man, online help,
\r
34 and NEWS updated for notmuch restore --match
\r
35 Date: Sat, 29 Oct 2011 17:55:15 -0300
\r
36 Message-Id: <1319921715-23010-1-git-send-email-david@tethera.net>
\r
37 X-Mailer: git-send-email 1.7.6.3
\r
38 In-Reply-To: <1319857491-12298-5-git-send-email-david@tethera.net>
\r
39 References: <1319857491-12298-5-git-send-email-david@tethera.net>
\r
40 Cc: David Bremner <bremner@debian.org>
\r
41 X-BeenThere: notmuch@notmuchmail.org
\r
42 X-Mailman-Version: 2.1.13
\r
44 List-Id: "Use and development of the notmuch mail system."
\r
45 <notmuch.notmuchmail.org>
\r
46 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
48 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
49 List-Post: <mailto:notmuch@notmuchmail.org>
\r
50 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
51 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
53 X-List-Received-Date: Sat, 29 Oct 2011 20:55:36 -0000
\r
55 From: David Bremner <bremner@debian.org>
\r
57 I also reformatted the notmuch restore --accumulate docs to make it
\r
58 work better with multiple options.
\r
60 Better late docs than no docs...
\r
61 also pushed to branch nmbug on git://pivot.cs.unb.ca/notmuch.git
\r
63 NEWS | 12 ++++++++----
\r
64 notmuch.1 | 19 +++++++++++++++++--
\r
65 notmuch.c | 14 +++++++++++---
\r
66 3 files changed, 36 insertions(+), 9 deletions(-)
\r
68 diff --git a/NEWS b/NEWS
\r
69 index e00452a..9034d5c 100644
\r
72 @@ -4,11 +4,15 @@ Notmuch 0.10 (2011-xx-xx)
\r
73 New command-line features
\r
74 -------------------------
\r
76 -Add "notmuch restore --accumulate" option
\r
77 +Add "--accumulate" and "--match" options to "notmuch restore".
\r
79 - The --accumulate switch causes the union of the existing and new tags to be
\r
80 - applied, instead of replacing each message's tags as they are read in from
\r
82 + The "--accumulate" switch causes the union of the existing and new
\r
83 + tags to be applied, instead of replacing each message's tags as they
\r
84 + are read in from the dump file.
\r
86 + The "--match=<regex>" option restricts the restore operation to tags
\r
87 + matching the regular expression regex. One potential application is
\r
88 + the implementation of namespaces for tags.
\r
90 Add search terms to "notmuch dump"
\r
92 diff --git a/notmuch.1 b/notmuch.1
\r
93 index bba479e..57b2062 100644
\r
96 @@ -480,7 +480,7 @@ section below for details of the supported syntax for <search-terms>.
\r
100 -.BR restore " [--accumulate] [<filename>]"
\r
101 +.BR restore " [--accumulate] [--match=<regex>] [<filename>]"
\r
103 Restores the tags from the given file (see
\r
104 .BR "notmuch dump" ")."
\r
105 @@ -494,10 +494,25 @@ So if you've previously been using sup for mail, then the
\r
106 command provides you a way to import all of your tags (or labels as
\r
109 -The --accumulate switch causes the union of the existing and new tags to be
\r
110 +Supported options for
\r
115 +.BR \-\-accumulate
\r
116 +The union of the existing and new tags is
\r
117 applied, instead of replacing each message's tags as they are read in from the
\r
122 +.BR \-\-match=<regex>
\r
123 +add or delete only tags matching
\r
125 +Other tags in the input (or the database) are ignored.
\r
132 diff --git a/notmuch.c b/notmuch.c
\r
133 index e004c6c..3a51fee 100644
\r
136 @@ -401,9 +401,17 @@ static command_t commands[] = {
\r
137 "\tSo if you've previously been using sup for mail, then the\n"
\r
138 "\t\"notmuch restore\" command provides you a way to import\n"
\r
139 "\tall of your tags (or labels as sup calls them).\n"
\r
140 - "\tThe --accumulate switch causes the union of the existing and new\n"
\r
141 - "\ttags to be applied, instead of replacing each message's tags as\n"
\r
142 - "\tthey are read in from the dump file."},
\r
143 + "\tSupported options for restore include\n"
\r
145 + "\t --accumulate\n"
\r
146 + "\t The union of the existing and new tags is applied, instead of\n"
\r
147 + "\t replacing each message's tags as they are read in from the\n"
\r
148 + "\t dump file.\n"
\r
150 + "\t --match=<regex>\n"
\r
151 + "\t Add or delete only tags matching <regex>. Other tags in the\n"
\r
152 + "\t input (or the database) are ignored.\n"
\r
154 { "config", notmuch_config_command,
\r
155 "[get|set] <section>.<item> [value ...]",
\r
156 "Get or set settings in the notmuch configuration file.",
\r