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.
|
|
|
|
|
2012-03-08 00:43:15 -08:00
|
|
|
require 'utils'
|
2013-01-02 21:27:15 +00:00
|
|
|
require 'formula'
|
2010-11-20 12:02:17 +00:00
|
|
|
|
2012-04-06 09:47:43 -05:00
|
|
|
def tap arg
|
|
|
|
match = arg.match(%r[homebrew-(\w+)/])
|
2013-02-04 17:46:22 -08:00
|
|
|
match[1].downcase if match
|
2012-04-06 09:47:43 -05:00
|
|
|
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
|
|
|
|
|
2012-10-19 18:56:18 -07:00
|
|
|
if ARGV[0] == '--rebase'
|
|
|
|
onoe 'You meant `git pull --rebase`.'
|
|
|
|
end
|
|
|
|
|
2012-03-08 00:43:15 -08:00
|
|
|
ARGV.named.each do|arg|
|
|
|
|
if arg.to_i > 0
|
|
|
|
url = 'https://github.com/mxcl/homebrew/pull/' + arg
|
|
|
|
else
|
2013-06-02 12:48:57 +01:00
|
|
|
url_match = arg.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX
|
2012-03-08 00:43:15 -08:00
|
|
|
unless url_match
|
|
|
|
ohai 'Ignoring URL:', "Not a GitHub pull request or commit: #{arg}"
|
|
|
|
next
|
2010-11-20 12:02:17 +00:00
|
|
|
end
|
2010-12-30 15:24:54 +00:00
|
|
|
|
2012-03-08 00:43:15 -08:00
|
|
|
url = url_match[0]
|
|
|
|
end
|
|
|
|
|
2012-04-06 09:47:43 -05:00
|
|
|
if tap url
|
2013-02-04 17:46:22 -08:00
|
|
|
Dir.chdir HOMEBREW_REPOSITORY/"Library/Taps/#{url_match[1].downcase}-#{tap url}"
|
2012-04-06 09:47:43 -05:00
|
|
|
else
|
|
|
|
Dir.chdir HOMEBREW_REPOSITORY
|
|
|
|
end
|
|
|
|
|
2012-03-08 00:43:15 -08:00
|
|
|
# GitHub provides commits'/pull-requests' raw patches using this URL.
|
|
|
|
url += '.patch'
|
2010-12-30 15:24:54 +00:00
|
|
|
|
2012-03-08 00:43:15 -08:00
|
|
|
# The cache directory seems like a good place to put patches.
|
|
|
|
HOMEBREW_CACHE.mkpath
|
|
|
|
patchpath = HOMEBREW_CACHE + File.basename(url)
|
|
|
|
curl url, '-o', patchpath
|
2011-01-02 11:38:22 +00:00
|
|
|
|
2012-03-08 00:43:15 -08:00
|
|
|
# Store current revision
|
|
|
|
revision = `git rev-parse --short HEAD`.strip
|
2011-10-24 18:51:02 -07:00
|
|
|
|
2012-03-08 00:43:15 -08:00
|
|
|
ohai 'Applying patch'
|
|
|
|
patch_args = ['am']
|
|
|
|
patch_args << '--signoff' unless ARGV.include? '--clean'
|
|
|
|
# Normally we don't want whitespace errors, but squashing them can break
|
|
|
|
# patches so an option is provided to skip this step.
|
2013-10-22 23:55:58 +01:00
|
|
|
if ARGV.include? '--ignore-whitespace' or ARGV.include? '--clean'
|
|
|
|
patch_args << '--whitespace=nowarn'
|
|
|
|
else
|
|
|
|
patch_args << '--whitespace=fix'
|
|
|
|
end
|
2012-03-08 00:43:15 -08:00
|
|
|
patch_args << patchpath
|
2010-12-30 15:24:54 +00:00
|
|
|
|
2012-03-08 00:43:15 -08:00
|
|
|
safe_system 'git', *patch_args
|
2011-10-24 18:51:02 -07:00
|
|
|
|
2013-02-04 17:46:22 -08:00
|
|
|
issue = arg.to_i > 0 ? arg.to_i : url_match[4]
|
2012-03-08 00:43:15 -08:00
|
|
|
if issue and not ARGV.include? '--clean'
|
|
|
|
ohai "Patch closes issue ##{issue}"
|
|
|
|
message = `git log HEAD^.. --format=%B`
|
|
|
|
|
|
|
|
# If this is a pull request, append a close message.
|
|
|
|
unless 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
|
2010-12-30 15:24:54 +00:00
|
|
|
end
|
2012-03-08 00:43:15 -08:00
|
|
|
end
|
2010-12-30 15:24:54 +00:00
|
|
|
|
2012-03-08 00:43:15 -08:00
|
|
|
ohai 'Patch changed:'
|
2012-12-19 12:42:44 -08:00
|
|
|
safe_system 'git', '--no-pager', 'diff', "#{revision}..", '--stat'
|
2010-12-30 15:24:54 +00:00
|
|
|
|
2012-03-08 00:43:15 -08:00
|
|
|
if ARGV.include? '--install'
|
|
|
|
`git diff #{revision}.. --name-status`.each_line do |line|
|
|
|
|
status, filename = line.split
|
|
|
|
# Don't try and do anything to removed files.
|
2013-09-27 17:54:01 +01:00
|
|
|
if (status == 'A' or status == 'M') and filename.match /Formula\/\w+\.rb$/ or tap url
|
2012-03-08 00:43:15 -08:00
|
|
|
formula = File.basename(filename, '.rb')
|
|
|
|
ohai "Installing #{formula}"
|
2013-01-02 21:13:56 +00:00
|
|
|
install = Formula.factory(formula).installed? ? 'upgrade' : 'install'
|
|
|
|
safe_system 'brew', install, '--debug', '--fresh', formula
|
2010-11-20 12:02:17 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2011-07-21 10:14:44 -04:00
|
|
|
end
|