debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch-dump: remove deprecated positional argument for output file

Browse source 
The syntax --output=filename is a smaller change than deleting the
output argument completely, and conceivably useful e.g. when running
notmuch under a debugger.
This commit is contained in:
David Bremner 2012-08-03 23:23:11 -03:00
parent ddb009519d
commit 760e17488e
4 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
man/man1/notmuch-dump.1
View file

@ -5,15 +5,14 @@ notmuch-dump \- creates a plain-text dump of the tags of each message
.SH SYNOPSIS .SH SYNOPSIS
.B "notmuch dump" .B "notmuch dump"
.RI "[ <" filename "> ] [--]" .RI "[ --output=<" filename "> ] [--]"
.RI "[ <" search-term ">...]" .RI "[ <" search-term ">...]"
.SH DESCRIPTION .SH DESCRIPTION
Dump tags for messages matching the given search terms. Dump tags for messages matching the given search terms.
Output is to the given filename, if any, or to stdout. Note that Output is to the given filename, if any, or to stdout.
using the filename argument is deprecated.
These tags are the only data in the notmuch database that can't be These tags are the only data in the notmuch database that can't be
recreated from the messages themselves. The output of notmuch dump is recreated from the messages themselves. The output of notmuch dump is

3
notmuch-dump.c
View file

@ -44,7 +44,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
int opt_index; int opt_index;
notmuch_opt_desc_t options[] = { notmuch_opt_desc_t options[] = {
{ NOTMUCH_OPT_POSITION, &output_file_name, 0, 0, 0 }, { NOTMUCH_OPT_STRING, &output_file_name, "output", 'o', 0 },
{ 0, 0, 0, 0, 0 } { 0, 0, 0, 0, 0 }
}; };
@ -56,7 +56,6 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
} }
if (output_file_name) { if (output_file_name) {
fprintf (stderr, "Warning: the output file argument of dump is deprecated.\n");
output = fopen (output_file_name, "w"); output = fopen (output_file_name, "w");
if (output == NULL) { if (output == NULL) {
fprintf (stderr, "Error opening %s for writing: %s\n", fprintf (stderr, "Error opening %s for writing: %s\n",

20
test/dump-restore
View file

@ -53,16 +53,12 @@ test_expect_success 'Restore with nothing to do, III' \
test_expect_success 'Invalid restore invocation' \ test_expect_success 'Invalid restore invocation' \
'test_must_fail notmuch restore dump.expected another_one' 'test_must_fail notmuch restore dump.expected another_one'
test_begin_subtest "dump outfile" test_begin_subtest "dump --output=outfile"
notmuch dump dump-outfile.actual notmuch dump --output=dump-outfile.actual
test_expect_equal_file dump.expected dump-outfile.actual test_expect_equal_file dump.expected dump-outfile.actual
test_begin_subtest "dump outfile # deprecated" test_begin_subtest "dump --output=outfile --"
test_expect_equal "Warning: the output file argument of dump is deprecated."\ notmuch dump --output=dump-1-arg-dash.actual --
"$(notmuch dump /dev/null 2>&1)"
test_begin_subtest "dump outfile --"
notmuch dump dump-1-arg-dash.actual --
test_expect_equal_file dump.expected dump-1-arg-dash.actual test_expect_equal_file dump.expected dump-1-arg-dash.actual
# Note, we assume all messages from cworth have a message-id # Note, we assume all messages from cworth have a message-id
@ -74,12 +70,12 @@ test_begin_subtest "dump -- from:cworth"
notmuch dump -- from:cworth > dump-dash-cworth.actual notmuch dump -- from:cworth > dump-dash-cworth.actual
test_expect_equal_file dump-cworth.expected dump-dash-cworth.actual test_expect_equal_file dump-cworth.expected dump-dash-cworth.actual
test_begin_subtest "dump outfile from:cworth" test_begin_subtest "dump --output=outfile from:cworth"
notmuch dump dump-outfile-cworth.actual from:cworth notmuch dump --output=dump-outfile-cworth.actual from:cworth
test_expect_equal_file dump-cworth.expected dump-outfile-cworth.actual test_expect_equal_file dump-cworth.expected dump-outfile-cworth.actual
test_begin_subtest "dump outfile -- from:cworth" test_begin_subtest "dump --output=outfile -- from:cworth"
notmuch dump dump-outfile-dash-inbox.actual -- from:cworth notmuch dump --output=dump-outfile-dash-inbox.actual -- from:cworth
test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual
test_done test_done

2
test/maildir-sync
View file

@ -124,7 +124,7 @@ mv $MAIL_DIR/cur/adding-replied-tag:2,RS $MAIL_DIR/cur/adding-replied-tag:2,S
mv $MAIL_DIR/cur/adding-s-flag:2,S $MAIL_DIR/cur/adding-s-flag:2, mv $MAIL_DIR/cur/adding-s-flag:2,S $MAIL_DIR/cur/adding-s-flag:2,
mv $MAIL_DIR/cur/adding-with-s-flag:2,S $MAIL_DIR/cur/adding-with-s-flag:2,RS mv $MAIL_DIR/cur/adding-with-s-flag:2,S $MAIL_DIR/cur/adding-with-s-flag:2,RS
mv $MAIL_DIR/cur/message-to-move-to-cur:2,S $MAIL_DIR/cur/message-to-move-to-cur:2,DS mv $MAIL_DIR/cur/message-to-move-to-cur:2,S $MAIL_DIR/cur/message-to-move-to-cur:2,DS
notmuch dump dump.txt notmuch dump --output=dump.txt
NOTMUCH_NEW >/dev/null NOTMUCH_NEW >/dev/null
notmuch restore dump.txt notmuch restore dump.txt
output=$(ls $MAIL_DIR/cur) output=$(ls $MAIL_DIR/cur)