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

Merge pull request #9412 from Homebrew/revert-9385-add-flag-to-deps-command

Browse Source 
Revert "add two flag to deps --installed"
This commit is contained in:
Rylan Polster 2020-12-03 16:09:45 -05:00 committed by GitHub
commit 01fb30c0b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Library/Homebrew/cmd/deps.rb
View File

@ -57,15 +57,8 @@ module Homebrew
description: "Switch into the mode used by the `--all` option, but only list dependencies "\ description: "Switch into the mode used by the `--all` option, but only list dependencies "\
"for each provided <formula>, one formula per line. This is used for "\ "for each provided <formula>, one formula per line. This is used for "\
"debugging the `--installed`/`--all` display mode." "debugging the `--installed`/`--all` display mode."
switch "--formula", "--formulae",
depends_on: "--installed",
description: "Treat all named arguments as formulae."
switch "--cask", "--casks",
depends_on: "--installed",
description: "Treat all named arguments as casks."
conflicts "--installed", "--all" conflicts "--installed", "--all"
conflicts "--formula", "--cask"
formula_options formula_options
end end
end end
@ -89,13 +82,7 @@ module Homebrew
dependents = if args.named.present? dependents = if args.named.present?
sorted_dependents(args.named.to_formulae_and_casks) sorted_dependents(args.named.to_formulae_and_casks)
elsif args.installed? elsif args.installed?
if args.formula? && !args.cask? sorted_dependents(Formula.installed + Cask::Caskroom.casks(config: Cask::Config.from_args(args)))
sorted_dependents(Formula.installed)
elsif args.cask? && !args.formula?
sorted_dependents(Cask::Caskroom.casks(config: Cask::Config.from_args(args)))
else
sorted_dependents(Formula.installed + Cask::Caskroom.casks(config: Cask::Config.from_args(args)))
end
else else
raise FormulaUnspecifiedError raise FormulaUnspecifiedError
end end
@ -113,14 +100,8 @@ module Homebrew
if args.no_named? if args.no_named?
raise FormulaUnspecifiedError unless args.installed? raise FormulaUnspecifiedError unless args.installed?
sorted_dependents_formulae_and_casks = if args.formula? && !args.cask? puts_deps sorted_dependents(Formula.installed + Cask::Caskroom.casks(config: Cask::Config.from_args(args))),
sorted_dependents(Formula.installed) recursive: recursive, args: args
elsif args.cask? && !args.formula?
sorted_dependents(Cask::Caskroom.casks(config: Cask::Config.from_args(args)))
else
sorted_dependents(Formula.installed + Cask::Caskroom.casks(config: Cask::Config.from_args(args)))
end
pus_deps sorted_dependents_formulae_and_casks, recursive: recursive, args: args
return return
end end

4
docs/Manpage.md
View File

@ -129,10 +129,6 @@ show the intersection of dependencies for each formula.
List dependencies for all available formulae. List dependencies for all available formulae.
* `--for-each`: * `--for-each`:
Switch into the mode used by the `--all` option, but only list dependencies for each provided *`formula`*, one formula per line. This is used for debugging the `--installed`/`--all` display mode. Switch into the mode used by the `--all` option, but only list dependencies for each provided *`formula`*, one formula per line. This is used for debugging the `--installed`/`--all` display mode.
* `--formula`:
Treat all named arguments as formulae.
* `--cask`:
Treat all named arguments as casks.
### `desc` [*`options`*] (*`text`*|`/`*`text`*`/`|*`formula`*) ### `desc` [*`options`*] (*`text`*|`/`*`text`*`/`|*`formula`*)

8
manpages/brew.1
View File

@ -152,14 +152,6 @@ List dependencies for all available formulae\.
\fB\-\-for\-each\fR \fB\-\-for\-each\fR
Switch into the mode used by the \fB\-\-all\fR option, but only list dependencies for each provided \fIformula\fR, one formula per line\. This is used for debugging the \fB\-\-installed\fR/\fB\-\-all\fR display mode\. Switch into the mode used by the \fB\-\-all\fR option, but only list dependencies for each provided \fIformula\fR, one formula per line\. This is used for debugging the \fB\-\-installed\fR/\fB\-\-all\fR display mode\.
. .
.TP
\fB\-\-formula\fR
Treat all named arguments as formulae\.
.
.TP
\fB\-\-cask\fR
Treat all named arguments as casks\.
.
.SS "\fBdesc\fR [\fIoptions\fR] (\fItext\fR|\fB/\fR\fItext\fR\fB/\fR|\fIformula\fR)" .SS "\fBdesc\fR [\fIoptions\fR] (\fItext\fR|\fB/\fR\fItext\fR\fB/\fR|\fIformula\fR)"
Display \fIformula\fR\'s name and one\-line description\. Formula descriptions are cached; the cache is created on the first search, making that search slower than subsequent ones\. Display \fIformula\fR\'s name and one\-line description\. Formula descriptions are cached; the cache is created on the first search, making that search slower than subsequent ones\.
. .