1 Return-Path: <amdragon@mit.edu>
\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 28AD8431FC3
\r
6 for <notmuch@notmuchmail.org>; Sun, 30 Dec 2012 22:42:55 -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 Gru7nVWGMBCd for <notmuch@notmuchmail.org>;
\r
16 Sun, 30 Dec 2012 22:42:53 -0800 (PST)
\r
17 Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id BBE8F431FAF
\r
20 for <notmuch@notmuchmail.org>; Sun, 30 Dec 2012 22:42:52 -0800 (PST)
\r
21 X-AuditID: 12074422-b7f616d000000e7c-31-50e133ec8b70
\r
22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])
\r
23 by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id 96.D2.03708.CE331E05; Mon, 31 Dec 2012 01:42:52 -0500 (EST)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id qBV6goBA028411;
\r
27 Mon, 31 Dec 2012 01:42:50 -0500
\r
28 Received: from drake.dyndns.org (c-76-21-105-205.hsd1.ca.comcast.net
\r
29 [76.21.105.205]) (authenticated bits=0)
\r
30 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBV6glis009883
\r
32 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
33 Mon, 31 Dec 2012 01:42:49 -0500 (EST)
\r
34 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)
\r
35 (envelope-from <amdragon@mit.edu>)
\r
36 id 1TpZ5C-0000in-9F; Mon, 31 Dec 2012 01:42:46 -0500
\r
37 From: Austin Clements <amdragon@MIT.EDU>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH v4 5/5] man: Update notmuch-dump(1) and notmuch-restore(1)
\r
40 Date: Mon, 31 Dec 2012 01:42:42 -0500
\r
41 Message-Id: <1356936162-2589-6-git-send-email-amdragon@mit.edu>
\r
42 X-Mailer: git-send-email 1.7.10.4
\r
43 In-Reply-To: <1356936162-2589-1-git-send-email-amdragon@mit.edu>
\r
44 References: <1356936162-2589-1-git-send-email-amdragon@mit.edu>
\r
45 X-Brightmail-Tracker:
\r
46 H4sIAAAAAAAAA+NgFnrOIsWRmVeSWpSXmKPExsUixCmqrPvG+GGAwcb/vBY3WrsZLZqmO1us
\r
47 nstjcf3mTGaLNyvnsTqweuycdZfd4/DXhSwet+6/Zvd4tuoWs8eWQ++ZA1ijuGxSUnMyy1KL
\r
48 9O0SuDLuXjrOUrBTsGLKoRamBsaNfF2MnBwSAiYSe+7cYIawxSQu3FvP1sXIxSEksI9R4sX1
\r
49 GcwQzgZGiSMPH0FlLjJJrL00E8qZyyixe/sJRpB+NgENiW37l4PZIgLSEjvvzmYFKWIWaGKU
\r
50 uLZpLhtIQljAS6LrxSd2EJtFQFXiUuNzVhCbV8Be4vynBVCHKEp0P5sAVs8p4CCx89ksFhBb
\r
51 CKhm997zjBMY+RcwMqxilE3JrdLNTczMKU5N1i1OTszLSy3SNdXLzSzRS00p3cQICkN2F6Ud
\r
52 jD8PKh1iFOBgVOLh3fD/QYAQa2JZcWXuIUZJDiYlUV4vg4cBQnxJ+SmVGYnFGfFFpTmpxYcY
\r
53 JTiYlUR432oB5XhTEiurUovyYVLSHCxK4rzXUm76CwmkJ5akZqemFqQWwWRlODiUJHitjIAa
\r
54 BYtS01Mr0jJzShDSTBycIMN5gIbbgNTwFhck5hZnpkPkTzHqcjS8vPGUUYglLz8vVUqc1xik
\r
55 SACkKKM0D24OLH28YhQHekuYVxKkigeYeuAmvQJawgS0RIvhAciSkkSElFQDo39+/Onb72/Z
\r
56 vgk/tmXZVh/3NLb71vy2cSu/u05t1jc09Vip9dH96pnD0wVe87ek1nUvOmd8YeWqa/wa026t
\r
57 iXx4+NW7mol516Q7Oi031/TGmlWw3l10U/THzAU1szv1tBin9OXadnpZSz3SlFoaH+p2+d2R
\r
58 KRc9rN4INTBKzllYsS2hJbuYX4mlOCPRUIu5qDgRAEotscj6AgAA
\r
59 Cc: tomi.ollila@iki.fi
\r
60 X-BeenThere: notmuch@notmuchmail.org
\r
61 X-Mailman-Version: 2.1.13
\r
63 List-Id: "Use and development of the notmuch mail system."
\r
64 <notmuch.notmuchmail.org>
\r
65 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
66 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
67 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
68 List-Post: <mailto:notmuch@notmuchmail.org>
\r
69 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
70 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
71 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
72 X-List-Received-Date: Mon, 31 Dec 2012 06:42:55 -0000
\r
74 Describe the new batch-tag format. For notmuch-restore, rather than
\r
75 half-heartedly duplicating the description, we now cite notmuch-dump.
\r
77 man/man1/notmuch-dump.1 | 11 +++++++----
\r
78 man/man1/notmuch-restore.1 | 6 ++----
\r
79 2 files changed, 9 insertions(+), 8 deletions(-)
\r
81 diff --git a/man/man1/notmuch-dump.1 b/man/man1/notmuch-dump.1
\r
82 index 770b00f..7bd6def 100644
\r
83 --- a/man/man1/notmuch-dump.1
\r
84 +++ b/man/man1/notmuch-dump.1
\r
85 @@ -64,13 +64,16 @@ and tags containing whitespace or non-\fBascii\fR(7) characters.
\r
86 Each line has the form
\r
89 -.RI "+<" "encoded-tag" "> " "" "+<" "encoded-tag" "> ... -- " "" " id:<" encoded-message-id >
\r
90 +.RI "+<" "encoded-tag" "> " "" "+<" "encoded-tag" "> ... -- " "" " id:<" quoted-message-id >
\r
92 -where encoded means that every byte not matching the regex
\r
93 +Tags are hex-encoded by replacing every byte not matching the regex
\r
94 .B [A-Za-z0-9@=.,_+-]
\r
98 -where nn is the two digit hex encoding.
\r
99 +where nn is the two digit hex encoding. The message ID is a valid Xapian
\r
100 +query, quoted using Xapian boolean term quoting rules: if the ID contains
\r
101 +whitespace or a close paren or starts with a double quote, it must be
\r
102 +enclosed in double quotes and double quotes inside the ID must be doubled.
\r
103 The astute reader will notice this is a special case of the batch input
\r
104 format for \fBnotmuch-tag\fR(1); note that the single message-id query is
\r
105 mandatory for \fBnotmuch-restore\fR(1).
\r
106 diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1
\r
107 index 6bba628..78fef52 100644
\r
108 --- a/man/man1/notmuch-restore.1
\r
109 +++ b/man/man1/notmuch-restore.1
\r
110 @@ -57,10 +57,8 @@ sup calls them).
\r
113 dump format is intended to more robust against malformed message-ids
\r
114 -and tags containing whitespace or non-\fBascii\fR(7) characters. This
\r
115 -format hex-escapes all characters those outside of a small character
\r
116 -set, intended to be suitable for e.g. pathnames in most UNIX-like
\r
118 +and tags containing whitespace or non-\fBascii\fR(7) characters. See
\r
119 +\fBnotmuch-dump\fR(1) for details on this format.
\r
121 .B "notmuch restore"
\r
122 updates the maildir flags according to tag changes if the
\r