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