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

Merge pull request #9424 from EricFromCanada/flag-replacement

Browse Source 
pr-pull: prepare replacement for --workflow flag
This commit is contained in:
Mike McQuaid 2020-12-14 12:44:26 +00:00 committed by GitHub
commit 1a52862e6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/cli/parser.rb
View File

@ -194,7 +194,7 @@ module Homebrew
end
end
def flag(*names, description: nil, required_for: nil, depends_on: nil)
def flag(*names, description: nil, replacement: nil, required_for: nil, depends_on: nil)
required = if names.any? { |name| name.end_with? "=" }
OptionParser::REQUIRED_ARGUMENT
else
@ -202,8 +202,13 @@ module Homebrew
end
names.map! { |name| name.chomp "=" }
description = option_to_description(*names) if description.nil?
process_option(*names, description)
if replacement.nil?
process_option(*names, description)
else
description += " (disabled#{"; replaced by #{replacement}" if replacement.present?})"
end
@parser.on(*names, *wrap_option_desc(description), required) do |option_value|
odisabled "the `#{names.first}` flag", replacement unless replacement.nil?
names.each do |name|
@args[option_to_name(name)] = option_value
end

4
Library/Homebrew/dev-cmd/pr-pull.rb
View File

@ -51,7 +51,9 @@ module Homebrew
description: "Message to include when autosquashing revision bumps, deletions, and rebuilds."
flag "--workflow=",
description: "Retrieve artifacts from the specified workflow (default: `tests.yml`). "\
"Legacy: use --workflows instead"
"*Legacy:* use `--workflows` instead."
# TODO: enable for next major/minor release
# replacement: "`--workflows`"
flag "--artifact=",
description: "Download artifacts with the specified name (default: `bottles`)."
flag "--bintray-org=",

2
docs/Manpage.md
View File

@ -1151,7 +1151,7 @@ Requires write access to the repository.
* `--message`:
Message to include when autosquashing revision bumps, deletions, and rebuilds.
* `--workflow`:
Retrieve artifacts from the specified workflow (default: `tests.yml`). Legacy: use --workflows instead
Retrieve artifacts from the specified workflow (default: `tests.yml`). *Legacy:* use `--workflows` instead.
* `--artifact`:
Download artifacts with the specified name (default: `bottles`).
* `--bintray-org`:

2
manpages/brew.1
View File

@ -1605,7 +1605,7 @@ Message to include when autosquashing revision bumps, deletions, and rebuilds\.
.
.TP
\fB\-\-workflow\fR
Retrieve artifacts from the specified workflow (default: \fBtests\.yml\fR)\. Legacy: use \-\-workflows instead
Retrieve artifacts from the specified workflow (default: \fBtests\.yml\fR)\. \fILegacy:\fR use \fB\-\-workflows\fR instead\.
.
.TP
\fB\-\-artifact\fR