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

Fixed broken -a option behavior

Browse Source
This commit is contained in:
Hiroshi SHIBATA 2023-08-29 17:41:26 +09:00
parent 901b6d9c50
commit 5e81127c1b
No known key found for this signature in database
GPG Key ID: F9CF13417264FAC2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tool/sync_default_gems.rb
View File

@ -522,7 +522,7 @@ module SyncDefaultGems
# nil: failed # nil: failed
#++ #++
def resolve_conflicts(gem, sha) def resolve_conflicts(gem, sha, edit)
# Forcibly remove any files that we don't want to copy to this repository. # Forcibly remove any files that we don't want to copy to this repository.
# We also ignore them as new `toplevels` even when they don't conflict. # We also ignore them as new `toplevels` even when they don't conflict.
ignored_paths = [] ignored_paths = []
@ -576,6 +576,7 @@ module SyncDefaultGems
# AA: unmerged, both added # AA: unmerged, both added
unmerged = changes.map {|line| line[/\A(?:.U|[UA]A) (.*)/, 1]} unmerged = changes.map {|line| line[/\A(?:.U|[UA]A) (.*)/, 1]}
unmerged.compact! unmerged.compact!
ignore_file_pattern = ignore_file_pattern_for(gem)
ignore, conflict = unmerged.partition {|name| ignore_file_pattern =~ name} ignore, conflict = unmerged.partition {|name| ignore_file_pattern =~ name}
# Reset ignored files if they conflict # Reset ignored files if they conflict
unless ignore.empty? unless ignore.empty?
@ -636,7 +637,7 @@ module SyncDefaultGems
end end
end end
def pickup_commit(gem, sha) def pickup_commit(gem, sha, edit)
# Attempt to cherry-pick a commit # Attempt to cherry-pick a commit
result = IO.popen(%W"git cherry-pick #{sha}", &:read) result = IO.popen(%W"git cherry-pick #{sha}", &:read)
if result =~ /nothing\ to\ commit/ if result =~ /nothing\ to\ commit/
@ -651,7 +652,7 @@ module SyncDefaultGems
end end
# Skip the commit if it's empty or the cherry-pick attempt failed # Skip the commit if it's empty or the cherry-pick attempt failed
if /^CONFLICT/ =~ result and !resolve_conflicts(gem, sha) if /^CONFLICT/ =~ result and !resolve_conflicts(gem, sha, edit)
`git reset` && `git checkout .` && `git clean -fd` `git reset` && `git checkout .` && `git clean -fd`
return nil return nil
end end
@ -715,7 +716,7 @@ module SyncDefaultGems
] ]
commits.each do |sha, subject| commits.each do |sha, subject|
puts "Pick #{sha} from #{repo}." puts "Pick #{sha} from #{repo}."
case pickup_commit(gem, sha) case pickup_commit(gem, sha, edit)
when false when false
next next
when nil when nil