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 93EFE431FB6 for ; Fri, 21 Oct 2011 15:21:37 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -2.3 X-Spam-Level: X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_MED=-2.3] 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 0uZiwceM1g3M for ; Fri, 21 Oct 2011 15:21:36 -0700 (PDT) Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id A90D0431FD0 for ; Fri, 21 Oct 2011 15:21:36 -0700 (PDT) Received: from zancas.localnet (fctnnbsc36w-156034064058.pppoe-dynamic.High-Speed.nb.bellaliant.net [156.34.64.58]) (authenticated bits=0) by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p9LMLWeX020090 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Fri, 21 Oct 2011 19:21:33 -0300 Received: from bremner by zancas.localnet with local (Exim 4.76) (envelope-from ) id 1RHNT2-0001wV-2w; Fri, 21 Oct 2011 19:21:32 -0300 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 2/2] docs: Update news, man page, and online help for restore --accumulate Date: Fri, 21 Oct 2011 19:21:14 -0300 Message-Id: <1319235674-7047-2-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.6.3 In-Reply-To: <1319235674-7047-1-git-send-email-david@tethera.net> References: <1319226477-4181-7-git-send-email-david@tethera.net> <1319235674-7047-1-git-send-email-david@tethera.net> Cc: David Bremner 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: Fri, 21 Oct 2011 22:21:37 -0000 From: David Bremner As a side effect, reformat the NEWs entry for notmuch dump for consistency with the notmuch restore NEWS submitted by Thomas Schwinge. --- NEWS | 19 ++++++++++++++----- notmuch.1 | 6 +++++- notmuch.c | 8 ++++++-- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index d4f02d7..e00452a 100644 --- a/NEWS +++ b/NEWS @@ -1,11 +1,20 @@ Notmuch 0.10 (2011-xx-xx) +========================= -notmuch dump changes --------------------- +New command-line features +------------------------- + +Add "notmuch restore --accumulate" option + + The --accumulate switch causes the union of the existing and new tags to be + applied, instead of replacing each message's tags as they are read in from + the dump file. + +Add search terms to "notmuch dump" -The dump command now takes an optional search term much like notmuch -search/show/tag. The output file argument of dump is deprecated in -favour of using stdout. + The dump command now takes an optional search term much like notmuch + search/show/tag. The output file argument of dump is deprecated in + favour of using stdout. Notmuch 0.9 (2011-10-01) ======================== diff --git a/notmuch.1 b/notmuch.1 index 4f864a8..bba479e 100644 --- a/notmuch.1 +++ b/notmuch.1 @@ -480,7 +480,7 @@ section below for details of the supported syntax for . .RE .TP -.BR restore " " +.BR restore " [--accumulate] []" Restores the tags from the given file (see .BR "notmuch dump" ")." @@ -493,6 +493,10 @@ So if you've previously been using sup for mail, then the .B "notmuch restore" command provides you a way to import all of your tags (or labels as sup calls them). + +The --accumulate switch causes the union of the existing and new tags to be +applied, instead of replacing each message's tags as they are read in from the +dump file. .RE The diff --git a/notmuch.c b/notmuch.c index 9c77349..309d750 100644 --- a/notmuch.c +++ b/notmuch.c @@ -393,13 +393,17 @@ static command_t commands[] = { "\tSee \"notmuch help search-terms\" for the search-term syntax.\n" }, { "restore", notmuch_restore_command, - "", + "[--accumulate] []", "Restore the tags from the given dump file (see 'dump').", + "\tInput is read from the given filename, if any, or from stdin.\n" "\tNote: The dump file format is specifically chosen to be\n" "\tcompatible with the format of files produced by sup-dump.\n" "\tSo if you've previously been using sup for mail, then the\n" "\t\"notmuch restore\" command provides you a way to import\n" - "\tall of your tags (or labels as sup calls them)." }, + "\tall of your tags (or labels as sup calls them).\n" + "\tThe --accumulate switch causes the union of the existing and new\n" + "\ttags to be applied, instead of replacing each message's tags as\n" + "\tthey are read in from the dump file."}, { "config", notmuch_config_command, "[get|set]
. [value ...]", "Get or set settings in the notmuch configuration file.", -- 1.7.6.3