1f/4906ed1d41783693bde4d19111d0d60db758e0

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id E3741431FAE\r
   6         for <notmuch@notmuchmail.org>; Thu, 31 Jul 2014 19:10:30 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -2.3\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id rF7J6j6bsNse for <notmuch@notmuchmail.org>;\r
  16         Thu, 31 Jul 2014 19:10:25 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-1.mit.edu (dmz-mailsec-scanner-1.mit.edu\r
  18         [18.9.25.12])\r
  19         (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id B8FEF431FC2\r
  22         for <notmuch@notmuchmail.org>; Thu, 31 Jul 2014 19:10:12 -0700 (PDT)\r
  23 X-AuditID: 1209190c-f79ef6d000005dd6-84-53daf7037581\r
  24 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  25         (using TLS with cipher AES256-SHA (256/256 bits))\r
  26         (Client did not present a certificate)\r
  27         by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  28         id B1.A5.24022.407FAD35; Thu, 31 Jul 2014 22:10:12 -0400 (EDT)\r
  29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  30         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s712A8oX010394; \r
  31         Thu, 31 Jul 2014 22:10:09 -0400\r
  32 Received: from drake.dyndns.org\r
  33         (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  34         [216.15.114.40]) (authenticated bits=0)\r
  35         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  36         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s712A6NH029975\r
  37         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  38         Thu, 31 Jul 2014 22:10:08 -0400\r
  39 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  40         (envelope-from <amdragon@mit.edu>)\r
  41         id 1XD2IH-00033Y-T9; Thu, 31 Jul 2014 22:10:05 -0400\r
  42 From: Austin Clements <amdragon@MIT.EDU>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH v3 03/13] new: Don't report version after upgrade\r
  45 Date: Thu, 31 Jul 2014 22:09:53 -0400\r
  46 Message-Id: <1406859003-11561-4-git-send-email-amdragon@mit.edu>\r
  47 X-Mailer: git-send-email 2.0.0\r
  48 In-Reply-To: <1406859003-11561-1-git-send-email-amdragon@mit.edu>\r
  49 References: <1406859003-11561-1-git-send-email-amdragon@mit.edu>\r
  50 X-Brightmail-Tracker:\r
  51  H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixG6nrsvy/VawwY0eFovVc3ksrt+cyezA\r
  52         5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZWxcIVXQzVfx9dUN9gbGbdxdjJwcEgImEt13\r
  53         JjJC2GISF+6tZ+ti5OIQEpjNJPF++04oZyOjxLfDU5khnDtMEn09P9ghnLmMEu823GMF6WcT\r
  54         0JDYtn852CwRAWmJnXdng8WZBRwlPu9fxAZiCwPZV6Z9ZwGxWQRUJdb/vsMOYvMKOEhM6IW5\r
  55         Q06i4cYnsHpOoPr//xaAzRECqmk9vZV5AiP/AkaGVYyyKblVurmJmTnFqcm6xcmJeXmpRbqG\r
  56         ermZJXqpKaWbGEGBxCnJs4PxzUGlQ4wCHIxKPLwzwm8FC7EmlhVX5h5ilORgUhLltfkIFOJL\r
  57         yk+pzEgszogvKs1JLT7EKMHBrCTC+/IDUI43JbGyKrUoHyYlzcGiJM771toqWEggPbEkNTs1\r
  58         tSC1CCYrw8GhJMFb+g2oUbAoNT21Ii0zpwQhzcTBCTKcB2h4F0gNb3FBYm5xZjpE/hSjopQ4\r
  59         756vQAkBkERGaR5cLyzSXzGKA70izCsL0s4DTBJw3a+ABjMBDX5+6zrI4JJEhJRUA6PijoKT\r
  60         TL7/tW2vvtbe2vRF4UNJrehTOaNvsgdfTk6LyGbgKV1zcuGR3UVL5OMexnz4pr6q+2KUQ//j\r
  61         kiX6TA+cfgR5veeLPXLIcOaElTPquhPlhBPm3g4smnYrnU1Ow+TOhWWfnuo86zt73sX8C98d\r
  62         ecb81fx/zrtOOXMuSSTizL96V5u5bTuVWIozEg21mIuKEwG2lKPHzwIAAA==\r
  63 X-BeenThere: notmuch@notmuchmail.org\r
  64 X-Mailman-Version: 2.1.13\r
  65 Precedence: list\r
  66 List-Id: "Use and development of the notmuch mail system."\r
  67         <notmuch.notmuchmail.org>\r
  68 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  69         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  70 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  71 List-Post: <mailto:notmuch@notmuchmail.org>\r
  72 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  73 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  74         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  75 X-List-Received-Date: Fri, 01 Aug 2014 02:10:31 -0000\r
  76 \r
  77 The version number has always been pretty meaningless to the user and\r
  78 it's about to become even more meaningless with the introduction of\r
  79 "features".  Hopefully, the database will remain on version 3 for some\r
  80 time to come; however, the introduction of new features over time in\r
  81 version 3 will necessitate upgrades within version 3.  It would be\r
  82 confusing if we always tell the user they've been "upgraded to version\r
  83 3".  If the user wants to know what's new, they should read the news.\r
  84 ---\r
  85  notmuch-new.c        | 3 +--\r
  86  test/T530-upgrade.sh | 2 +-\r
  87  2 files changed, 2 insertions(+), 3 deletions(-)\r
  88 \r
  89 diff --git a/notmuch-new.c b/notmuch-new.c\r
  90 index d269c7c..b7590a8 100644\r
  91 --- a/notmuch-new.c\r
  92 +++ b/notmuch-new.c\r
  93 @@ -1023,8 +1023,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])\r
  94                                       add_files_state.verbosity >= VERBOSITY_NORMAL ? upgrade_print_progress : NULL,\r
  95                                       &add_files_state);\r
  96             if (add_files_state.verbosity >= VERBOSITY_NORMAL)\r
  97 -               printf ("Your notmuch database has now been upgraded to database format version %u.\n",\r
  98 -                   notmuch_database_get_version (notmuch));\r
  99 +               printf ("Your notmuch database has now been upgraded.\n");\r
 100         }\r
 101  \r
 102         add_files_state.total_files = 0;\r
 103 diff --git a/test/T530-upgrade.sh b/test/T530-upgrade.sh\r
 104 index 7d5d5aa..c4c4ac8 100755\r
 105 --- a/test/T530-upgrade.sh\r
 106 +++ b/test/T530-upgrade.sh\r
 107 @@ -33,7 +33,7 @@ test_expect_equal "$output" "\\r
 108  Welcome to a new version of notmuch! Your database will now be upgraded.\r
 109  This process is safe to interrupt.\r
 110  Backing up tags to FILENAME\r
 111 -Your notmuch database has now been upgraded to database format version 2.\r
 112 +Your notmuch database has now been upgraded.\r
 113  No new mail."\r
 114  \r
 115  test_begin_subtest "tag backup matches pre-upgrade dump"\r
 116 -- \r
 117 2.0.0\r
 118 \r