Skip to content

Commit ad8cf37

Browse files
committed
Support other date formats in git-log
1 parent b84a224 commit ad8cf37

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

lib/rdoc/parser/changelog.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,13 @@ def parse_entries
231231
# date = header["CommitDate"] || header["Date"]
232232
date = header[/^ *(?:Author)?Date: +(.*)/, 1]
233233
author = header[/^ *Author: +(.*)/, 1]
234-
if /(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+) *([-+]\d\d)(\d\d)/ =~
235-
(header[/^ *CommitDate: +(.*)/, 1] || date)
236-
time = Time.new($1, $2, $3, $4, $5, $6, "#{$7}:#{$8}")
234+
begin
235+
time = parse_date(header[/^ *CommitDate: +(.*)/, 1] || date)
237236
@time_cache[entry_name] = time
238237
author.sub!(/\s*<(.*)>/, '')
239238
email = $1
240239
entries << [entry_name, [author, email, date, entry_body]]
240+
rescue ArgumentError
241241
end
242242
end
243243

test/rdoc/test_rdoc_parser_changelog.rb

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,18 @@ def test_scan
331331

332332
def test_scan_git
333333
parser = util_parser <<-ChangeLog
334+
commit\ 38816887962ec167ee46acf500f68df5c3013163
335+
Author: git <svn-admin@ruby-lang.org>
336+
Date: Sun Jan 24 14:35:51 2021 +0900
337+
338+
* 2021-01-24 [ci skip]
339+
340+
commit\ db7d0b89f6eca66cc7eb155c95f9123133da1ffc
341+
Author: git <svn-admin@ruby-lang.org>
342+
Date: Sat, 23 Jan 2021 06:01:39 +0900
343+
344+
* 2021-01-23 [ci skip]
345+
334346
commit\ 709bed2afaee50e2ce803f87bf1ee8291bea41e3
335347
Author: git <svn-admin@ruby-lang.org>
336348
Date: 2021-01-21 01:03:52 +0900
@@ -372,6 +384,16 @@ def test_scan_git
372384
expected = doc(
373385
head(1, File.basename(@tempfile.path)),
374386
blank_line,
387+
head(2, '2021-01-24'),
388+
blank_line,
389+
log_entry(nil, '38816887962ec167ee46',
390+
'git', 'svn-admin@ruby-lang.org', 'Sun Jan 24 14:35:51 2021 +0900',
391+
[list(:BULLET, item(nil, para('2021-01-24 [ci skip]')))]),
392+
head(2, '2021-01-23'),
393+
blank_line,
394+
log_entry(nil, 'db7d0b89f6eca66cc7eb',
395+
'git', 'svn-admin@ruby-lang.org', 'Sat, 23 Jan 2021 06:01:39 +0900',
396+
[list(:BULLET, item(nil, para('2021-01-23 [ci skip]')))]),
375397
head(2, '2021-01-21'),
376398
blank_line,
377399
log_entry(nil, '709bed2afaee50e2ce80',

0 commit comments

Comments
 (0)