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

* tool/redmine-backporter.rb (backport_command_string): pick up only

Browse Source 
when the revision exists in trunk.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49836 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2015-03-03 17:14:22 +00:00
parent f6ed283fd5
commit bca791ae60
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Mar 4 02:13:06 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* tool/redmine-backporter.rb (backport_command_string): pick up only
when the revision exists in trunk.
Wed Mar 4 00:44:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Mar 4 00:44:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (rb_thread_io_blocking_region): assigned variables * thread.c (rb_thread_io_blocking_region): assigned variables

21
tool/redmine-backporter.rb
View File

@ -31,8 +31,8 @@ opts.parse!(ARGV)
http_options = {use_ssl: true} http_options = {use_ssl: true}
http_options[:verify_mode] = OpenSSL::SSL::VERIFY_NONE unless ssl_verify http_options[:verify_mode] = OpenSSL::SSL::VERIFY_NONE unless ssl_verify
openuri_options = {} $openuri_options = {}
openuri_options[:ssl_verify_mode] = OpenSSL::SSL::VERIFY_NONE unless ssl_verify $openuri_options[:ssl_verify_mode] = OpenSSL::SSL::VERIFY_NONE unless ssl_verify
TARGET_VERSION = target_version || ENV['TARGET_VERSION'] || (raise 'need to specify TARGET_VERSION') TARGET_VERSION = target_version || ENV['TARGET_VERSION'] || (raise 'need to specify TARGET_VERSION')
RUBY_REPO_PATH = repo_path || ENV['RUBY_REPO_PATH'] RUBY_REPO_PATH = repo_path || ENV['RUBY_REPO_PATH']
@ -300,6 +300,18 @@ def show_last_journal(http, uri)
end end
def backport_command_string def backport_command_string
unless @changesets.respond_to?(:validated)
@changesets = @changesets.select do |c|
begin
uri = URI("#{REDMINE_BASE}/projects/ruby-trunk/repository/revisions/#{c}")
uri.read($openuri_options)
true
rescue
false
end
end
@changesets.define_singleton_method(:validated){true}
end
" backport --ticket=#{@issue} #{@changesets.join(',')}" " backport --ticket=#{@issue} #{@changesets.join(',')}"
end end
@ -323,7 +335,7 @@ commands = {
raise CommandSyntaxError unless /\A(\d+)?\z/ =~ args raise CommandSyntaxError unless /\A(\d+)?\z/ =~ args
uri = URI(REDMINE_BASE+'/projects/ruby-trunk/issues.json?'+URI.encode_www_form(@query.dup.merge('page' => ($1 ? $1.to_i : 1)))) uri = URI(REDMINE_BASE+'/projects/ruby-trunk/issues.json?'+URI.encode_www_form(@query.dup.merge('page' => ($1 ? $1.to_i : 1))))
# puts uri # puts uri
res = JSON(uri.read(openuri_options)) res = JSON(uri.read($openuri_options))
@issues = issues = res["issues"] @issues = issues = res["issues"]
from = res["offset"] + 1 from = res["offset"] + 1
total = res["total_count"] total = res["total_count"]
@ -342,7 +354,7 @@ commands = {
@issue = id @issue = id
uri = "#{REDMINE_BASE}/issues/#{id}" uri = "#{REDMINE_BASE}/issues/#{id}"
uri = URI(uri+".json?include=children,attachments,relations,changesets,journals") uri = URI(uri+".json?include=children,attachments,relations,changesets,journals")
res = JSON(uri.read(openuri_options)) res = JSON(uri.read($openuri_options))
i = res["issue"] i = res["issue"]
unless i["changesets"] unless i["changesets"]
abort "You don't have view_changesets permission" abort "You don't have view_changesets permission"
@ -369,6 +381,7 @@ eom
sio.puts "== #{x["revision"]} #{x["committed_on"]} #{x["user"]["name"] rescue nil}".color(bold: true, underscore: true) sio.puts "== #{x["revision"]} #{x["committed_on"]} #{x["user"]["name"] rescue nil}".color(bold: true, underscore: true)
sio.puts x["comments"] sio.puts x["comments"]
end end
@changesets = @changesets.sort.uniq
if i["journals"] && !i["journals"].empty? if i["journals"] && !i["journals"].empty?
sio.puts "= journals".color(bold: true, underscore: true) sio.puts "= journals".color(bold: true, underscore: true)
i["journals"].each do |x| i["journals"].each do |x|