2014-09-20 14:27:54 +01:00
|
|
|
# Gets a patch from a GitHub commit or pull request and applies it to Homebrew.
|
|
|
|
# Optionally, installs it too.
|
|
|
|
|
2015-08-03 13:09:07 +01:00
|
|
|
require "utils"
|
|
|
|
require "formula"
|
2015-12-19 19:10:22 +08:00
|
|
|
require "tap"
|
|
|
|
require "core_formula_repository"
|
2014-09-20 14:27:54 +01:00
|
|
|
|
|
|
|
module Homebrew
|
2015-08-03 13:09:07 +01:00
|
|
|
def pull_url(url)
|
2014-11-01 10:13:32 +00:00
|
|
|
# GitHub provides commits/pull-requests raw patches using this URL.
|
2015-08-03 13:09:07 +01:00
|
|
|
url += ".patch"
|
2014-11-01 10:13:32 +00:00
|
|
|
|
|
|
|
patchpath = HOMEBREW_CACHE + File.basename(url)
|
2015-08-03 13:09:07 +01:00
|
|
|
curl url, "-o", patchpath
|
2014-11-01 10:13:32 +00:00
|
|
|
|
2015-08-03 13:09:07 +01:00
|
|
|
ohai "Applying patch"
|
2014-11-01 10:13:32 +00:00
|
|
|
patch_args = []
|
|
|
|
# Normally we don't want whitespace errors, but squashing them can break
|
|
|
|
# patches so an option is provided to skip this step.
|
2015-08-03 13:09:07 +01:00
|
|
|
if ARGV.include?("--ignore-whitespace") || ARGV.include?("--clean")
|
|
|
|
patch_args << "--whitespace=nowarn"
|
2014-11-01 10:13:32 +00:00
|
|
|
else
|
2015-08-03 13:09:07 +01:00
|
|
|
patch_args << "--whitespace=fix"
|
2014-11-01 10:13:32 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
# Fall back to three-way merge if patch does not apply cleanly
|
|
|
|
patch_args << "-3"
|
|
|
|
patch_args << patchpath
|
|
|
|
|
|
|
|
begin
|
2015-08-03 13:09:07 +01:00
|
|
|
safe_system "git", "am", *patch_args
|
2014-11-01 10:13:32 +00:00
|
|
|
rescue ErrorDuringExecution
|
2014-11-03 10:00:50 +00:00
|
|
|
if ARGV.include? "--resolve"
|
|
|
|
odie "Patch failed to apply: try to resolve it."
|
|
|
|
else
|
2015-08-03 13:09:07 +01:00
|
|
|
system "git", "am", "--abort"
|
|
|
|
odie "Patch failed to apply: aborted."
|
2014-11-03 10:00:50 +00:00
|
|
|
end
|
2014-11-01 10:13:32 +00:00
|
|
|
ensure
|
|
|
|
patchpath.unlink
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-20 14:27:54 +01:00
|
|
|
def pull
|
|
|
|
if ARGV.empty?
|
2015-08-03 13:09:07 +01:00
|
|
|
odie "This command requires at least one argument containing a URL or pull request number"
|
2014-09-20 14:27:54 +01:00
|
|
|
end
|
|
|
|
|
2015-08-03 13:09:07 +01:00
|
|
|
if ARGV[0] == "--rebase"
|
|
|
|
odie "You meant `git pull --rebase`."
|
2014-09-20 14:27:54 +01:00
|
|
|
end
|
|
|
|
|
2015-08-24 12:24:56 +01:00
|
|
|
bintray_fetch_formulae =[]
|
|
|
|
|
2014-09-20 14:27:54 +01:00
|
|
|
ARGV.named.each do |arg|
|
|
|
|
if arg.to_i > 0
|
|
|
|
issue = arg
|
2015-12-13 01:25:58 +08:00
|
|
|
url = "https://github.com/Homebrew/homebrew/pull/#{arg}"
|
|
|
|
tap = CoreFormulaRepository.instance
|
2015-09-11 14:33:39 +01:00
|
|
|
elsif (testing_match = arg.match %r{brew.sh/job/Homebrew.*Testing/(\d+)/})
|
2015-12-26 23:00:38 +01:00
|
|
|
_, testing_job = *testing_match
|
2015-07-03 10:59:53 +01:00
|
|
|
url = "https://github.com/Homebrew/homebrew/compare/master...BrewTestBot:testing-#{testing_job}"
|
2015-12-13 01:25:58 +08:00
|
|
|
tap = CoreFormulaRepository.instance
|
2015-08-03 13:09:07 +01:00
|
|
|
odie "Testing URLs require `--bottle`!" unless ARGV.include?("--bottle")
|
2015-12-13 01:25:58 +08:00
|
|
|
elsif (api_match = arg.match HOMEBREW_PULL_API_REGEX)
|
|
|
|
_, user, repo, issue = *api_match
|
|
|
|
url = "https://github.com/#{user}/homebrew#{repo}/pull/#{issue}"
|
|
|
|
tap = Tap.fetch(user, "homebrew#{repo}")
|
|
|
|
elsif (url_match = arg.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX)
|
|
|
|
url, user, repo, issue = *url_match
|
|
|
|
tap = Tap.fetch(user, "homebrew#{repo}")
|
2014-09-20 14:27:54 +01:00
|
|
|
else
|
2015-12-13 01:25:58 +08:00
|
|
|
odie "Not a GitHub pull request or commit: #{arg}"
|
2014-09-20 14:27:54 +01:00
|
|
|
end
|
|
|
|
|
2015-07-03 10:59:53 +01:00
|
|
|
if !testing_job && ARGV.include?("--bottle") && issue.nil?
|
2014-11-01 10:13:32 +00:00
|
|
|
raise "No pull request detected!"
|
|
|
|
end
|
|
|
|
|
2015-12-13 01:25:58 +08:00
|
|
|
tap.install unless tap.installed?
|
|
|
|
Dir.chdir tap.path
|
2014-09-20 14:27:54 +01:00
|
|
|
|
|
|
|
# The cache directory seems like a good place to put patches.
|
|
|
|
HOMEBREW_CACHE.mkpath
|
|
|
|
|
2015-01-15 11:11:24 +00:00
|
|
|
# Store current revision and branch
|
2014-09-20 14:27:54 +01:00
|
|
|
revision = `git rev-parse --short HEAD`.strip
|
2015-01-15 11:11:24 +00:00
|
|
|
branch = `git symbolic-ref --short HEAD`.strip
|
2014-09-20 14:27:54 +01:00
|
|
|
|
2015-05-13 18:32:37 +08:00
|
|
|
unless branch == "master"
|
2015-07-24 19:11:11 +01:00
|
|
|
opoo "Current branch is #{branch}: do you need to pull inside master?" unless ARGV.include? "--clean"
|
2015-05-13 18:32:37 +08:00
|
|
|
end
|
|
|
|
|
2014-11-01 10:13:32 +00:00
|
|
|
pull_url url
|
2014-09-20 14:27:54 +01:00
|
|
|
|
|
|
|
changed_formulae = []
|
|
|
|
|
|
|
|
Utils.popen_read(
|
|
|
|
"git", "diff-tree", "-r", "--name-only",
|
2015-12-13 01:25:58 +08:00
|
|
|
"--diff-filter=AM", revision, "HEAD", "--", tap.formula_dir.to_s
|
2014-09-20 14:27:54 +01:00
|
|
|
).each_line do |line|
|
2016-02-03 00:36:48 +01:00
|
|
|
name = "#{tap.name}/#{File.basename(line.chomp, ".rb")}"
|
2014-09-20 14:27:54 +01:00
|
|
|
|
|
|
|
begin
|
|
|
|
changed_formulae << Formula[name]
|
|
|
|
# Make sure we catch syntax errors.
|
2015-03-07 15:34:51 +00:00
|
|
|
rescue Exception
|
2014-09-20 14:27:54 +01:00
|
|
|
next
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-10-31 20:17:15 -07:00
|
|
|
fetch_bottles = false
|
|
|
|
changed_formulae.each do |f|
|
|
|
|
if ARGV.include? "--bottle"
|
2015-11-01 08:24:11 -08:00
|
|
|
if f.bottle_unneeded?
|
2015-10-31 20:17:15 -07:00
|
|
|
ohai "#{f}: skipping unneeded bottle."
|
2015-11-01 17:51:10 +08:00
|
|
|
elsif f.bottle_disabled?
|
|
|
|
ohai "#{f}: skipping disabled bottle: #{f.bottle_disable_reason}"
|
2015-11-01 08:24:11 -08:00
|
|
|
else
|
|
|
|
fetch_bottles = true
|
2015-10-31 20:17:15 -07:00
|
|
|
end
|
|
|
|
else
|
2015-11-01 20:34:08 +08:00
|
|
|
next unless f.bottle_defined?
|
2015-05-27 21:10:39 +08:00
|
|
|
opoo "#{f.full_name} has a bottle: do you need to update it with --bottle?"
|
2014-09-20 14:27:54 +01:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-08-03 13:09:07 +01:00
|
|
|
if issue && !ARGV.include?("--clean")
|
2014-09-20 14:27:54 +01:00
|
|
|
ohai "Patch closes issue ##{issue}"
|
|
|
|
message = `git log HEAD^.. --format=%B`
|
|
|
|
|
2015-08-03 13:09:07 +01:00
|
|
|
if ARGV.include? "--bump"
|
|
|
|
odie "Can only bump one changed formula" unless changed_formulae.length == 1
|
2015-03-07 15:34:43 +00:00
|
|
|
formula = changed_formulae.first
|
|
|
|
subject = "#{formula.name} #{formula.version}"
|
2014-09-20 14:27:54 +01:00
|
|
|
ohai "New bump commit subject: #{subject}"
|
2015-02-11 14:20:22 +00:00
|
|
|
system "/bin/echo -n #{subject} | pbcopy"
|
2014-09-20 14:27:54 +01:00
|
|
|
message = "#{subject}\n\n#{message}"
|
|
|
|
end
|
|
|
|
|
|
|
|
# If this is a pull request, append a close message.
|
2014-11-17 10:26:27 +00:00
|
|
|
unless message.include? "Closes ##{issue}."
|
2014-09-20 14:27:54 +01:00
|
|
|
message += "\nCloses ##{issue}."
|
2015-08-03 13:09:07 +01:00
|
|
|
safe_system "git", "commit", "--amend", "--signoff", "--allow-empty", "-q", "-m", message
|
2014-09-20 14:27:54 +01:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-10-31 20:17:15 -07:00
|
|
|
if fetch_bottles
|
2015-07-03 10:59:53 +01:00
|
|
|
bottle_commit_url = if testing_job
|
|
|
|
bottle_branch = "testing-bottle-#{testing_job}"
|
|
|
|
url
|
2014-11-23 17:16:59 +00:00
|
|
|
else
|
2015-07-03 10:59:53 +01:00
|
|
|
bottle_branch = "pull-bottle-#{issue}"
|
2015-12-13 01:25:58 +08:00
|
|
|
if tap.core_formula_repository?
|
2015-07-03 10:59:53 +01:00
|
|
|
"https://github.com/BrewTestBot/homebrew/compare/homebrew:master...pr-#{issue}"
|
2015-12-13 01:25:58 +08:00
|
|
|
else
|
|
|
|
"https://github.com/BrewTestBot/homebrew-#{tap.repo}/compare/homebrew:master...pr-#{issue}"
|
2015-07-03 10:59:53 +01:00
|
|
|
end
|
2014-11-23 17:16:59 +00:00
|
|
|
end
|
2015-02-19 10:55:42 +00:00
|
|
|
curl "--silent", "--fail", "-o", "/dev/null", "-I", bottle_commit_url
|
|
|
|
|
|
|
|
safe_system "git", "checkout", "-B", bottle_branch, revision
|
|
|
|
pull_url bottle_commit_url
|
2015-01-15 11:11:24 +00:00
|
|
|
safe_system "git", "rebase", branch
|
|
|
|
safe_system "git", "checkout", branch
|
|
|
|
safe_system "git", "merge", "--ff-only", "--no-edit", bottle_branch
|
|
|
|
safe_system "git", "branch", "-D", bottle_branch
|
2015-02-17 18:57:19 +00:00
|
|
|
|
2015-02-18 12:56:10 +00:00
|
|
|
# Publish bottles on Bintray
|
|
|
|
bintray_user = ENV["BINTRAY_USER"]
|
|
|
|
bintray_key = ENV["BINTRAY_KEY"]
|
|
|
|
|
2015-02-19 10:58:51 +00:00
|
|
|
if bintray_user && bintray_key
|
2015-12-13 01:25:58 +08:00
|
|
|
repo = Bintray.repository(tap)
|
2015-02-18 12:56:10 +00:00
|
|
|
changed_formulae.each do |f|
|
2015-11-12 01:35:58 +00:00
|
|
|
next if f.bottle_unneeded? || f.bottle_disabled?
|
2015-02-18 12:56:10 +00:00
|
|
|
ohai "Publishing on Bintray:"
|
2015-02-19 12:57:08 +00:00
|
|
|
package = Bintray.package f.name
|
2015-04-13 15:31:36 +08:00
|
|
|
version = f.pkg_version
|
2015-07-10 16:11:51 +01:00
|
|
|
curl "-w", '\n', "--silent", "--fail",
|
2015-02-18 12:56:10 +00:00
|
|
|
"-u#{bintray_user}:#{bintray_key}", "-X", "POST",
|
2015-07-10 16:11:51 +01:00
|
|
|
"-d", '{"publish_wait_for_secs": -1}',
|
2015-02-19 12:57:08 +00:00
|
|
|
"https://api.bintray.com/content/homebrew/#{repo}/#{package}/#{version}/publish"
|
2015-08-24 12:24:56 +01:00
|
|
|
bintray_fetch_formulae << f
|
2015-02-18 12:56:10 +00:00
|
|
|
end
|
2015-02-19 16:53:53 +00:00
|
|
|
else
|
2015-03-31 13:11:21 +01:00
|
|
|
opoo "You must set BINTRAY_USER and BINTRAY_KEY to add or update bottles on Bintray!"
|
2015-02-18 12:56:10 +00:00
|
|
|
end
|
2014-11-01 10:13:32 +00:00
|
|
|
end
|
|
|
|
|
2015-08-03 13:09:07 +01:00
|
|
|
ohai "Patch changed:"
|
2014-09-20 14:27:54 +01:00
|
|
|
safe_system "git", "diff-tree", "-r", "--stat", revision, "HEAD"
|
|
|
|
|
2015-08-03 13:09:07 +01:00
|
|
|
if ARGV.include? "--install"
|
2014-09-20 14:27:54 +01:00
|
|
|
changed_formulae.each do |f|
|
2015-05-27 21:10:39 +08:00
|
|
|
ohai "Installing #{f.full_name}"
|
2015-08-03 13:09:07 +01:00
|
|
|
install = f.installed? ? "upgrade" : "install"
|
|
|
|
safe_system "brew", install, "--debug", f.full_name
|
2014-09-20 14:27:54 +01:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2015-08-27 13:39:29 +01:00
|
|
|
|
|
|
|
bintray_fetch_formulae.each do |f|
|
2015-09-14 08:09:26 +01:00
|
|
|
max_retries = 8
|
2015-08-27 13:39:29 +01:00
|
|
|
retry_count = 0
|
|
|
|
begin
|
|
|
|
success = system "brew", "fetch", "--force-bottle", f.full_name
|
|
|
|
raise "Failed to download #{f} bottle!" unless success
|
|
|
|
rescue RuntimeError => e
|
|
|
|
retry_count += 1
|
|
|
|
raise e if retry_count >= max_retries
|
|
|
|
sleep_seconds = 2**retry_count
|
|
|
|
ohai "That didn't work; sleeping #{sleep_seconds} seconds and trying again..."
|
|
|
|
sleep sleep_seconds
|
|
|
|
retry
|
|
|
|
end
|
|
|
|
end
|
2014-09-20 14:27:54 +01:00
|
|
|
end
|
|
|
|
end
|