Merge pull request #2727 from reitermarkus/refactor-formula-versions

Refactor `FormulaVersions`.
This commit is contained in:
Markus Reiter 2017-06-04 11:59:44 +02:00 committed by GitHub
commit 515411707a

View File

@ -17,6 +17,7 @@ class FormulaVersions
@repository = formula.tap.path
@entry_name = @path.relative_path_from(repository).to_s
@current_formula = formula
@formula_at_revision = {}
end
def rev_list(branch)
@ -32,20 +33,20 @@ class FormulaVersions
end
def formula_at_revision(rev)
contents = file_contents_at_revision(rev)
Homebrew.raise_deprecation_exceptions = true
begin
Homebrew.raise_deprecation_exceptions = true
yield nostdout { Formulary.from_contents(name, path, contents) }
rescue *IGNORED_EXCEPTIONS => e
# We rescue these so that we can skip bad versions and
# continue walking the history
ohai "#{e} in #{name} at revision #{rev}", e.backtrace if ARGV.debug?
rescue FormulaUnavailableError
# Suppress this error
ensure
Homebrew.raise_deprecation_exceptions = false
yield @formula_at_revision[rev] ||= begin
contents = file_contents_at_revision(rev)
nostdout { Formulary.from_contents(name, path, contents) }
end
rescue *IGNORED_EXCEPTIONS => e
# We rescue these so that we can skip bad versions and
# continue walking the history
ohai "#{e} in #{name} at revision #{rev}", e.backtrace if ARGV.debug?
rescue FormulaUnavailableError
# Suppress this error
ensure
Homebrew.raise_deprecation_exceptions = false
end
def bottle_version_map(branch)