2010-11-20 12:02:17 +00:00
|
|
|
# Gets a patch from a GitHub commit or pull request and applies it to Homebrew.
|
|
|
|
# Optionally, installs it too.
|
|
|
|
|
|
|
|
require 'utils.rb'
|
|
|
|
|
|
|
|
if ARGV.include? '--install'
|
|
|
|
ARGV.delete '--install'
|
|
|
|
install = true
|
|
|
|
end
|
|
|
|
|
2010-11-21 10:33:14 +00:00
|
|
|
if ARGV.empty?
|
2011-08-25 16:44:43 -07:00
|
|
|
onoe 'This command requires at least one argument containing a URL or pull request number'
|
2010-11-21 10:33:14 +00:00
|
|
|
end
|
|
|
|
|
2010-11-20 12:02:17 +00:00
|
|
|
HOMEBREW_REPOSITORY.cd do
|
2011-10-24 18:51:02 -07:00
|
|
|
ARGV.named.each do|arg|
|
2011-08-25 16:44:43 -07:00
|
|
|
if arg.to_i > 0
|
|
|
|
url = 'https://github.com/mxcl/homebrew/pull/' + arg + '.patch'
|
|
|
|
else
|
|
|
|
# This regex should work, if it's too precise, feel free to fix it.
|
|
|
|
urlmatch = arg.match 'https:\/\/github.com\/\w+\/homebrew\/(pull\/(\d+)|commit\/\w{4,40})'
|
|
|
|
if !urlmatch
|
|
|
|
ohai 'Ignoring URL:', "Not a GitHub pull request or commit: #{arg}"
|
|
|
|
next
|
|
|
|
end
|
|
|
|
|
|
|
|
# GitHub provides commits'/pull-requests' raw patches using this URL.
|
|
|
|
url = urlmatch[0] + '.patch'
|
2010-11-20 12:02:17 +00:00
|
|
|
end
|
2010-12-30 15:24:54 +00:00
|
|
|
|
2010-11-20 12:02:17 +00:00
|
|
|
# The cache directory seems like a good place to put patches.
|
2011-10-11 10:13:16 -07:00
|
|
|
HOMEBREW_CACHE.mkpath
|
2010-11-20 12:02:17 +00:00
|
|
|
patchpath = (HOMEBREW_CACHE+File.basename(url))
|
|
|
|
curl url, '-o', patchpath
|
2010-12-30 15:24:54 +00:00
|
|
|
|
2011-01-02 11:38:22 +00:00
|
|
|
# Store current revision
|
|
|
|
revision = `git log -n1 --format=%H`.strip()
|
|
|
|
|
2010-11-20 12:02:17 +00:00
|
|
|
ohai 'Applying patch'
|
2011-10-24 18:51:02 -07:00
|
|
|
patch_args = %w[am --signoff]
|
2011-10-24 19:07:59 -07:00
|
|
|
# Normally we don't want whitespace errors, but squashing them can break
|
|
|
|
# patches so an option is provided to skip this step.
|
2011-10-24 18:51:02 -07:00
|
|
|
patch_args << '--whitespace=fix' unless ARGV.include? '--ignore-whitespace'
|
|
|
|
patch_args << patchpath
|
|
|
|
|
|
|
|
safe_system 'git', *patch_args
|
2010-12-30 15:24:54 +00:00
|
|
|
|
2011-08-25 16:44:43 -07:00
|
|
|
issue = arg.to_i > 0 ? arg.to_i : urlmatch[2]
|
2010-12-30 15:24:54 +00:00
|
|
|
if issue
|
|
|
|
ohai "Patch closes issue ##{issue}"
|
2011-01-02 11:42:44 +00:00
|
|
|
message = `git log HEAD^.. --format=%B`
|
2011-10-24 18:51:02 -07:00
|
|
|
|
2010-12-30 15:24:54 +00:00
|
|
|
# If this is a pull request, append a close message.
|
|
|
|
if !message.include? 'Closes #'
|
|
|
|
issueline = "Closes ##{issue}."
|
|
|
|
signed = 'Signed-off-by:'
|
|
|
|
message = message.gsub signed, issueline + "\n\n" + signed
|
|
|
|
safe_system 'git', 'commit', '--amend', '-q', '-m', message
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2010-11-20 12:02:17 +00:00
|
|
|
ohai 'Patch changed:'
|
2011-01-02 11:38:22 +00:00
|
|
|
safe_system 'git', 'diff', "#{revision}..", '--stat'
|
2010-12-30 15:24:54 +00:00
|
|
|
|
2010-11-20 12:02:17 +00:00
|
|
|
if install
|
2011-01-02 11:38:22 +00:00
|
|
|
`git diff #{revision}.. --name-status`.each_line do |line|
|
|
|
|
status, filename = line.split()
|
|
|
|
# Don't try and do anything to removed files.
|
|
|
|
if (status == 'A' or status == 'M') and filename.include? '/Formula/'
|
|
|
|
formula = File.basename(filename, '.rb')
|
|
|
|
ohai "Installing #{formula}"
|
|
|
|
# Not sure if this is the best way to install?
|
2012-02-25 11:36:04 +00:00
|
|
|
safe_system 'brew', 'install', '--force', '--build-bottle', formula
|
2011-01-02 11:38:22 +00:00
|
|
|
end
|
2010-11-20 12:02:17 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2011-07-21 10:14:44 -04:00
|
|
|
end
|