From: Austin Clements Date: Mon, 25 Aug 2014 17:25:59 +0000 (+2000) Subject: [PATCH v4 01/11] new: Don't report version after upgrade X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d0a38a73d5041724d45cdc0058dbb0a49ea0e301;p=notmuch-archives.git [PATCH v4 01/11] new: Don't report version after upgrade --- diff --git a/1a/30b27cbdc126ca94773691c550614e295b2776 b/1a/30b27cbdc126ca94773691c550614e295b2776 new file mode 100644 index 000000000..bee3d21d2 --- /dev/null +++ b/1a/30b27cbdc126ca94773691c550614e295b2776 @@ -0,0 +1,117 @@ +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 147BF431FD8 + for ; Mon, 25 Aug 2014 10:26:29 -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 sw4ui1e52Aiv for ; + Mon, 25 Aug 2014 10:26:23 -0700 (PDT) +Received: from dmz-mailsec-scanner-7.mit.edu (dmz-mailsec-scanner-7.mit.edu + [18.7.68.36]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 9B14D431FB6 + for ; Mon, 25 Aug 2014 10:26:17 -0700 (PDT) +X-AuditID: 12074424-f79346d000004923-19-53fb71b73339 +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-7.mit.edu (Symantec Messaging Gateway) with SMTP + id C3.99.18723.7B17BF35; Mon, 25 Aug 2014 13:26:15 -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 s7PHQEW0007795; + Mon, 25 Aug 2014 13:26:14 -0400 +Received: from drake.dyndns.org (31-35-14.wireless.csail.mit.edu + [128.31.35.14]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s7PHQB9M029605 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Mon, 25 Aug 2014 13:26:13 -0400 +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1XLy1z-0003jJ-SB; Mon, 25 Aug 2014 13:26:11 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v4 01/11] new: Don't report version after upgrade +Date: Mon, 25 Aug 2014 13:25:59 -0400 +Message-Id: <1408987569-14146-2-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 2.0.0 +In-Reply-To: <1408987569-14146-1-git-send-email-amdragon@mit.edu> +References: <1408987569-14146-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsUixCmqrLu98HewwaFNUhY3WrsZLZqmO1tc + vzmT2YHZ49b91+wez1bdYvbYcug9cwBzFJdNSmpOZllqkb5dAlfGo7N/mQs281Zc6p/F2sD4 + gauLkZNDQsBE4tWp/SwQtpjEhXvr2boYuTiEBGYzSTROvscO4WxklNh4rg/KOcYk8fDoexYI + Zy6jxMFdfWwg/WwCGhK/by1mArFFBKQldt6dzQpiMwt4SSy70A9mCws4Suw/uRKshkVAVeJ5 + 10+wOK+Ag8SxDz+g7pCTaLjxCWwmJ1D99IWzweqFgGq+Xz7PPIGRfwEjwypG2ZTcKt3cxMyc + 4tRk3eLkxLy81CJdc73czBK91JTSTYyg8GJ3UdnB2HxI6RCjAAejEg/vjfjfwUKsiWXFlbmH + GCU5mJREeaflA4X4kvJTKjMSizPii0pzUosPMUpwMCuJ8DaD5HhTEiurUovyYVLSHCxK4rxv + ra2ChQTSE0tSs1NTC1KLYLIyHBxKErz3C4AaBYtS01Mr0jJzShDSTBycIMN5gIbHg9TwFhck + 5hZnpkPkTzEqSonz/gdJCIAkMkrz4Hph8f+KURzoFWHeoyBVPMDUAdf9CmgwE9Bg056fIINL + EhFSUg2MFYxz9una3T/VceOE/b0fpjvfB4s1hHS8WJf78HnNxXNmG51Xh3D2/O+qLHFkT6vt + CloT7HmcJelhlkzU/R6H+0UbpvtMrNq6ML/LXN+6xKj7Z9qaWR+iD9zO1Oztvxjyh2GlWuC7 + 5ImPjr5celFOeZZ6105bSaNuxidrSiITNt+OcLHu+ySmxFKckWioxVxUnAgAmBvsW9oCAAA= +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: Mon, 25 Aug 2014 17:26:29 -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 5691005..ddf42c1 100644 +--- a/notmuch-new.c ++++ b/notmuch-new.c +@@ -1031,8 +1031,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) + return EXIT_FAILURE; + } + 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 +