From cc06f82bdf389cdb3b381bab90dd8a64c8d837ff Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sat, 23 Aug 2014 18:39:09 +0300 Subject: [PATCH] Re: [PATCH v3 03/13] new: Don't report version after upgrade --- c2/5c451ebd9771e0af5a3a194b6a4935064c8cbb | 126 ++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 c2/5c451ebd9771e0af5a3a194b6a4935064c8cbb diff --git a/c2/5c451ebd9771e0af5a3a194b6a4935064c8cbb b/c2/5c451ebd9771e0af5a3a194b6a4935064c8cbb new file mode 100644 index 000000000..88fe8f72e --- /dev/null +++ b/c2/5c451ebd9771e0af5a3a194b6a4935064c8cbb @@ -0,0 +1,126 @@ +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 219AE431FB6 + for ; Sat, 23 Aug 2014 08:39:19 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 8BAMQf7lhpmz for ; + Sat, 23 Aug 2014 08:39:15 -0700 (PDT) +Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com + [209.85.212.174]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id CE5E9431FAF + for ; Sat, 23 Aug 2014 08:39:14 -0700 (PDT) +Received: by mail-wi0-f174.google.com with SMTP id d1so835698wiv.7 + for ; Sat, 23 Aug 2014 08:39:12 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:subject:in-reply-to:references + :user-agent:date:message-id:mime-version:content-type; + bh=/3zW1AGUL9V3ardRo6nmFKWlJKhjtmZcK7Z4upt/xpk=; + b=jAtSaq1NCkb+jfn6GP7EZ3qfjOtWQiWptz0G2z66/RzETxnDOdVvFk3AlKUjo7l7lF + RKSRzP0z+f+u+j5AatIPHgMxm475ilTvkChfQrcQWVYevbJKtIhpPmximHeEwb24s9ba + kWgdYMoGhT/q8HCnSTpkgEK7vZFdlts1KhE+MVzj0SDM8XO0fIMOvGZ1vmZBAiReAipk + 8VkcSL2xIjZDW6vR+e39HrNrsl1kqqnP2hPK+7R9mF/qp5zfDG80neArkD1//JdMncIP + UCsmIVFHRXNdtVYFkjjLXm2OghRBqqh14xs1l7G1HD6yGqAsy7d9WGvbaAbimGkqTJqG + TNwA== +X-Gm-Message-State: + ALoCoQlBj9A7f1P7AKlLQUi1ZkQE2ZLL9fz/7l7pedrYxTZj6QTRiHIyzsQ4SarJtVpqOTEX4LGz +X-Received: by 10.194.77.212 with SMTP id u20mr11709191wjw.27.1408808351419; + Sat, 23 Aug 2014 08:39:11 -0700 (PDT) +Received: from localhost (dsl-hkibrasgw2-58c374-75.dhcp.inet.fi. + [88.195.116.75]) by mx.google.com with ESMTPSA id + ay4sm10401250wib.10.2014.08.23.08.39.10 for + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Sat, 23 Aug 2014 08:39:10 -0700 (PDT) +From: Jani Nikula +To: Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH v3 03/13] new: Don't report version after upgrade +In-Reply-To: <1406859003-11561-4-git-send-email-amdragon@mit.edu> +References: <1406859003-11561-1-git-send-email-amdragon@mit.edu> + <1406859003-11561-4-git-send-email-amdragon@mit.edu> +User-Agent: Notmuch/0.18.1+65~g9f0f30f (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-pc-linux-gnu) +Date: Sat, 23 Aug 2014 18:39:09 +0300 +Message-ID: <87siknjjvm.fsf@nikula.org> +MIME-Version: 1.0 +Content-Type: text/plain +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: Sat, 23 Aug 2014 15:39:19 -0000 + +On Fri, 01 Aug 2014, Austin Clements wrote: +> 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. + +I think this is good for now. + +What do you think about adding notmuch_database_get_features(), and +printing that? + +BR, +Jani. + + +> --- +> 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 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2