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

cmd/unbottled: Address review feedback for --lost

Browse Source 
- Add heading message to indicate bottle tag used
- Use --no-ext-diff with git to avoid potential problems
- Resolve formula renames to avoid false positives
- Increase parsing stringency
This commit is contained in:
apainintheneck 2023-10-16 20:51:38 -07:00
parent 20f00a6427
commit 83598bb950
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/dev-cmd/unbottled.rb
View File

@ -258,8 +258,10 @@ module Homebrew
end end
def output_lost_bottles def output_lost_bottles
# $ git log --patch -G\^\ \+sha256.\*\ sonoma: --since=@\{\'1\ week\ ago\'\} ohai ":#{@bottle_tag} lost bottles"
git_log = %w[git log --patch]
# $ git log --patch -G'^ +sha256.* sonoma:' --since=@{'1 week ago'}
git_log = %w[git log --patch --no-ext-diff]
git_log << "-G^ +sha256.* #{@bottle_tag}:" git_log << "-G^ +sha256.* #{@bottle_tag}:"
git_log << "--since=@{'1 week ago'}" git_log << "--since=@{'1 week ago'}"
@ -276,15 +278,17 @@ module Homebrew
case line case line
when /^commit [0-9a-f]{40}$/ when /^commit [0-9a-f]{40}$/
# Example match: `commit 7289b409b96a752540befef1a56b8a818baf1db7` # Example match: `commit 7289b409b96a752540befef1a56b8a818baf1db7`
if commit && lost_bottles.positive? && processed_formulae.exclude?(formula) if commit && formula && lost_bottles.positive? && processed_formulae.exclude?(formula)
puts "#{commit}: bottle lost for #{formula}" puts "#{commit}: bottle lost for #{formula}"
end end
processed_formulae << formula processed_formulae << formula
commit = line.split.last commit = line.split.last
lost_bottles = 0 formula = nil
when %r{^diff --git a/Formula/} when %r{^diff --git a/Formula/}
# Example match: `diff --git a/Formula/a/aws-cdk.rb b/Formula/a/aws-cdk.rb` # Example match: `diff --git a/Formula/a/aws-cdk.rb b/Formula/a/aws-cdk.rb`
formula = line.split("/").last.chomp(".rb\n") formula = line.split("/").last.chomp(".rb\n")
formula = CoreTap.instance.formula_renames.fetch(formula, formula)
lost_bottles = 0
when bottle_tag_sha_regex when bottle_tag_sha_regex
# Example match: `- sha256 cellar: :any_skip_relocation, sonoma: "f0a4..."` # Example match: `- sha256 cellar: :any_skip_relocation, sonoma: "f0a4..."`
next if processed_formulae.include?(formula) next if processed_formulae.include?(formula)
@ -301,7 +305,7 @@ module Homebrew
end end
end end
return if !commit || !lost_bottles.positive? || processed_formulae.include?(formula) return if !commit || !formula || !lost_bottles.positive? || processed_formulae.include?(formula)
puts "#{commit}: bottle lost for #{formula}" puts "#{commit}: bottle lost for #{formula}"
end end