Re: [PATCH 4/4] parse-time-string: fix setting and rounding of seconds

diff --git a/85/85adefb81133f7a787c9342b7ec090b5e8212d b/85/85adefb81133f7a787c9342b7ec090b5e8212d
new file mode 100644 (file)
index 0000000..d640a7c
--- /dev/null
+++ b/85/85adefb81133f7a787c9342b7ec090b5e8212d
@@ -0,0 +1,116 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 0872D431FAF\r
+       for <notmuch@notmuchmail.org>; Mon,  2 Mar 2015 12:06:59 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+       tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 21kVHJyYQ9Uj for <notmuch@notmuchmail.org>;\r
+       Mon,  2 Mar 2015 12:06:55 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id AD8AC431FAE\r
+       for <notmuch@notmuchmail.org>; Mon,  2 Mar 2015 12:06:55 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id B86521000E7;\r
+       Mon,  2 Mar 2015 22:03:55 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 4/4] parse-time-string: fix setting and rounding of\r
+ seconds\r
+In-Reply-To: <1425318424-27017-4-git-send-email-jani@nikula.org>\r
+References: <1425318424-27017-1-git-send-email-jani@nikula.org>\r
+       <1425318424-27017-4-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.19+53~gb45d2f9 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Mon, 02 Mar 2015 22:03:55 +0200\r
+Message-ID: <m2bnkbnp3o.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 02 Mar 2015 20:06:59 -0000\r
+\r
+On Mon, Mar 02 2015, Jani Nikula <jani@nikula.org> wrote:\r
+\r
+> If seconds are not specified in the string to be parsed, they're not\r
+> set according to the reference time (in the no rounding case) nor\r
+> rounded properly (in the rounding up cases). Fix this.\r
+>\r
+> The bug caused searches such as date:10:30..10:30 to match messages\r
+> with date exactly 10:30:00 only, and not in range 10:30:00..10:30:59\r
+> (inclusive) as documented.\r
+>\r
+> Note that date searches referring "noon" or "5pm" will still be\r
+> interpreted as exact to the second.\r
+\r
+Although I don't fully understands how these changes do the trick (and I\r
+only looked the context) the changes *look* good, and presumably fix\r
+the problem in question (I could check intermediate output but i am just\r
+lazy).\r
+\r
+Tests pass and I don't see why anything could get broken by this so +1\r
+\r
+Tomi\r
+\r
+\r
+> ---\r
+>  parse-time-string/parse-time-string.c | 4 ++--\r
+>  test/T490-parse-time-string.sh        | 1 -\r
+>  2 files changed, 2 insertions(+), 3 deletions(-)\r
+>\r
+> diff --git a/parse-time-string/parse-time-string.c b/parse-time-string/parse-time-string.c\r
+> index ccad422b3c8d..1cef47d4b0bd 100644\r
+> --- a/parse-time-string/parse-time-string.c\r
+> +++ b/parse-time-string/parse-time-string.c\r
+> @@ -1081,10 +1081,10 @@ parse_time (struct state *state, char sep,\r
+>      return set_user_tz (state, state->delim, v1, v2);\r
+>      }\r
+>  \r
+> -    if (!is_valid_time (v1, v2, v3))\r
+> +    if (!is_valid_time (v1, v2, n3 ? v3 : 0))\r
+>      return -PARSE_TIME_ERR_INVALIDTIME;\r
+>  \r
+> -    return set_abs_time (state, v1, v2, n3 ? v3 : 0);\r
+> +    return set_abs_time (state, v1, v2, n3 ? (int) v3 : UNSET);\r
+>  }\r
+>  \r
+>  /* strtoul helper that assigns length. */\r
+> diff --git a/test/T490-parse-time-string.sh b/test/T490-parse-time-string.sh\r
+> index 9247bdf89543..6aa9d433bfd4 100755\r
+> --- a/test/T490-parse-time-string.sh\r
+> +++ b/test/T490-parse-time-string.sh\r
+> @@ -79,7 +79,6 @@ ${TEST_DIRECTORY}/parse-time --ref=${REFERENCE} < INPUT > OUTPUT\r
+>  test_expect_equal_file INPUT OUTPUT\r
+>  \r
+>  test_begin_subtest "Second rounding tests"\r
+> -test_subtest_known_broken\r
+>  REFERENCE=$(_date Tue Jan 11 12:13:14 +0000 2011)\r
+>  cat <<EOF > INPUT\r
+>  9:15         ==> Tue Jan 11 09:15:14 +0000 2011\r
+> -- \r
+> 2.1.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r