1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Assign the result of format_changelog to the changelog writer

Browse Source 
Also, rename `format_changelog` to `changelog_formatter` since this
method does not format the changelog when called, but rather returns a
Proc that takes IO and writes the formatted changelog.
This commit is contained in:
Nobuyoshi Nakada 2025-04-22 21:02:29 +09:00
parent 888820c581
commit 4e6946bda7
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tool/lib/vcs.rb
View File

@ -489,18 +489,17 @@ class VCS
else
arg = ["--since=25 Dec 00:00:00", to]
end
writer =
if base_url == true
remote, = upstream
if remote &&= cmd_read(env, %W[#{COMMAND} remote get-url --no-push #{remote}])
remote.chomp!
# hack to redirect git.r-l.o to github
remote.sub!(/\Agit@git\.ruby-lang\.org:/, 'git@github.com:ruby/')
remote.sub!(/\Agit@(.*?):(.*?)(?:\.git)?\z/, 'https://\1/\2/commit/')
end
base_url = remote
if base_url == true
remote, = upstream
if remote &&= cmd_read(env, %W[#{COMMAND} remote get-url --no-push #{remote}])
remote.chomp!
# hack to redirect git.r-l.o to github
remote.sub!(/\Agit@git\.ruby-lang\.org:/, 'git@github.com:ruby/')
remote.sub!(/\Agit@(.*?):(.*?)(?:\.git)?\z/, 'https://\1/\2/commit/')
end
format_changelog(path, arg, base_url)
base_url = remote
end
writer = changelog_formatter(path, arg, base_url)
if !path or path == '-'
writer[$stdout]
else
@ -510,7 +509,7 @@ class VCS
LOG_FIX_REGEXP_SEPARATORS = '/!:;|,#%&'
def format_changelog(path, arg, base_url = nil)
def changelog_formatter(path, arg, base_url = nil)
env = {'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'}
cmd = %W[#{COMMAND} log
--format=fuller --notes=commits --notes=log-fix --topo-order --no-merges
@ -570,7 +569,7 @@ class VCS
next
end
end
message = ["format_changelog failed to replace #{wrong.dump} with #{correct.dump} at #{n}\n"]
message = ["changelog_formatter failed to replace #{wrong.dump} with #{correct.dump} at #{n}\n"]
from = [1, n-2].max
to = [s.size-1, n+2].min
s.each_with_index do |e, i|