[PATCH v3 03/13] new: Don't report version after upgrade
authorAustin Clements <amdragon@MIT.EDU>
Fri, 1 Aug 2014 02:09:53 +0000 (22:09 +2000)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 18:04:01 +0000 (10:04 -0800)
1f/4906ed1d41783693bde4d19111d0d60db758e0 [new file with mode: 0644]

diff --git a/1f/4906ed1d41783693bde4d19111d0d60db758e0 b/1f/4906ed1d41783693bde4d19111d0d60db758e0
new file mode 100644 (file)
index 0000000..ab259d5
--- /dev/null
@@ -0,0 +1,118 @@
+Return-Path: <amdragon@mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id E3741431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 31 Jul 2014 19:10:30 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id rF7J6j6bsNse for <notmuch@notmuchmail.org>;\r
+       Thu, 31 Jul 2014 19:10:25 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (dmz-mailsec-scanner-1.mit.edu\r
+       [18.9.25.12])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id B8FEF431FC2\r
+       for <notmuch@notmuchmail.org>; Thu, 31 Jul 2014 19:10:12 -0700 (PDT)\r
+X-AuditID: 1209190c-f79ef6d000005dd6-84-53daf7037581\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       (using TLS with cipher AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id B1.A5.24022.407FAD35; Thu, 31 Jul 2014 22:10:12 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s712A8oX010394; \r
+       Thu, 31 Jul 2014 22:10:09 -0400\r
+Received: from drake.dyndns.org\r
+       (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [216.15.114.40]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s712A6NH029975\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Thu, 31 Jul 2014 22:10:08 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1XD2IH-00033Y-T9; Thu, 31 Jul 2014 22:10:05 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 03/13] new: Don't report version after upgrade\r
+Date: Thu, 31 Jul 2014 22:09:53 -0400\r
+Message-Id: <1406859003-11561-4-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+In-Reply-To: <1406859003-11561-1-git-send-email-amdragon@mit.edu>\r
+References: <1406859003-11561-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixG6nrsvy/VawwY0eFovVc3ksrt+cyezA\r
+       5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZWxcIVXQzVfx9dUN9gbGbdxdjJwcEgImEt13\r
+       JjJC2GISF+6tZ+ti5OIQEpjNJPF++04oZyOjxLfDU5khnDtMEn09P9ghnLmMEu823GMF6WcT\r
+       0JDYtn852CwRAWmJnXdng8WZBRwlPu9fxAZiCwPZV6Z9ZwGxWQRUJdb/vsMOYvMKOEhM6IW5\r
+       Q06i4cYnsHpOoPr//xaAzRECqmk9vZV5AiP/AkaGVYyyKblVurmJmTnFqcm6xcmJeXmpRbqG\r
+       ermZJXqpKaWbGEGBxCnJs4PxzUGlQ4wCHIxKPLwzwm8FC7EmlhVX5h5ilORgUhLltfkIFOJL\r
+       yk+pzEgszogvKs1JLT7EKMHBrCTC+/IDUI43JbGyKrUoHyYlzcGiJM771toqWEggPbEkNTs1\r
+       tSC1CCYrw8GhJMFb+g2oUbAoNT21Ii0zpwQhzcTBCTKcB2h4F0gNb3FBYm5xZjpE/hSjopQ4\r
+       756vQAkBkERGaR5cLyzSXzGKA70izCsL0s4DTBJw3a+ABjMBDX5+6zrI4JJEhJRUA6PijoKT\r
+       TL7/tW2vvtbe2vRF4UNJrehTOaNvsgdfTk6LyGbgKV1zcuGR3UVL5OMexnz4pr6q+2KUQ//j\r
+       kiX6TA+cfgR5veeLPXLIcOaElTPquhPlhBPm3g4smnYrnU1Ow+TOhWWfnuo86zt73sX8C98d\r
+       ecb81fx/zrtOOXMuSSTizL96V5u5bTuVWIozEg21mIuKEwG2lKPHzwIAAA==\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 01 Aug 2014 02:10:31 -0000\r
+\r
+The version number has always been pretty meaningless to the user and\r
+it's about to become even more meaningless with the introduction of\r
+"features".  Hopefully, the database will remain on version 3 for some\r
+time to come; however, the introduction of new features over time in\r
+version 3 will necessitate upgrades within version 3.  It would be\r
+confusing if we always tell the user they've been "upgraded to version\r
+3".  If the user wants to know what's new, they should read the news.\r
+---\r
+ notmuch-new.c        | 3 +--\r
+ test/T530-upgrade.sh | 2 +-\r
+ 2 files changed, 2 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/notmuch-new.c b/notmuch-new.c\r
+index d269c7c..b7590a8 100644\r
+--- a/notmuch-new.c\r
++++ b/notmuch-new.c\r
+@@ -1023,8 +1023,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])\r
+                                     add_files_state.verbosity >= VERBOSITY_NORMAL ? upgrade_print_progress : NULL,\r
+                                     &add_files_state);\r
+           if (add_files_state.verbosity >= VERBOSITY_NORMAL)\r
+-              printf ("Your notmuch database has now been upgraded to database format version %u.\n",\r
+-                  notmuch_database_get_version (notmuch));\r
++              printf ("Your notmuch database has now been upgraded.\n");\r
+       }\r
\r
+       add_files_state.total_files = 0;\r
+diff --git a/test/T530-upgrade.sh b/test/T530-upgrade.sh\r
+index 7d5d5aa..c4c4ac8 100755\r
+--- a/test/T530-upgrade.sh\r
++++ b/test/T530-upgrade.sh\r
+@@ -33,7 +33,7 @@ test_expect_equal "$output" "\\r
+ Welcome to a new version of notmuch! Your database will now be upgraded.\r
+ This process is safe to interrupt.\r
+ Backing up tags to FILENAME\r
+-Your notmuch database has now been upgraded to database format version 2.\r
++Your notmuch database has now been upgraded.\r
+ No new mail."\r
\r
+ test_begin_subtest "tag backup matches pre-upgrade dump"\r
+-- \r
+2.0.0\r
+\r