summaryrefslogtreecommitdiff
path: root/spec/mspec/tool
diff options
context:
space:
mode:
authoreregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-05-27 21:54:38 +0000
committereregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-05-27 21:54:38 +0000
commit24db428785c938d401c9e582b5ea2622540222ad (patch)
tree89ceefbce859ead933ff13c685a3e59e282bdfd2 /spec/mspec/tool
parentd97c171b90ad58c1f960d48ff8e304ae504d29cc (diff)
Update to ruby/mspec@6c95759
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/mspec/tool')
-rw-r--r--spec/mspec/tool/sync/sync-rubyspec.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb
index fe8c4edbb6..e7f054ca60 100644
--- a/spec/mspec/tool/sync/sync-rubyspec.rb
+++ b/spec/mspec/tool/sync/sync-rubyspec.rb
@@ -14,6 +14,7 @@ IMPLS = {
git: "https://github.com/ruby/ruby.git",
master: "trunk",
prefix: "spec/rubyspec",
+ merge_message: "Update to ruby/spec@",
},
}
@@ -52,6 +53,10 @@ class RubyImplementation
"#{from}..." if from
end
+ def last_merge_message
+ @data[:merge_message] || "Merge ruby/spec commit"
+ end
+
def prefix
@data[:prefix] || "spec/ruby"
end
@@ -113,7 +118,7 @@ def rebase_commits(impl)
if ENV["LAST_MERGE"]
last_merge = `git log -n 1 --format='%H %ct' #{ENV["LAST_MERGE"]}`
else
- last_merge = `git log --grep='Merge ruby/spec commit' -n 1 --format='%H %ct'`
+ last_merge = `git log --grep='#{impl.last_merge_message}' -n 1 --format='%H %ct'`
end
last_merge, commit_timestamp = last_merge.chomp.split(' ')
@@ -167,6 +172,8 @@ def verify_commits(impl)
end
puts "Manually check commit messages:"
+ print "Press enter >"
+ STDIN.gets
sh "git", "log", "master..."
end
end
@@ -183,6 +190,7 @@ def check_ci
puts <<-EOS
Push to master, and check that the CI passes:
https://github.com/ruby/spec/commits/master
+
EOS
end