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

redmine-backporter: Support matching multiple revs

Browse Source 
with `done` command
This commit is contained in:
Takashi Kokubun 2024-09-02 02:25:28 -07:00
parent 7d47f3c94f
commit b6e7e903a0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tool/redmine-backporter.rb
View File

@ -353,14 +353,14 @@ eom
if rev && has_commit(rev, "ruby_#{TARGET_VERSION.tr('.','_')}") if rev && has_commit(rev, "ruby_#{TARGET_VERSION.tr('.','_')}")
notes = "ruby_#{TARGET_VERSION.tr('.','_')} commit:#{rev}." notes = "ruby_#{TARGET_VERSION.tr('.','_')} commit:#{rev}."
elsif rev.nil? && (log = find_git_log("##@issue]")) && /^commit (?<rev>\h{40})$/ =~ log elsif rev.nil? && (log = find_git_log("##@issue]")) && !(revs = log.scan(/^commit (\h{40})$/).flatten).empty?
str = log[/merge revision\(s\) ([^:]+)(?=:)/] commits = revs.map { |rev| "commit:#{rev}" }.join(", ")
if str if merged_revs = log[/merge revision\(s\) ([^:]+)(?=:)/]
str.sub!(/\Amerge/, 'merged') merged_revs.sub!(/\Amerge/, 'merged')
str.gsub!(/\h{8,40}/, 'commit:\0') merged_revs.gsub!(/\h{8,40}/, 'commit:\0')
str = "ruby_#{TARGET_VERSION.tr('.','_')} commit:#{rev} #{str}." str = "ruby_#{TARGET_VERSION.tr('.','_')} #{commits} #{merged_revs}."
else else
str = "ruby_#{TARGET_VERSION.tr('.','_')} commit:#{rev}." str = "ruby_#{TARGET_VERSION.tr('.','_')} #{commits}."
end end
if notes if notes
str << "\n" str << "\n"