From: David Bremner <david@tethera.net>
Date: Sat, 1 Apr 2017 12:36:34 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.25_rc0~85
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=33e58021958f8069ad46d7bd05cf586676fb6ae7;hp=-c

Merge branch 'release'

Final 0.24.1 release
---

33e58021958f8069ad46d7bd05cf586676fb6ae7
diff --combined notmuch-client.h
index 7a674873,e8f17250..a6f70eae
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@@ -83,6 -83,7 +83,6 @@@ typedef struct notmuch_show_params 
      notmuch_bool_t entire_thread;
      notmuch_bool_t omit_excluded;
      notmuch_bool_t output_body;
 -    notmuch_bool_t raw;
      int part;
      notmuch_crypto_t crypto;
      notmuch_bool_t include_html;
@@@ -469,7 -470,7 +469,7 @@@ typedef enum dump_includes 
  
  #define DUMP_INCLUDE_DEFAULT (DUMP_INCLUDE_TAGS | DUMP_INCLUDE_CONFIG | DUMP_INCLUDE_PROPERTIES)
  
- #define NOTMUCH_DUMP_VERSION 2
+ #define NOTMUCH_DUMP_VERSION 3
  
  int
  notmuch_database_dump (notmuch_database_t *notmuch,
diff --combined notmuch-dump.c
index 0cbcdc16,0bb946f8..e451ac0c
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@@ -84,7 -84,7 +84,7 @@@ print_dump_header (gzFile output, int o
  	sep = ",";
      }
      if (include & DUMP_INCLUDE_TAGS) {
- 	gzprintf (output, "%sproperties", sep);
+ 	gzprintf (output, "%stags", sep);
      }
      gzputs (output, "\n");
  }
@@@ -240,7 -240,7 +240,7 @@@ database_dump_file (notmuch_database_t 
       */
      notmuch_query_set_sort (query, NOTMUCH_SORT_UNSORTED);
  
 -    status = notmuch_query_search_messages_st (query, &messages);
 +    status = notmuch_query_search_messages (query, &messages);
      if (print_status_query ("notmuch dump", query, status))
  	return EXIT_FAILURE;
  
diff --combined test/T240-dump-restore.sh
index f626a19e,d45c9f87..1f1f0866
--- a/test/T240-dump-restore.sh
+++ b/test/T240-dump-restore.sh
@@@ -4,66 -4,59 +4,65 @@@ test_description="\"notmuch dump\" and 
  
  NOTMUCH_NEW > /dev/null
  test_begin_subtest "dump header"
- test_subtest_known_broken
  cat <<EOF > EXPECTED
- #notmuch-dump batch-tag:2 config,properties,tags
+ #notmuch-dump batch-tag:3 config,properties,tags
  EOF
  notmuch dump > OUTPUT
  test_expect_equal_file EXPECTED OUTPUT
  add_email_corpus
  
 -test_expect_success 'Dumping all tags' \
 -  'generate_message &&
 -  notmuch new &&
 -  notmuch dump > dump.expected'
 +test_begin_subtest "Dumping all tags"
 +test_expect_success 'generate_message && notmuch new && notmuch dump > dump.expected'
  
  # The use of from:cworth is rather arbitrary: it matches some of the
  # email corpus' messages, but not all of them.
  
 -test_expect_success 'Dumping all tags II' \
 +test_begin_subtest "Dumping all tags II"
 +test_expect_success \
    'notmuch tag +ABC +DEF -- from:cworth &&
    notmuch dump > dump-ABC_DEF.expected &&
    ! cmp dump.expected dump-ABC_DEF.expected'
  
 -test_expect_success 'Clearing all tags' \
 +test_begin_subtest "Clearing all tags"
 +test_expect_success \
    'sed -e "s/(\([^(]*\))$/()/" < dump.expected > clear.expected &&
    notmuch restore --input=clear.expected &&
    notmuch dump > clear.actual &&
    test_cmp clear.expected clear.actual'
  
 -test_expect_success 'Accumulate original tags' \
 +test_begin_subtest "Clearing all tags"
 +test_expect_success \
    'notmuch tag +ABC +DEF -- from:cworth &&
    notmuch restore --accumulate < dump.expected &&
    notmuch dump > dump.actual &&
    test_cmp dump-ABC_DEF.expected dump.actual'
  
 -test_expect_success 'Restoring original tags' \
 +test_begin_subtest "Restoring original tags"
 +test_expect_success \
    'notmuch restore --input=dump.expected &&
    notmuch dump > dump.actual &&
    test_cmp dump.expected dump.actual'
  
 -test_expect_success 'Restore with nothing to do' \
 +test_begin_subtest "Restore with nothing to do"
 +test_expect_success \
    'notmuch restore < dump.expected &&
    notmuch dump > dump.actual &&
    test_cmp dump.expected dump.actual'
  
 -test_expect_success 'Accumulate with existing tags' \
 +test_begin_subtest "Accumulate with existing tags"
 +test_expect_success \
    'notmuch restore --accumulate --input=dump.expected &&
    notmuch dump > dump.actual &&
    test_cmp dump.expected dump.actual'
  
 -test_expect_success 'Accumulate with no tags' \
 +test_begin_subtest "Accumulate with no tags"
 +test_expect_success \
    'notmuch restore --accumulate < clear.expected &&
    notmuch dump > dump.actual &&
    test_cmp dump.expected dump.actual'
  
 -test_expect_success 'Accumulate with new tags' \
 +test_begin_subtest "Accumulate with new tags"
 +test_expect_success \
    'notmuch restore --input=dump.expected &&
    notmuch restore --accumulate --input=dump-ABC_DEF.expected &&
    notmuch dump >  OUTPUT.$test_count &&
@@@ -71,8 -64,7 +70,8 @@@
    test_cmp dump-ABC_DEF.expected OUTPUT.$test_count'
  
  # notmuch restore currently only considers the first argument.
 -test_expect_success 'Invalid restore invocation' \
 +test_begin_subtest "Invalid restore invocation"
 +test_expect_success \
    'test_must_fail notmuch restore --input=dump.expected another_one'
  
  test_begin_subtest "dump --output=outfile"