From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 2F464431FBC for ; Tue, 29 Jul 2014 09:49:19 -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 Tim-1SPG9S2w for ; Tue, 29 Jul 2014 09:49:13 -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 9A7CD431FDB for ; Tue, 29 Jul 2014 09:48:31 -0700 (PDT) X-AuditID: 1209190c-f79ef6d000005dd6-6e-53d7d05ccac7 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) (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 C6.EC.24022.D50D7D35; Tue, 29 Jul 2014 12:48:29 -0400 (EDT) Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id s6TGmI5t003474; Tue, 29 Jul 2014 12:48:18 -0400 Received: from drake.dyndns.org (31-33-71.wireless.csail.mit.edu [128.31.33.71]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s6TGmF9o030250 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Tue, 29 Jul 2014 12:48:17 -0400 Received: from amthrax by drake.dyndns.org with local (Exim 4.77) (envelope-from ) id 1XCAZS-0007Gk-P2; Tue, 29 Jul 2014 12:48:14 -0400 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH v2 04/14] new: Don't report version after upgrade Date: Tue, 29 Jul 2014 12:48:02 -0400 Message-Id: <1406652492-27803-5-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1406652492-27803-1-git-send-email-amdragon@mit.edu> References: <1406652492-27803-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixCmqrBt74XqwwftmVovVc3ksrt+cyezA 5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZWxcIVXQzVfx9dUN9gbGbdxdjJwcEgImEhPu P2GFsMUkLtxbz9bFyMUhJDCbSeLXic/MEM5GRomvhy4xQTjHmCTOrmpkhHDmMko867vGBtLP JqAhsW3/ckYQW0RAWmLn3dlgc5kFHCU+718EVMPBIQxk7/zBBBJmEVCV+Hv9EFgrr4CDxLlD W6DOkJNouPEJLM4JVH7r3l2weiGgmkOzNrNMYORfwMiwilE2JbdKNzcxM6c4NVm3ODkxLy+1 SNdQLzezRC81pXQTIziMJHl2ML45qHSIUYCDUYmHd8Pca8FCrIllxZW5hxglOZiURHn19l0P FuJLyk+pzEgszogvKs1JLT7EKMHBrCTCy3cWKMebklhZlVqUD5OS5mBREud9a20VLCSQnliS mp2aWpBaBJOV4eBQkuA1Og/UKFiUmp5akZaZU4KQZuLgBBnOAzS8GaSGt7ggMbc4Mx0if4pR UUqcN/scUEIAJJFRmgfXC4vzV4ziQK8I87qDtPMAUwRc9yugwUxAg1ldwAaXJCKkpBoYlVW0 Gtg+eFw+tz3QYHJFT4fe/ZisBxOZd9/8JnblGmf4ruuXzumGrf8/8YTi5mu8/1Ri9C6vj+p8 VPOy/O3c1oWMFSW1Da7yZz+f8KrZEMOS+1Y/TJ2v0qZU9PSbHp6+yCVGF/Z49xoVT5djKZ7H pGWubf70Aaef69crao+lxPjnRPJxRfAqsRRnJBpqMRcVJwIA8o7ogs4CAAA= 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: Tue, 29 Jul 2014 16:49:19 -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