From 28213369e9747ba77e4f4f43ffa01ec43920defb Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Sun, 27 Jul 2014 23:52:43 +2000 Subject: [PATCH] [PATCH 04/14] new: Don't report version after upgrade --- a1/3c6b55ecec205452b9606b4e8bfc8bbbc5298b | 118 ++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 a1/3c6b55ecec205452b9606b4e8bfc8bbbc5298b diff --git a/a1/3c6b55ecec205452b9606b4e8bfc8bbbc5298b b/a1/3c6b55ecec205452b9606b4e8bfc8bbbc5298b new file mode 100644 index 000000000..cb0cb490d --- /dev/null +++ b/a1/3c6b55ecec205452b9606b4e8bfc8bbbc5298b @@ -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 6650F431FBC + for ; Sat, 26 Jul 2014 20:53:24 -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 rfQOEFh3JKhu for ; + Sat, 26 Jul 2014 20:53:18 -0700 (PDT) +Received: from dmz-mailsec-scanner-6.mit.edu (dmz-mailsec-scanner-6.mit.edu + [18.7.68.35]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id B2C68431FC7 + for ; Sat, 26 Jul 2014 20:53:07 -0700 (PDT) +X-AuditID: 12074423-f79bf6d000007580-df-53d477a053f4 +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-6.mit.edu (Symantec Messaging Gateway) with SMTP + id 3D.64.30080.0A774D35; Sat, 26 Jul 2014 23:53:04 -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 s6R3r3ba008825; + Sat, 26 Jul 2014 23:53:04 -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 s6R3r0wN016394 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Sat, 26 Jul 2014 23:53:03 -0400 +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1XBFW8-00051E-8h; Sat, 26 Jul 2014 23:53:00 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH 04/14] new: Don't report version after upgrade +Date: Sat, 26 Jul 2014 23:52:43 -0400 +Message-Id: <1406433173-19169-5-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 2.0.0 +In-Reply-To: <1406433173-19169-1-git-send-email-amdragon@mit.edu> +References: <1406433173-19169-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsUixCmqrLug/Eqwwe0vShbXb85kdmD0eLbq + FnMAYxSXTUpqTmZZapG+XQJXxsYVUgXdfBVfX91gb2Dcxt3FyMkhIWAiMXXvCRYIW0ziwr31 + bF2MXBxCArOZJI5MOM0O4WxklHj89QsrhHOHSWJh00NmCGcuo8S8KZ/A+tkENCS27V/OCGKL + CEhL7Lw7G6iDg4NZQE3iT5cKiCksYCfx9kI8SAWLgKrE70n9rCA2r4CDxMVrzYwQV8hJNNz4 + xAZicwo4Shx/doINpFUIqObWpcQJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Zrp5WaW + 6KWmlG5iBAUMu4vyDsY/B5UOMQpwMCrx8GawXQkWYk0sK67MPcQoycGkJMq73wwoxJeUn1KZ + kVicEV9UmpNafIhRgoNZSYRXqBgox5uSWFmVWpQPk5LmYFES531rbRUsJJCeWJKanZpakFoE + k5Xh4FCS4J1eBtQoWJSanlqRlplTgpBm4uAEGc4DNHxDKcjw4oLE3OLMdIj8KUZFKXHeXyAJ + AZBERmkeXC8sol8xigO9IszLCrKCB5gM4LpfAQ1mAhrM4n8ZZHBJIkJKqoFxcn6BgF/b76Rb + FYbzhVY2tFQXnbA963X3zYNVr2aFcS1TyV5yJtOEaVLYqrkqLqIsvgsMnl86c6bu90GN5olf + s3ust/iaSSuxSJVpSSU53vwU6Lz/c2pzoeSssMWuu5/I3QpfpKF+YpaHvV3W3lvPF1tw29pe + 2XKcKUZ++2WGU+qrwjZymk5RYinOSDTUYi4qTgQAK8uwWMMCAAA= +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: Sun, 27 Jul 2014 03:53:24 -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