[PATCH 2/2] notmuch-restore: replace positional argument for input with option

2012-08-04 Thread da...@tethera.net 
From: David Bremner 

Since notmuch dump doesn't use positional arguments anymore, it seems
better to be consistent.
---
 man/man1/notmuch-restore.1 |2 +-
 notmuch-restore.c  |2 +-
 test/dump-restore  |8 
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1
index 18281c7..d0d50dd 100644
--- a/man/man1/notmuch-restore.1
+++ b/man/man1/notmuch-restore.1
@@ -6,7 +6,7 @@ notmuch-restore \- restores the tags from the given file (see 
notmuch dump)

 .B "notmuch restore"
 .RB [ "--accumulate" ]
-.RI "[ <" filename "> ]"
+.RI "[ --input=<" filename "> ]"

 .SH DESCRIPTION

diff --git a/notmuch-restore.c b/notmuch-restore.c
index 4f4096e..08d5adc 100644
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -122,7 +122,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char 
*argv[])
 synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);

 notmuch_opt_desc_t options[] = {
-   { NOTMUCH_OPT_POSITION, _file_name, 0, 0, 0 },
+   { NOTMUCH_OPT_STRING, _file_name, "input", 'i', 0 },
{ NOTMUCH_OPT_BOOLEAN,  , "accumulate", 'a', 0 },
{ 0, 0, 0, 0, 0 }
 };
diff --git a/test/dump-restore b/test/dump-restore
index c7801cf..f25f7cf 100755
--- a/test/dump-restore
+++ b/test/dump-restore
@@ -19,7 +19,7 @@ test_expect_success 'Dumping all tags II' \

 test_expect_success 'Clearing all tags' \
   'sed -e "s/(\([^(]*\))$/()/" < dump.expected > clear.expected &&
-  notmuch restore clear.expected &&
+  notmuch restore --input=clear.expected &&
   notmuch dump > clear.actual &&
   test_cmp clear.expected clear.actual'

@@ -30,7 +30,7 @@ test_expect_success 'Accumulate original tags' \
   test_cmp dump-ABC_DEF.expected dump.actual'

 test_expect_success 'Restoring original tags' \
-  'notmuch restore dump.expected &&
+  'notmuch restore --input=dump.expected &&
   notmuch dump > dump.actual &&
   test_cmp dump.expected dump.actual'

@@ -40,7 +40,7 @@ test_expect_success 'Restore with nothing to do' \
   test_cmp dump.expected dump.actual'

 test_expect_success 'Restore with nothing to do, II' \
-  'notmuch restore --accumulate dump.expected &&
+  'notmuch restore --accumulate --input=dump.expected &&
   notmuch dump > dump.actual &&
   test_cmp dump.expected dump.actual'

@@ -51,7 +51,7 @@ test_expect_success 'Restore with nothing to do, III' \

 # notmuch restore currently only considers the first argument.
 test_expect_success 'Invalid restore invocation' \
-  'test_must_fail notmuch restore dump.expected another_one'
+  'test_must_fail notmuch restore --input=dump.expected another_one'

 test_begin_subtest "dump --output=outfile"
 notmuch dump --output=dump-outfile.actual
-- 
1.7.10.4

[PATCH 2/2] notmuch-restore: replace positional argument for input with option

2012-08-03 Thread david 
From: David Bremner brem...@debian.org

Since notmuch dump doesn't use positional arguments anymore, it seems
better to be consistent.
---
 man/man1/notmuch-restore.1 |2 +-
 notmuch-restore.c  |2 +-
 test/dump-restore  |8 
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1
index 18281c7..d0d50dd 100644
--- a/man/man1/notmuch-restore.1
+++ b/man/man1/notmuch-restore.1
@@ -6,7 +6,7 @@ notmuch-restore \- restores the tags from the given file (see 
notmuch dump)
 
 .B notmuch restore
 .RB [ --accumulate ]
-.RI [  filename  ]
+.RI [ --input= filename  ]
 
 .SH DESCRIPTION
 
diff --git a/notmuch-restore.c b/notmuch-restore.c
index 4f4096e..08d5adc 100644
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -122,7 +122,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char 
*argv[])
 synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);
 
 notmuch_opt_desc_t options[] = {
-   { NOTMUCH_OPT_POSITION, input_file_name, 0, 0, 0 },
+   { NOTMUCH_OPT_STRING, input_file_name, input, 'i', 0 },
{ NOTMUCH_OPT_BOOLEAN,  accumulate, accumulate, 'a', 0 },
{ 0, 0, 0, 0, 0 }
 };
diff --git a/test/dump-restore b/test/dump-restore
index c7801cf..f25f7cf 100755
--- a/test/dump-restore
+++ b/test/dump-restore
@@ -19,7 +19,7 @@ test_expect_success 'Dumping all tags II' \
 
 test_expect_success 'Clearing all tags' \
   'sed -e s/(\([^(]*\))$/()/  dump.expected  clear.expected 
-  notmuch restore clear.expected 
+  notmuch restore --input=clear.expected 
   notmuch dump  clear.actual 
   test_cmp clear.expected clear.actual'
 
@@ -30,7 +30,7 @@ test_expect_success 'Accumulate original tags' \
   test_cmp dump-ABC_DEF.expected dump.actual'
 
 test_expect_success 'Restoring original tags' \
-  'notmuch restore dump.expected 
+  'notmuch restore --input=dump.expected 
   notmuch dump  dump.actual 
   test_cmp dump.expected dump.actual'
 
@@ -40,7 +40,7 @@ test_expect_success 'Restore with nothing to do' \
   test_cmp dump.expected dump.actual'
 
 test_expect_success 'Restore with nothing to do, II' \
-  'notmuch restore --accumulate dump.expected 
+  'notmuch restore --accumulate --input=dump.expected 
   notmuch dump  dump.actual 
   test_cmp dump.expected dump.actual'
 
@@ -51,7 +51,7 @@ test_expect_success 'Restore with nothing to do, III' \
 
 # notmuch restore currently only considers the first argument.
 test_expect_success 'Invalid restore invocation' \
-  'test_must_fail notmuch restore dump.expected another_one'
+  'test_must_fail notmuch restore --input=dump.expected another_one'
 
 test_begin_subtest dump --output=outfile
 notmuch dump --output=dump-outfile.actual
-- 
1.7.10.4

___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch