Patchwork D2289: date: fix parsing months

login
register
mail settings
Submitter phabricator
Date Feb. 16, 2018, 10:07 p.m.
Message ID <a4c22f570d94c7a08aadb2b69b7c699b@localhost.localdomain>
Download mbox | patch
Permalink /patch/27998/
State Not Applicable
Headers show

Comments

phabricator - Feb. 16, 2018, 10:07 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG48783333f45c: date: fix parsing months (authored by quark, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2289?vs=5782&id=5786

REVISION DETAIL
  https://phab.mercurial-scm.org/D2289

AFFECTED FILES
  mercurial/util.py
  tests/test-parse-date.t

CHANGE DETAILS




To: quark, #hg-reviewers, martinvonz
Cc: mercurial-devel

Patch

diff --git a/tests/test-parse-date.t b/tests/test-parse-date.t
--- a/tests/test-parse-date.t
+++ b/tests/test-parse-date.t
@@ -286,3 +286,9 @@ 
   $ hg debugdate "2016-07-27 121021Z"
   internal: 1469621421 0
   standard: Wed Jul 27 12:10:21 2016 +0000
+
+Test parsing months
+
+  $ for i in Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec; do
+  >   hg log -d "$i 2018" -r null
+  > done
diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -2179,7 +2179,7 @@ 
             try:
                 d["d"] = days
                 return parsedate(date, extendeddateformats, d)[0]
-            except Abort:
+            except error.ParseError:
                 pass
         d["d"] = "28"
         return parsedate(date, extendeddateformats, d)[0]