Mercurial > public > mercurial-scm > hg

diff mercurial/util.py @ 36235:d879aab17786

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <augie@google.com>
date Fri, 16 Feb 2018 17:24:31 -0500
parents 7ec26f27ca83 48783333f45c
children 1fa33bd848ee
line wrap: on
line diff
--- a/mercurial/util.py	Thu Feb 15 21:14:57 2018 +0800
+++ b/mercurial/util.py	Fri Feb 16 17:24:31 2018 -0500
@@ -2212,7 +2212,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]