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

Merge pull request #12223 from Moisan/bump-formula-pr_write-only

Browse Source 
Deprecate --write in bump-formula-pr command in favour of --write-only
This commit is contained in:
Mike McQuaid 2021-10-13 01:03:37 +01:00 committed by GitHub
commit 2af9a2659a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/dev-cmd/bump-formula-pr.rb
View File

@ -34,11 +34,12 @@ module Homebrew
EOS EOS
switch "-n", "--dry-run", switch "-n", "--dry-run",
description: "Print what would be done rather than doing it." description: "Print what would be done rather than doing it."
switch "--write", switch "--write-only",
description: "Make the expected file modifications without taking any Git actions." description: "Make the expected file modifications without taking any Git actions."
switch "--write", hidden: true
switch "--commit", switch "--commit",
depends_on: "--write", depends_on: "--write-only",
description: "When passed with `--write`, generate a new commit after writing changes "\ description: "When passed with `--write-only`, generate a new commit after writing changes "\
"to the formula file." "to the formula file."
switch "--no-audit", switch "--no-audit",
description: "Don't run `brew audit` before opening the PR." description: "Don't run `brew audit` before opening the PR."
@ -75,6 +76,7 @@ module Homebrew
switch "-f", "--force", switch "-f", "--force",
description: "Ignore duplicate open PRs. Remove all mirrors if `--mirror` was not specified." description: "Ignore duplicate open PRs. Remove all mirrors if `--mirror` was not specified."
conflicts "--dry-run", "--write-only"
conflicts "--dry-run", "--write" conflicts "--dry-run", "--write"
conflicts "--no-audit", "--strict" conflicts "--no-audit", "--strict"
conflicts "--no-audit", "--online" conflicts "--no-audit", "--online"
@ -98,7 +100,7 @@ module Homebrew
formula_path = formula.path.relative_path_from(formula.tap.path) formula_path = formula.path.relative_path_from(formula.tap.path)
full_origin_branch = "#{homebrew_core_remote}/#{default_origin_branch}" full_origin_branch = "#{homebrew_core_remote}/#{default_origin_branch}"
if args.dry_run? || args.write? if args.dry_run? || args.write? || args.write_only?
ohai "git remote add #{homebrew_core_remote} #{homebrew_core_url}" ohai "git remote add #{homebrew_core_remote} #{homebrew_core_url}"
ohai "git fetch #{homebrew_core_remote} HEAD #{default_origin_branch}" ohai "git fetch #{homebrew_core_remote} HEAD #{default_origin_branch}"
ohai "git cat-file -e #{full_origin_branch}:#{formula_path}" ohai "git cat-file -e #{full_origin_branch}:#{formula_path}"
@ -124,6 +126,9 @@ module Homebrew
def bump_formula_pr def bump_formula_pr
args = bump_formula_pr_args.parse args = bump_formula_pr_args.parse
# TODO: deprecate in Homebrew 3.3.0
# odeprecated "`brew bump-formula-pr --write`", "`brew bump-formula-pr --write-only`" if args.write?
if args.revision.present? && args.tag.nil? && args.version.nil? if args.revision.present? && args.tag.nil? && args.version.nil?
raise UsageError, "`--revision` must be passed with either `--tag` or `--version`!" raise UsageError, "`--revision` must be passed with either `--tag` or `--version`!"
end end