a1/3c6b55ecec205452b9606b4e8bfc8bbbc5298b

   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 6650F431FBC\r
   6         for <notmuch@notmuchmail.org>; Sat, 26 Jul 2014 20:53:24 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -2.3\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_MED=-2.3] 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 rfQOEFh3JKhu for <notmuch@notmuchmail.org>;\r
  16         Sat, 26 Jul 2014 20:53:18 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-6.mit.edu (dmz-mailsec-scanner-6.mit.edu\r
  18         [18.7.68.35])\r
  19         (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id B2C68431FC7\r
  22         for <notmuch@notmuchmail.org>; Sat, 26 Jul 2014 20:53:07 -0700 (PDT)\r
  23 X-AuditID: 12074423-f79bf6d000007580-df-53d477a053f4\r
  24 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  25         (using TLS with cipher AES256-SHA (256/256 bits))\r
  26         (Client did not present a certificate)\r
  27         by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
  28         id 3D.64.30080.0A774D35; Sat, 26 Jul 2014 23:53:04 -0400 (EDT)\r
  29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  30         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id s6R3r3ba008825; \r
  31         Sat, 26 Jul 2014 23:53:04 -0400\r
  32 Received: from drake.dyndns.org\r
  33         (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  34         [216.15.114.40]) (authenticated bits=0)\r
  35         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  36         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s6R3r0wN016394\r
  37         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  38         Sat, 26 Jul 2014 23:53:03 -0400\r
  39 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  40         (envelope-from <amdragon@mit.edu>)\r
  41         id 1XBFW8-00051E-8h; Sat, 26 Jul 2014 23:53:00 -0400\r
  42 From: Austin Clements <amdragon@MIT.EDU>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH 04/14] new: Don't report version after upgrade\r
  45 Date: Sat, 26 Jul 2014 23:52:43 -0400\r
  46 Message-Id: <1406433173-19169-5-git-send-email-amdragon@mit.edu>\r
  47 X-Mailer: git-send-email 2.0.0\r
  48 In-Reply-To: <1406433173-19169-1-git-send-email-amdragon@mit.edu>\r
  49 References: <1406433173-19169-1-git-send-email-amdragon@mit.edu>\r
  50 X-Brightmail-Tracker:\r
  51  H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsUixCmqrLug/Eqwwe0vShbXb85kdmD0eLbq\r
  52         FnMAYxSXTUpqTmZZapG+XQJXxsYVUgXdfBVfX91gb2Dcxt3FyMkhIWAiMXXvCRYIW0ziwr31\r
  53         bF2MXBxCArOZJI5MOM0O4WxklHj89QsrhHOHSWJh00NmCGcuo8S8KZ/A+tkENCS27V/OCGKL\r
  54         CEhL7Lw7G6iDg4NZQE3iT5cKiCksYCfx9kI8SAWLgKrE70n9rCA2r4CDxMVrzYwQV8hJNNz4\r
  55         xAZicwo4Shx/doINpFUIqObWpcQJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Zrp5WaW\r
  56         6KWmlG5iBAUMu4vyDsY/B5UOMQpwMCrx8GawXQkWYk0sK67MPcQoycGkJMq73wwoxJeUn1KZ\r
  57         kVicEV9UmpNafIhRgoNZSYRXqBgox5uSWFmVWpQPk5LmYFES531rbRUsJJCeWJKanZpakFoE\r
  58         k5Xh4FCS4J1eBtQoWJSanlqRlplTgpBm4uAEGc4DNHxDKcjw4oLE3OLMdIj8KUZFKXHeXyAJ\r
  59         AZBERmkeXC8sol8xigO9IszLCrKCB5gM4LpfAQ1mAhrM4n8ZZHBJIkJKqoFxcn6BgF/b76Rb\r
  60         FYbzhVY2tFQXnbA963X3zYNVr2aFcS1TyV5yJtOEaVLYqrkqLqIsvgsMnl86c6bu90GN5olf\r
  61         s3ust/iaSSuxSJVpSSU53vwU6Lz/c2pzoeSssMWuu5/I3QpfpKF+YpaHvV3W3lvPF1tw29pe\r
  62         2XKcKUZ++2WGU+qrwjZymk5RYinOSDTUYi4qTgQAK8uwWMMCAAA=\r
  63 X-BeenThere: notmuch@notmuchmail.org\r
  64 X-Mailman-Version: 2.1.13\r
  65 Precedence: list\r
  66 List-Id: "Use and development of the notmuch mail system."\r
  67         <notmuch.notmuchmail.org>\r
  68 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  69         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  70 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  71 List-Post: <mailto:notmuch@notmuchmail.org>\r
  72 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  73 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  74         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  75 X-List-Received-Date: Sun, 27 Jul 2014 03:53:24 -0000\r
  76 \r
  77 The version number has always been pretty meaningless to the user and\r
  78 it's about to become even more meaningless with the introduction of\r
  79 "features".  Hopefully, the database will remain on version 3 for some\r
  80 time to come; however, the introduction of new features over time in\r
  81 version 3 will necessitate upgrades within version 3.  It would be\r
  82 confusing if we always tell the user they've been "upgraded to version\r
  83 3".  If the user wants to know what's new, they should read the news.\r
  84 ---\r
  85  notmuch-new.c        | 3 +--\r
  86  test/T530-upgrade.sh | 2 +-\r
  87  2 files changed, 2 insertions(+), 3 deletions(-)\r
  88 \r
  89 diff --git a/notmuch-new.c b/notmuch-new.c\r
  90 index d269c7c..b7590a8 100644\r
  91 --- a/notmuch-new.c\r
  92 +++ b/notmuch-new.c\r
  93 @@ -1023,8 +1023,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])\r
  94                                       add_files_state.verbosity >= VERBOSITY_NORMAL ? upgrade_print_progress : NULL,\r
  95                                       &add_files_state);\r
  96             if (add_files_state.verbosity >= VERBOSITY_NORMAL)\r
  97 -               printf ("Your notmuch database has now been upgraded to database format version %u.\n",\r
  98 -                   notmuch_database_get_version (notmuch));\r
  99 +               printf ("Your notmuch database has now been upgraded.\n");\r
 100         }\r
 101  \r
 102         add_files_state.total_files = 0;\r
 103 diff --git a/test/T530-upgrade.sh b/test/T530-upgrade.sh\r
 104 index 7d5d5aa..c4c4ac8 100755\r
 105 --- a/test/T530-upgrade.sh\r
 106 +++ b/test/T530-upgrade.sh\r
 107 @@ -33,7 +33,7 @@ test_expect_equal "$output" "\\r
 108  Welcome to a new version of notmuch! Your database will now be upgraded.\r
 109  This process is safe to interrupt.\r
 110  Backing up tags to FILENAME\r
 111 -Your notmuch database has now been upgraded to database format version 2.\r
 112 +Your notmuch database has now been upgraded.\r
 113  No new mail."\r
 114  \r
 115  test_begin_subtest "tag backup matches pre-upgrade dump"\r
 116 -- \r
 117 2.0.0\r
 118 \r