kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

sync_default_gems.rb: Added -e option to edit when conflicted

Browse source
This commit is contained in:
Nobuyoshi Nakada 2020-07-12 23:40:27 +09:00
parent 99a9c3fe2e
commit 162d08b854
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
1 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tool/sync_default_gems.rb
View file

@ -313,7 +313,7 @@ end
IGNORE_FILE_PATTERN = /\A(?:\.travis.yml|appveyor\.yml|azure-pipelines\.yml|\.git(?:ignore|hub)|Gemfile|README\.md|History\.txt|Rakefile|CODE_OF_CONDUCT\.md)/ IGNORE_FILE_PATTERN = /\A(?:\.travis.yml|appveyor\.yml|azure-pipelines\.yml|\.git(?:ignore|hub)|Gemfile|README\.md|History\.txt|Rakefile|CODE_OF_CONDUCT\.md)/
def sync_default_gems_with_commits(gem, ranges) def sync_default_gems_with_commits(gem, ranges, edit: nil)
puts "Sync #{$repositories[gem.to_sym]} with commit history." puts "Sync #{$repositories[gem.to_sym]} with commit history."
IO.popen(%W"git remote") do |f| IO.popen(%W"git remote") do |f|
@ -363,12 +363,24 @@ def sync_default_gems_with_commits(gem, ranges)
skipped = true skipped = true
elsif /^CONFLICT/ =~ result elsif /^CONFLICT/ =~ result
result = IO.popen(%W"git status --porcelain", &:readlines).each(&:chomp!) result = IO.popen(%W"git status --porcelain", &:readlines).each(&:chomp!)
ignore = result.map {|line| /^.U / =~ line and IGNORE_FILE_PATTERN =~ (name = $') and name} result.map! {|line| line[/^.U (.*)/, 1]}
ignore.compact! result.compact!
ignore, conflict = result.partition {|name| IGNORE_FILE_PATTERN =~ name}
unless ignore.empty? unless ignore.empty?
system(*%W"git reset HEAD --", *ignore) system(*%W"git reset HEAD --", *ignore)
system(*%W"git checkout HEAD --", *ignore) system(*%W"git checkout HEAD --", *ignore)
end end
unless conflict.empty?
if edit
case
when (editor = ENV["GIT_EDITOR"] and !editor.empty?)
when (editor = `git config core.editor` and (editor.chomp!; !editor.empty?))
end
if editor
system([editor, conflict].join(' '))
end
end
end
skipped = !system({"GIT_EDITOR"=>"true"}, *%W"git cherry-pick --no-edit --continue") skipped = !system({"GIT_EDITOR"=>"true"}, *%W"git cherry-pick --no-edit --continue")
end end
@ -469,9 +481,13 @@ when nil, "-h", "--help"
exit exit
else else
if ARGV[0] == "-e"
edit = true
ARGV.shift
end
gem = ARGV.shift gem = ARGV.shift
if ARGV[0] if ARGV[0]
sync_default_gems_with_commits(gem, ARGV) sync_default_gems_with_commits(gem, ARGV, edit: edit)
else else
sync_default_gems(gem) sync_default_gems(gem)
end end