Mercurial > hg
comparison mercurial/util.py @ 36235:d879aab17786
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Fri, 16 Feb 2018 17:24:31 -0500 |
| parents | 7ec26f27ca83 48783333f45c |
| children | 1fa33bd848ee |
comparison
equal
deleted
inserted
replaced
| 36233:7ec5925c971e | 36235:d879aab17786 |
|---|---|
| 2210 d = {'mb': "12", 'HI': "23", 'M': "59", 'S': "59"} | 2210 d = {'mb': "12", 'HI': "23", 'M': "59", 'S': "59"} |
| 2211 for days in ("31", "30", "29"): | 2211 for days in ("31", "30", "29"): |
| 2212 try: | 2212 try: |
| 2213 d["d"] = days | 2213 d["d"] = days |
| 2214 return parsedate(date, extendeddateformats, d)[0] | 2214 return parsedate(date, extendeddateformats, d)[0] |
| 2215 except Abort: | 2215 except error.ParseError: |
| 2216 pass | 2216 pass |
| 2217 d["d"] = "28" | 2217 d["d"] = "28" |
| 2218 return parsedate(date, extendeddateformats, d)[0] | 2218 return parsedate(date, extendeddateformats, d)[0] |
| 2219 | 2219 |
| 2220 date = date.strip() | 2220 date = date.strip() |