--- 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]
--- a/tests/test-parse-date.t Thu Feb 15 21:14:57 2018 +0800
+++ b/tests/test-parse-date.t Fri Feb 16 17:24:31 2018 -0500
@@ -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
--- a/tests/test-shelve.t Thu Feb 15 21:14:57 2018 +0800
+++ b/tests/test-shelve.t Fri Feb 16 17:24:31 2018 -0500
@@ -1711,7 +1711,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 3 >> file && hg ci -Am 13
$ hg shelve --list
- default (*s ago) changes to: 1 (glob)
+ default (*s ago) * changes to: 1 (glob)
$ hg unshelve --keep
unshelving change 'default'
rebasing shelved changes
@@ -1727,7 +1727,7 @@
rebasing 2:3fbe6fbb0bef "changes to: 1" (tip)
unshelve of 'default' complete
$ hg shelve --list
- default (*s ago) changes to: 1 (glob)
+ default (*s ago) * changes to: 1 (glob)
$ cd ..
Unshelving when there are deleted files does not crash (issue4176)