diff --git a/Library/Homebrew/dev-cmd/bump-cask-pr.rb b/Library/Homebrew/dev-cmd/bump-cask-pr.rb
index 361ad410c7..8af2a1e0c3 100644
--- a/Library/Homebrew/dev-cmd/bump-cask-pr.rb
+++ b/Library/Homebrew/dev-cmd/bump-cask-pr.rb
@@ -160,17 +160,13 @@ module Homebrew
run_cask_style(cask, old_contents)
pr_info = {
- commits: [{
- commit_message:,
- old_contents:,
- sourcefile_path: cask.sourcefile_path,
- }],
branch_name:,
- pr_message: "Created with `brew bump-cask-pr`.",
- tap: cask.tap,
- pr_title: commit_message,
+ commit_message:,
+ old_contents:,
+ pr_message: "Created with `brew bump-cask-pr`.",
+ sourcefile_path: cask.sourcefile_path,
+ tap: cask.tap,
}
-
GitHub.create_bump_pr(pr_info, args:)
end
diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
index b048ce5433..30163d927a 100644
--- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb
+++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
@@ -81,14 +81,13 @@ module Homebrew
description: "Include these additional Python packages when finding resources."
comma_array "--python-exclude-packages=",
description: "Exclude these Python packages when finding resources."
- comma_array "--bump-synced=",
- hidden: true
+
conflicts "--dry-run", "--write-only"
conflicts "--no-audit", "--strict"
conflicts "--no-audit", "--online"
conflicts "--url", "--tag"
- named_args :named_formula, max: 1, without_api: true
+ named_args :formula, max: 1, without_api: true
end
sig { override.void }
@@ -104,17 +103,18 @@ module Homebrew
# Use the user's browser, too.
ENV["BROWSER"] = Homebrew::EnvConfig.browser
- named_formula = args.named.to_formulae.first
- raise FormulaUnspecifiedError if named_formula.blank?
+ formula = args.named.to_formulae.first
+ new_url = args.url
+ raise FormulaUnspecifiedError if formula.blank?
- odie "This formula is disabled!" if named_formula.disabled?
- odie "This formula is deprecated and does not build!" if named_formula.deprecation_reason == :does_not_build
- tap = named_formula.tap
+ odie "This formula is disabled!" if formula.disabled?
+ odie "This formula is deprecated and does not build!" if formula.deprecation_reason == :does_not_build
+ tap = formula.tap
odie "This formula is not in a tap!" if tap.blank?
odie "This formula's tap is not a Git repository!" unless tap.git?
- odie <<~EOS unless tap.allow_bump?(named_formula.name)
- Whoops, the #{named_formula.name} formula has its version update
+ odie <<~EOS unless tap.allow_bump?(formula.name)
+ Whoops, the #{formula.name} formula has its version update
pull requests automatically opened by BrewTestBot every ~3 hours!
We'd still love your contributions, though, so try another one
that's not in the autobump list:
@@ -123,8 +123,8 @@ module Homebrew
odie "You have too many PRs open: close or merge some first!" if GitHub.too_many_open_prs?(tap)
- named_formula_spec = named_formula.stable
- odie "#{named_formula}: no stable specification found!" if named_formula_spec.blank?
+ formula_spec = formula.stable
+ odie "#{formula}: no stable specification found!" if formula_spec.blank?
# This will be run by `brew audit` later so run it first to not start
# spamming during normal output.
@@ -135,330 +135,267 @@ module Homebrew
remote_branch = tap.git_repository.origin_branch_name
previous_branch = "-"
- check_pull_requests(named_formula, tap_remote_repo, state: "open")
+ check_pull_requests(formula, tap_remote_repo, state: "open")
- all_formulae = []
- if args.bump_synced.present?
- Array(args.bump_synced).each do |formula_name|
- all_formulae << formula_name
- end
- else
- all_formulae << args.named.first.to_s
+ new_version = args.version
+ check_new_version(formula, tap_remote_repo, version: new_version) if new_version.present?
+
+ opoo "This formula has patches that may be resolved upstream." if formula.patchlist.present?
+ if formula.resources.any? { |resource| !resource.name.start_with?("homebrew-") }
+ opoo "This formula has resources that may need to be updated."
end
- return if all_formulae.empty?
+ old_mirrors = formula_spec.mirrors
+ new_mirrors ||= args.mirror
+ if new_url.present? && (new_mirror = determine_mirror(new_url))
+ new_mirrors ||= [new_mirror]
+ check_for_mirrors(formula.name, old_mirrors, new_mirrors)
+ end
- commits = all_formulae.filter_map do |formula_name|
- formula = Formula[formula_name]
- raise FormulaUnspecifiedError if formula.blank?
-
- formula_spec = formula.stable
- odie "#{formula}: no stable specification found!" if formula_spec.blank?
-
- formula_pr_message = ""
-
- new_url = args.url
- new_version = args.version
- check_new_version(formula, tap_remote_repo, version: new_version) if new_version.present?
-
- opoo "This formula has patches that may be resolved upstream." if formula.patchlist.present?
- if formula.resources.any? { |resource| !resource.name.start_with?("homebrew-") }
- opoo "This formula has resources that may need to be updated."
+ old_hash = formula_spec.checksum&.hexdigest
+ new_hash = args.sha256
+ new_tag = args.tag
+ new_revision = args.revision
+ old_url = T.must(formula_spec.url)
+ old_tag = formula_spec.specs[:tag]
+ old_formula_version = formula_version(formula)
+ old_version = old_formula_version.to_s
+ forced_version = new_version.present?
+ new_url_hash = if new_url.present? && new_hash.present?
+ check_new_version(formula, tap_remote_repo, url: new_url) if new_version.blank?
+ true
+ elsif new_tag.present? && new_revision.present?
+ check_new_version(formula, tap_remote_repo, url: old_url, tag: new_tag) if new_version.blank?
+ false
+ elsif old_hash.blank?
+ if new_tag.blank? && new_version.blank? && new_revision.blank?
+ raise UsageError, "#{formula}: no `--tag` or `--version` argument specified!"
end
- old_mirrors = formula_spec.mirrors
- new_mirrors ||= args.mirror
- if new_url.present? && (new_mirror = determine_mirror(new_url))
- new_mirrors ||= [new_mirror]
- check_for_mirrors(formula.name, old_mirrors, new_mirrors)
- end
-
- old_hash = formula_spec.checksum&.hexdigest
- new_hash = args.sha256
- new_tag = args.tag
- new_revision = args.revision
- old_url = T.must(formula_spec.url)
- old_tag = formula_spec.specs[:tag]
- old_formula_version = formula_version(formula)
- old_version = old_formula_version.to_s
- forced_version = new_version.present?
- new_url_hash = if new_url.present? && new_hash.present?
- check_new_version(formula, tap_remote_repo, url: new_url) if new_version.blank?
- true
- elsif new_tag.present? && new_revision.present?
- check_new_version(formula, tap_remote_repo, url: old_url, tag: new_tag) if new_version.blank?
- false
- elsif old_hash.blank?
- if new_tag.blank? && new_version.blank? && new_revision.blank?
- raise UsageError, "#{formula}: no `--tag` or `--version` argument specified!"
- end
-
- if old_tag.present?
- new_tag ||= old_tag.gsub(old_version, new_version)
- if new_tag == old_tag
- odie <<~EOS
- You need to bump this formula manually since the new tag
- and old tag are both #{new_tag}.
- EOS
- end
- check_new_version(formula, tap_remote_repo, url: old_url, tag: new_tag) if new_version.blank?
- resource_path, forced_version = fetch_resource_and_forced_version(formula, new_version, old_url,
- tag: new_tag)
- new_revision = Utils.popen_read("git", "-C", resource_path.to_s, "rev-parse", "-q", "--verify", "HEAD")
- new_revision = new_revision.strip
- elsif new_revision.blank?
- odie "#{formula}: the current URL requires specifying a `--revision=` argument."
- end
- false
- elsif new_url.blank? && new_version.blank?
- raise UsageError, "#{formula}: no `--url` or `--version` argument specified!"
- else
- next unless new_version.present?
-
- new_url ||= PyPI.update_pypi_url(old_url, new_version)
- if new_url.blank?
- new_url = update_url(old_url, old_version, new_version)
- if new_mirrors.blank? && old_mirrors.present?
- new_mirrors = old_mirrors.map do |old_mirror|
- update_url(old_mirror, old_version, new_version)
- end
- end
- end
- if new_url == old_url
+ if old_tag.present?
+ new_tag ||= old_tag.gsub(old_version, new_version)
+ if new_tag == old_tag
odie <<~EOS
- You need to bump this formula manually since the new URL
- and old URL are both:
- #{new_url}
+ You need to bump this formula manually since the new tag
+ and old tag are both #{new_tag}.
EOS
end
- check_new_version(formula, tap_remote_repo, url: new_url) if new_version.blank?
- resource_path, forced_version = fetch_resource_and_forced_version(formula, new_version, new_url)
- Utils::Tar.validate_file(resource_path)
- new_hash = resource_path.sha256
+ check_new_version(formula, tap_remote_repo, url: old_url, tag: new_tag) if new_version.blank?
+ resource_path, forced_version = fetch_resource_and_forced_version(formula, new_version, old_url,
+ tag: new_tag)
+ new_revision = Utils.popen_read("git", "-C", resource_path.to_s, "rev-parse", "-q", "--verify", "HEAD")
+ new_revision = new_revision.strip
+ elsif new_revision.blank?
+ odie "#{formula}: the current URL requires specifying a `--revision=` argument."
end
+ false
+ elsif new_url.blank? && new_version.blank?
+ raise UsageError, "#{formula}: no `--url` or `--version` argument specified!"
+ else
+ return unless new_version.present?
- replacement_pairs = []
- if formula.revision.nonzero?
- replacement_pairs << [
- /^ revision \d+\n(\n( head "))?/m,
- "\\2",
- ]
+ new_url ||= PyPI.update_pypi_url(old_url, new_version)
+ if new_url.blank?
+ new_url = update_url(old_url, old_version, new_version)
+ if new_mirrors.blank? && old_mirrors.present?
+ new_mirrors = old_mirrors.map do |old_mirror|
+ update_url(old_mirror, old_version, new_version)
+ end
+ end
end
-
- replacement_pairs += formula_spec.mirrors.map do |mirror|
- [
- / +mirror "#{Regexp.escape(mirror)}"\n/m,
- "",
- ]
+ if new_url == old_url
+ odie <<~EOS
+ You need to bump this formula manually since the new URL
+ and old URL are both:
+ #{new_url}
+ EOS
end
+ check_new_version(formula, tap_remote_repo, url: new_url) if new_version.blank?
+ resource_path, forced_version = fetch_resource_and_forced_version(formula, new_version, new_url)
+ Utils::Tar.validate_file(resource_path)
+ new_hash = resource_path.sha256
+ end
- replacement_pairs += if new_url_hash.present?
+ replacement_pairs = []
+ if formula.revision.nonzero?
+ replacement_pairs << [
+ /^ revision \d+\n(\n( head "))?/m,
+ "\\2",
+ ]
+ end
+
+ replacement_pairs += formula_spec.mirrors.map do |mirror|
+ [
+ / +mirror "#{Regexp.escape(mirror)}"\n/m,
+ "",
+ ]
+ end
+
+ replacement_pairs += if new_url_hash.present?
+ [
[
- [
- /#{Regexp.escape(T.must(formula_spec.url))}/,
- new_url,
- ],
- [
- old_hash,
- new_hash,
- ],
+ /#{Regexp.escape(T.must(formula_spec.url))}/,
+ new_url,
+ ],
+ [
+ old_hash,
+ new_hash,
+ ],
+ ]
+ elsif new_tag.present?
+ [
+ [
+ /tag:(\s+")#{formula_spec.specs[:tag]}(?=")/,
+ "tag:\\1#{new_tag}\\2",
+ ],
+ [
+ formula_spec.specs[:revision],
+ new_revision,
+ ],
+ ]
+ elsif new_url.present?
+ [
+ [
+ /#{Regexp.escape(T.must(formula_spec.url))}/,
+ new_url,
+ ],
+ [
+ formula_spec.specs[:revision],
+ new_revision,
+ ],
+ ]
+ else
+ [
+ [
+ formula_spec.specs[:revision],
+ new_revision,
+ ],
+ ]
+ end
+
+ old_contents = formula.path.read
+
+ if new_mirrors.present? && new_url.present?
+ replacement_pairs << [
+ /^( +)(url "#{Regexp.escape(new_url)}"[^\n]*?\n)/m,
+ "\\1\\2\\1mirror \"#{new_mirrors.join("\"\n\\1mirror \"")}\"\n",
+ ]
+ end
+
+ if forced_version && new_version != "0"
+ replacement_pairs << if old_contents.include?("version \"#{old_formula_version}\"")
+ [
+ "version \"#{old_formula_version}\"",
+ "version \"#{new_version}\"",
]
- elsif new_tag.present?
+ elsif new_mirrors.present?
[
- [
- /tag:(\s+")#{formula_spec.specs[:tag]}(?=")/,
- "tag:\\1#{new_tag}\\2",
- ],
- [
- formula_spec.specs[:revision],
- new_revision,
- ],
+ /^( +)(mirror "#{Regexp.escape(new_mirrors.last)}"\n)/m,
+ "\\1\\2\\1version \"#{new_version}\"\n",
]
elsif new_url.present?
[
- [
- /#{Regexp.escape(T.must(formula_spec.url))}/,
- new_url,
- ],
- [
- formula_spec.specs[:revision],
- new_revision,
- ],
- ]
- else
- [
- [
- formula_spec.specs[:revision],
- new_revision,
- ],
- ]
- end
-
- old_contents = formula.path.read
-
- if new_mirrors.present? && new_url.present?
- replacement_pairs << [
/^( +)(url "#{Regexp.escape(new_url)}"[^\n]*?\n)/m,
- "\\1\\2\\1mirror \"#{new_mirrors.join("\"\n\\1mirror \"")}\"\n",
+ "\\1\\2\\1version \"#{new_version}\"\n",
+ ]
+ elsif new_revision.present?
+ [
+ /^( {2})( +)(:revision => "#{new_revision}"\n)/m,
+ "\\1\\2\\3\\1version \"#{new_version}\"\n",
]
end
+ elsif forced_version && new_version == "0"
+ replacement_pairs << [
+ /^ version "[\w.\-+]+"\n/m,
+ "",
+ ]
+ end
+ new_contents = Utils::Inreplace.inreplace_pairs(formula.path,
+ replacement_pairs.uniq.compact,
+ read_only_run: args.dry_run?,
+ silent: args.quiet?)
- if forced_version && new_version != "0"
- replacement_pairs << if old_contents.include?("version \"#{old_formula_version}\"")
- [
- "version \"#{old_formula_version}\"",
- "version \"#{new_version}\"",
- ]
- elsif new_mirrors.present?
- [
- /^( +)(mirror "#{Regexp.escape(new_mirrors.last)}"\n)/m,
- "\\1\\2\\1version \"#{new_version}\"\n",
- ]
- elsif new_url.present?
- [
- /^( +)(url "#{Regexp.escape(new_url)}"[^\n]*?\n)/m,
- "\\1\\2\\1version \"#{new_version}\"\n",
- ]
- elsif new_revision.present?
- [
- /^( {2})( +)(:revision => "#{new_revision}"\n)/m,
- "\\1\\2\\3\\1version \"#{new_version}\"\n",
- ]
- end
- elsif forced_version && new_version == "0"
- replacement_pairs << [
- /^ version "[\w.\-+]+"\n/m,
- "",
- ]
- end
- new_contents = Utils::Inreplace.inreplace_pairs(formula.path,
- replacement_pairs.uniq.compact,
- read_only_run: args.dry_run?,
- silent: args.quiet?)
+ new_formula_version = formula_version(formula, new_contents)
- new_formula_version = formula_version(formula, new_contents)
-
- if new_formula_version < old_formula_version
- formula.path.atomic_write(old_contents) unless args.dry_run?
- odie <<~EOS
- You need to bump this formula manually since changing the version
- from #{old_formula_version} to #{new_formula_version} would be a downgrade.
- EOS
- elsif new_formula_version == old_formula_version
- formula.path.atomic_write(old_contents) unless args.dry_run?
- odie <<~EOS
- You need to bump this formula manually since the new version
- and old version are both #{new_formula_version}.
- EOS
- end
-
- alias_rename = alias_update_pair(formula, new_formula_version)
- if alias_rename.present?
- ohai "Renaming alias #{alias_rename.first} to #{alias_rename.last}"
- alias_rename.map! { |a| tap.alias_dir/a }
- end
-
- unless args.dry_run?
- resources_checked = PyPI.update_python_resources! formula,
- version: new_formula_version.to_s,
- package_name: args.python_package_name,
- extra_packages: args.python_extra_packages,
- exclude_packages: args.python_exclude_packages,
- install_dependencies: args.install_dependencies?,
- silent: args.quiet?,
- ignore_non_pypi_packages: true
-
- update_matching_version_resources! formula,
- version: new_formula_version.to_s
- end
-
- if resources_checked.nil? && formula.resources.any? do |resource|
- resource.livecheck.formula != :parent && !resource.name.start_with?("homebrew-")
- end
- formula_pr_message += <<~EOS
-
-
- - [ ] `resource` blocks have been checked for updates.
- EOS
- end
-
- if new_url =~ %r{^https://github\.com/([\w-]+)/([\w-]+)/archive/refs/tags/(v?[.0-9]+)\.tar\.}
- owner = Regexp.last_match(1)
- repo = Regexp.last_match(2)
- tag = Regexp.last_match(3)
- github_release_data = begin
- GitHub::API.open_rest("#{GitHub::API_URL}/repos/#{owner}/#{repo}/releases/tags/#{tag}")
- rescue GitHub::API::HTTPNotFoundError
- # If this is a 404: we can't do anything.
- nil
- end
-
- if github_release_data.present?
- pre = "pre" if github_release_data["prerelease"].present?
- formula_pr_message += <<~XML
-
- #{pre}release notes
- #{github_release_data["body"]}
-
- XML
- end
- end
-
- {
- sourcefile_path: formula.path,
- old_contents:,
- commit_message: "#{formula.name} #{args.version}",
- additional_files: alias_rename,
- formula_pr_message:,
- formula_name: formula.name,
- new_version: new_formula_version,
- }
+ if new_formula_version < old_formula_version
+ formula.path.atomic_write(old_contents) unless args.dry_run?
+ odie <<~EOS
+ You need to bump this formula manually since changing the version
+ from #{old_formula_version} to #{new_formula_version} would be a downgrade.
+ EOS
+ elsif new_formula_version == old_formula_version
+ formula.path.atomic_write(old_contents) unless args.dry_run?
+ odie <<~EOS
+ You need to bump this formula manually since the new version
+ and old version are both #{new_formula_version}.
+ EOS
end
- commits.each do |commit|
- commit_formula = Formula[commit[:formula_name]]
- # For each formula, run `brew audit` to check for any issues.
- audit_result = run_audit(commit_formula, commit[:additional_files],
- skip_synced_versions: args.bump_synced.present?)
+ alias_rename = alias_update_pair(formula, new_formula_version)
+ if alias_rename.present?
+ ohai "Renaming alias #{alias_rename.first} to #{alias_rename.last}"
+ alias_rename.map! { |a| tap.alias_dir/a }
+ end
- next unless audit_result
+ unless args.dry_run?
+ resources_checked = PyPI.update_python_resources! formula,
+ version: new_formula_version.to_s,
+ package_name: args.python_package_name,
+ extra_packages: args.python_extra_packages,
+ exclude_packages: args.python_exclude_packages,
+ install_dependencies: args.install_dependencies?,
+ silent: args.quiet?,
+ ignore_non_pypi_packages: true
- # If `brew audit` fails, revert the changes made to any formula.
- commits.each do |revert|
- revert_formula = Formula[revert[:formula_name]]
- revert_formula.path.atomic_write(revert[:old_contents]) unless args.dry_run?
- revert_alias_rename = revert[:additional_files]
- if revert_alias_rename && (source = revert_alias_rename.first) && (destination = revert_alias_rename.last)
- FileUtils.mv source, destination
- end
+ update_matching_version_resources! formula,
+ version: new_formula_version.to_s
+ end
+
+ run_audit(formula, alias_rename, old_contents)
+
+ pr_message = "Created with `brew bump-formula-pr`."
+ if resources_checked.nil? && formula.resources.any? do |resource|
+ resource.livecheck.formula != :parent && !resource.name.start_with?("homebrew-")
+ end
+ pr_message += <<~EOS
+
+
+ - [ ] `resource` blocks have been checked for updates.
+ EOS
+ end
+
+ if new_url =~ %r{^https://github\.com/([\w-]+)/([\w-]+)/archive/refs/tags/(v?[.0-9]+)\.tar\.}
+ owner = Regexp.last_match(1)
+ repo = Regexp.last_match(2)
+ tag = Regexp.last_match(3)
+ github_release_data = begin
+ GitHub::API.open_rest("#{GitHub::API_URL}/repos/#{owner}/#{repo}/releases/tags/#{tag}")
+ rescue GitHub::API::HTTPNotFoundError
+ # If this is a 404: we can't do anything.
+ nil
end
- odie "`brew audit` failed for #{commit[:formula_name]}!"
- end
-
- new_formula_version = T.must(commits.first)[:new_version]
- pr_title = if args.bump_synced.nil?
- "#{named_formula.name} #{new_formula_version}"
- else
- "#{Array(args.bump_synced).join(" ")} #{new_formula_version}"
- end
-
- pr_message = "Created by `brew bump-formula-pr`."
- commits.each do |commit|
- next if commit[:formula_pr_message].empty?
-
- pr_message += "#{commit[:formula_name]}
" if commits.length != 1
- pr_message += "#{commit[:formula_pr_message]}
"
+ if github_release_data.present?
+ pre = "pre" if github_release_data["prerelease"].present?
+ pr_message += <<~XML
+
+ #{pre}release notes
+ #{github_release_data["body"]}
+
+ XML
+ end
end
pr_info = {
- commits:,
+ sourcefile_path: formula.path,
+ old_contents:,
+ additional_files: alias_rename,
remote:,
remote_branch:,
- branch_name: "bump-#{named_formula.name}-#{new_formula_version}",
- pr_title:,
+ branch_name: "bump-#{formula.name}-#{new_formula_version}",
+ commit_message: "#{formula.name} #{new_formula_version}",
previous_branch:,
- tap: tap,
+ tap: tap,
tap_remote_repo:,
pr_message:,
}
@@ -667,15 +604,11 @@ module Homebrew
[versioned_alias, "#{name}@#{new_alias_version}"]
end
- sig {
- params(formula: Formula, alias_rename: T.nilable(T::Array[String]),
- skip_synced_versions: T::Boolean).returns(T::Boolean)
- }
- def run_audit(formula, alias_rename, skip_synced_versions: false)
+ sig { params(formula: Formula, alias_rename: T.nilable(T::Array[String]), old_contents: String).void }
+ def run_audit(formula, alias_rename, old_contents)
audit_args = ["--formula"]
audit_args << "--strict" if args.strict?
audit_args << "--online" if args.online?
- audit_args << "--except=synced_versions_formulae" if skip_synced_versions
if args.dry_run?
if args.no_audit?
ohai "Skipping `brew audit`"
@@ -684,7 +617,7 @@ module Homebrew
else
ohai "brew audit #{formula.path.basename}"
end
- return true
+ return
end
if alias_rename && (source = alias_rename.first) && (destination = alias_rename.last)
FileUtils.mv source, destination
@@ -699,7 +632,13 @@ module Homebrew
system HOMEBREW_BREW_FILE, "audit", formula.full_name
failed_audit = !$CHILD_STATUS.success?
end
- failed_audit
+ return unless failed_audit
+
+ formula.path.atomic_write(old_contents)
+ if alias_rename && (source = alias_rename.first) && (destination = alias_rename.last)
+ FileUtils.mv source, destination
+ end
+ odie "`brew audit` failed!"
end
end
end
diff --git a/Library/Homebrew/dev-cmd/bump.rb b/Library/Homebrew/dev-cmd/bump.rb
index 1edf55f811..cfca2b2087 100644
--- a/Library/Homebrew/dev-cmd/bump.rb
+++ b/Library/Homebrew/dev-cmd/bump.rb
@@ -53,8 +53,6 @@ module Homebrew
description: "Open a pull request for the new version if none have been opened yet."
flag "--start-with=",
description: "Letter or word that the list of package results should alphabetically follow."
- switch "--bump-synced",
- description: "Bump additional formulae marked as synced with the given formulae."
conflicts "--cask", "--formula"
conflicts "--tap=", "--installed"
@@ -472,12 +470,10 @@ module Homebrew
EOS
if formula_or_cask.is_a?(Formula) && formula_or_cask.synced_with_other_formulae?
outdated_synced_formulae = synced_with(formula_or_cask, new_version.general)
- if !args.bump_synced? && outdated_synced_formulae.present?
- puts <<~EOS
- Version syncing: #{title_name} version should be kept in sync with
- #{outdated_synced_formulae.join(", ")}.
- EOS
- end
+ puts <<~EOS if outdated_synced_formulae.present?
+ Version syncing: #{title_name} version should be kept in sync with
+ #{outdated_synced_formulae.join(", ")}.
+ EOS
end
if !args.no_pull_requests? &&
(new_version.general != "unable to get versions") &&
@@ -523,7 +519,7 @@ module Homebrew
"--version=#{new_version.general}"
end
- bump_pr_args = [
+ bump_cask_pr_args = [
"bump-#{version_info.type}-pr",
name,
*version_args,
@@ -531,13 +527,9 @@ module Homebrew
"--message=Created by `brew bump`",
]
- bump_pr_args << "--no-fork" if args.no_fork?
+ bump_cask_pr_args << "--no-fork" if args.no_fork?
- if args.bump_synced? && outdated_synced_formulae.present?
- bump_pr_args << "--bump-synced=#{outdated_synced_formulae.join(",")}"
- end
-
- system HOMEBREW_BREW_FILE, *bump_pr_args
+ system HOMEBREW_BREW_FILE, *bump_cask_pr_args
end
sig {
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump.rbi
index 0ee11bf0d7..89a7d21c3f 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump.rbi
@@ -14,9 +14,6 @@ class Homebrew::DevCmd::Bump::Args < Homebrew::CLI::Args
sig { returns(T::Boolean) }
def auto?; end
- sig { returns(T::Boolean) }
- def bump_synced?; end
-
sig { returns(T::Boolean) }
def cask?; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_formula_pr.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_formula_pr.rbi
index 4ab9d748f2..b0368c6db8 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_formula_pr.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_formula_pr.rbi
@@ -11,9 +11,6 @@ class Homebrew::DevCmd::BumpFormulaPr
end
class Homebrew::DevCmd::BumpFormulaPr::Args < Homebrew::CLI::Args
- sig { returns(T.nilable(String)) }
- def bump_synced; end
-
sig { returns(T::Boolean) }
def commit?; end
diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb
index feee56ccd9..38114448b4 100644
--- a/Library/Homebrew/utils/github.rb
+++ b/Library/Homebrew/utils/github.rb
@@ -706,117 +706,96 @@ module GitHub
def self.create_bump_pr(info, args:)
tap = info[:tap]
+ sourcefile_path = info[:sourcefile_path]
+ old_contents = info[:old_contents]
+ additional_files = info[:additional_files] || []
remote = info[:remote] || "origin"
remote_branch = info[:remote_branch] || tap.git_repository.origin_branch_name
branch = info[:branch_name]
+ commit_message = info[:commit_message]
previous_branch = info[:previous_branch] || "-"
tap_remote_repo = info[:tap_remote_repo] || tap.full_name
pr_message = info[:pr_message]
- pr_title = info[:pr_title]
- commits = info[:commits]
- username = tap.user
-
- remote_url = Utils.popen_read("git", "remote", "get-url", "--push", "origin").chomp
-
- tap.path.cd do
+ sourcefile_path.parent.cd do
require "utils/popen"
git_dir = Utils.popen_read("git", "rev-parse", "--git-dir").chomp
shallow = !git_dir.empty? && File.exist?("#{git_dir}/shallow")
- unless args.commit?
- if args.no_fork?
- remote_url = Utils.popen_read("git", "remote", "get-url", "--push", "origin").chomp
- add_auth_token_to_url!(remote_url)
- username = tap.user
+ changed_files = [sourcefile_path]
+ changed_files += additional_files if additional_files.present?
+
+ if args.dry_run? || (args.write_only? && !args.commit?)
+ remote_url = if args.no_fork?
+ Utils.popen_read("git", "remote", "get-url", "--push", "origin").chomp
else
- begin
- forked_repo_info!(tap_remote_repo, org: args.fork_org)
- rescue *API::ERRORS => e
- commits.each do |commit|
- commit[:sourcefile_path].atomic_write(commit[:old_contents])
- end
- odie "Unable to fork: #{e.message}!"
- end
+ fork_message = "try to fork repository with GitHub API" \
+ "#{" into `#{args.fork_org}` organization" if args.fork_org}"
+ ohai fork_message
+ "FORK_URL"
end
+ ohai "git fetch --unshallow origin" if shallow
+ ohai "git add #{changed_files.join(" ")}"
+ ohai "git checkout --no-track -b #{branch} #{remote}/#{remote_branch}"
+ ohai "git commit --no-edit --verbose --message='#{commit_message}' " \
+ "-- #{changed_files.join(" ")}"
+ ohai "git push --set-upstream #{remote_url} #{branch}:#{branch}"
+ ohai "git checkout --quiet #{previous_branch}"
+ ohai "create pull request with GitHub API (base branch: #{remote_branch})"
+ else
- safe_system "git", "fetch", "--unshallow", "origin" if shallow
- end
- safe_system "git", "checkout", "--no-track", "-b", branch, "#{remote}/#{remote_branch}" unless args.commit?
- Utils::Git.set_name_email!
- end
-
- commits.each do |commit|
- sourcefile_path = commit[:sourcefile_path]
- commit_message = commit[:commit_message]
- additional_files = commit[:additional_files] || []
-
- sourcefile_path.parent.cd do
- require "utils/popen"
- git_dir = Utils.popen_read("git", "rev-parse", "--git-dir").chomp
- shallow = !git_dir.empty? && File.exist?("#{git_dir}/shallow")
- changed_files = [sourcefile_path]
- changed_files += additional_files if additional_files.present?
-
- if args.dry_run? || (args.write_only? && !args.commit?)
- remote_url = if args.no_fork?
- Utils.popen_read("git", "remote", "get-url", "--push", "origin").chomp
+ unless args.commit?
+ if args.no_fork?
+ remote_url = Utils.popen_read("git", "remote", "get-url", "--push", "origin").chomp
+ add_auth_token_to_url!(remote_url)
+ username = tap.user
else
- fork_message = "try to fork repository with GitHub API" \
- "#{" into `#{args.fork_org}` organization" if args.fork_org}"
- ohai fork_message
- "FORK_URL"
+ begin
+ remote_url, username = forked_repo_info!(tap_remote_repo, org: args.fork_org)
+ rescue *API::ERRORS => e
+ sourcefile_path.atomic_write(old_contents)
+ odie "Unable to fork: #{e.message}!"
+ end
end
- ohai "git checkout --no-track -b #{branch} #{remote}/#{remote_branch}"
- ohai "git fetch --unshallow origin" if shallow
- ohai "git add #{changed_files.join(" ")}"
- ohai "git commit --no-edit --verbose --message='#{commit_message}' " \
- "-- #{changed_files.join(" ")}"
- ohai "git push --set-upstream #{remote_url} #{branch}:#{branch}"
- ohai "git checkout --quiet #{previous_branch}"
- ohai "create pull request with GitHub API (base branch: #{remote_branch})"
- else
- safe_system "git", "add", *changed_files
- Utils::Git.set_name_email!
- safe_system "git", "commit", "--no-edit", "--verbose",
- "--message=#{commit_message}",
- "--", *changed_files
+
+ safe_system "git", "fetch", "--unshallow", "origin" if shallow
end
- end
- end
- return if args.commit?
+ safe_system "git", "add", *changed_files
+ safe_system "git", "checkout", "--no-track", "-b", branch, "#{remote}/#{remote_branch}" unless args.commit?
+ Utils::Git.set_name_email!
+ safe_system "git", "commit", "--no-edit", "--verbose",
+ "--message=#{commit_message}",
+ "--", *changed_files
+ return if args.commit?
- tap.path.cd do
- system_command!("git", args: ["push", "--set-upstream", remote_url, "#{branch}:#{branch}"],
- print_stdout: true)
- safe_system "git", "checkout", "--quiet", previous_branch
- pr_message = <<~EOS
- #{pr_message}
- EOS
- user_message = args.message
- if user_message
+ system_command!("git", args: ["push", "--set-upstream", remote_url, "#{branch}:#{branch}"],
+ print_stdout: true)
+ safe_system "git", "checkout", "--quiet", previous_branch
pr_message = <<~EOS
- #{user_message}
-
- ---
-
#{pr_message}
EOS
- end
+ user_message = args.message
+ if user_message
+ pr_message = <<~EOS
+ #{user_message}
- begin
- url = create_pull_request(tap_remote_repo, pr_title,
- "#{username}:#{branch}", remote_branch, pr_message)["html_url"]
- if args.no_browse?
- puts url
- else
- exec_browser url
+ ---
+
+ #{pr_message}
+ EOS
end
- rescue *API::ERRORS => e
- commits.each do |commit|
- commit[:sourcefile_path].atomic_write(commit[:old_contents])
+
+ begin
+ url = create_pull_request(tap_remote_repo, commit_message,
+ "#{username}:#{branch}", remote_branch, pr_message)["html_url"]
+ if args.no_browse?
+ puts url
+ else
+ exec_browser url
+ end
+ rescue *API::ERRORS => e
+ odie "Unable to open pull request: #{e.message}!"
end
- odie "Unable to open pull request: #{e.message}!"
end
end
end