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

update-test: more accurate variable names

Browse Source
This commit is contained in:
Alyssa Ross 2016-09-22 19:26:41 +01:00
parent 5ba04b0cc6
commit b81dcea043
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Library/Homebrew/dev-cmd/update-test.rb
View File

@ -14,18 +14,18 @@
module Homebrew module Homebrew
def update_test def update_test
cd HOMEBREW_REPOSITORY cd HOMEBREW_REPOSITORY
start_sha1 = if commit = ARGV.value("commit") start_commit = if commit = ARGV.value("commit")
commit commit
elsif date = ARGV.value("before") elsif date = ARGV.value("before")
Utils.popen_read("git", "rev-list", "-n1", "--before=#{date}", "origin/master").chomp Utils.popen_read("git", "rev-list", "-n1", "--before=#{date}", "origin/master").chomp
else else
Utils.popen_read("git", "rev-parse", "origin/master").chomp Utils.popen_read("git", "rev-parse", "origin/master").chomp
end end
start_sha1 = Utils.popen_read("git", "rev-parse", start_sha1).chomp start_commit = Utils.popen_read("git", "rev-parse", start_commit).chomp
end_sha1 = Utils.popen_read("git", "rev-parse", "HEAD").chomp end_commit = Utils.popen_read("git", "rev-parse", "HEAD").chomp
puts "Start commit: #{start_sha1}" puts "Start commit: #{start_commit}"
puts "End commit: #{end_sha1}" puts "End commit: #{end_commit}"
mktemp("update-test") do |staging| mktemp("update-test") do |staging|
staging.retain! if ARGV.keep_tmp? staging.retain! if ARGV.keep_tmp?
@ -39,12 +39,12 @@ module Homebrew
safe_system "git", "clone", "--local", "--bare", "#{HOMEBREW_REPOSITORY}/.git", "remote.git" safe_system "git", "clone", "--local", "--bare", "#{HOMEBREW_REPOSITORY}/.git", "remote.git"
safe_system "git", "config", "remote.origin.url", "#{curdir}/remote.git" safe_system "git", "config", "remote.origin.url", "#{curdir}/remote.git"
# force push origin to end_sha1 # force push origin to end_commit
safe_system "git", "checkout", "-B", "master", end_sha1 safe_system "git", "checkout", "-B", "master", end_commit
safe_system "git", "push", "--force", "origin", "master" safe_system "git", "push", "--force", "origin", "master"
# set test copy to start_sha1 # set test copy to start_commit
safe_system "git", "reset", "--hard", start_sha1 safe_system "git", "reset", "--hard", start_commit
# update ENV["PATH"] # update ENV["PATH"]
ENV["PATH"] = "#{curdir}/bin:/usr/local/bin:/usr/bin:/bin" ENV["PATH"] = "#{curdir}/bin:/usr/local/bin:/usr/bin:/bin"
@ -52,13 +52,13 @@ module Homebrew
# run brew update # run brew update
oh1 "Running brew update..." oh1 "Running brew update..."
safe_system "brew", "update", "--verbose" safe_system "brew", "update", "--verbose"
actual_end_sha1 = Utils.popen_read("git", "rev-parse", "master").chomp actual_end_commit = Utils.popen_read("git", "rev-parse", "master").chomp
if start_sha1 != end_sha1 && start_sha1 == actual_end_sha1 if start_commit != end_commit && start_commit == actual_end_commit
raise <<-EOS.undent raise <<-EOS.undent
brew update didn't update master! brew update didn't update master!
Start commit: #{start_sha1} Start commit: #{start_commit}
Expected end commit: #{end_sha1} Expected end commit: #{end_commit}
Actual end commit: #{actual_end_sha1} Actual end commit: #{actual_end_commit}
EOS EOS
end end
end end