admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

pull: fix Homebrew Testing pull regression.

Browse Source 
Don't fail if we fail to parse an issue when pulling.

While we're here, do some general code cleanup of stuff that's hard to
follow, named confusingly or duplicated unnecessarily.
This commit is contained in:
Mike McQuaid 2019-09-05 14:21:45 +01:00
parent 78d74a8b29
commit 8755e79475
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Library/Homebrew/dev-cmd/pull.rb
View File

@ -96,7 +96,7 @@ module Homebrew
ARGV.named.each do |arg| ARGV.named.each do |arg|
arg = "#{CoreTap.instance.default_remote}/pull/#{arg}" if arg.to_i.positive? arg = "#{CoreTap.instance.default_remote}/pull/#{arg}" if arg.to_i.positive?
if (testing_match = arg.match %r{/job/Homebrew.*Testing/(\d+)/}) if (testing_match = arg.match %r{/job/Homebrew.*Testing/(\d+)})
tap = ARGV.value("tap") tap = ARGV.value("tap")
tap = if tap&.start_with?("homebrew/") tap = if tap&.start_with?("homebrew/")
Tap.fetch("homebrew", tap.delete_prefix("homebrew/")) Tap.fetch("homebrew", tap.delete_prefix("homebrew/"))
@ -136,7 +136,7 @@ module Homebrew
orig_revision = `git rev-parse --short HEAD`.strip orig_revision = `git rev-parse --short HEAD`.strip
branch = `git symbolic-ref --short HEAD`.strip branch = `git symbolic-ref --short HEAD`.strip
unless branch == "master" || args.clean? || args.branch_okay? if branch != "master" && !args.clean? && !args.branch_okay?
opoo "Current branch is #{branch}: do you need to pull inside master?" opoo "Current branch is #{branch}: do you need to pull inside master?"
end end
@ -151,7 +151,7 @@ module Homebrew
patch_puller.apply_patch patch_puller.apply_patch
end end
end_revision = end_revision?(url, merge_commit) end_revision = head_revision(url, merge_commit)
changed_formulae_names = [] changed_formulae_names = []
@ -281,19 +281,16 @@ module Homebrew
end end
end end
def fetch_issue(url)
issue = url[%r{/pull\/([0-9]+)}, 1]
safe_system "git", "fetch", "--quiet", "origin", "pull/#{issue}/head"
end
def merge_commit?(url) def merge_commit?(url)
fetch_issue(url) pr_number = url[%r{/pull\/([0-9]+)}, 1]
return false unless pr_number
safe_system "git", "fetch", "--quiet", "origin", "pull/#{pr_number}/head"
Utils.popen_read("git", "rev-list", "--parents", "-n1", "FETCH_HEAD").count(" ") > 1 Utils.popen_read("git", "rev-list", "--parents", "-n1", "FETCH_HEAD").count(" ") > 1
end end
def end_revision?(url, merge_commit) def head_revision(_url, fetched)
fetch_issue(url) Utils.popen_read("git", "rev-parse", fetched ? "FETCH_HEAD" : "HEAD").strip
Utils.popen_read("git", "rev-parse", merge_commit ? "FETCH_HEAD" : "HEAD").strip
end end
def fetch_bottles_patch(bottle_commit_url, args, bottle_branch, branch, orig_revision) def fetch_bottles_patch(bottle_commit_url, args, bottle_branch, branch, orig_revision)