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

Merge pull request #7700 from MikeMcQuaid/deprecate-brew-pull

Browse Source 
dev-cmd/pull: deprecate.
This commit is contained in:
Mike McQuaid 2020-06-05 09:32:32 +01:00 committed by GitHub
commit 6eeb3086c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/dev-cmd/pull.rb
View File

@ -15,6 +15,7 @@ module Homebrew
def pull_args def pull_args
Homebrew::CLI::Parser.new do Homebrew::CLI::Parser.new do
hide_from_man_page!
usage_banner <<~EOS usage_banner <<~EOS
`pull` [<options>] <patch> `pull` [<options>] <patch>
@ -43,6 +44,8 @@ module Homebrew
end end
def pull def pull
odeprecated "brew pull", "hub checkout"
odie "You meant `git pull --rebase`." if ARGV[0] == "--rebase" odie "You meant `git pull --rebase`." if ARGV[0] == "--rebase"
pull_args.parse pull_args.parse

20
docs/Manpage.md
View File

@ -917,26 +917,6 @@ Apply the bottle commit and publish bottles to Bintray.
Run Homebrew with the Ruby profiler, e.g. `brew prof readall`. Run Homebrew with the Ruby profiler, e.g. `brew prof readall`.
### `pull` [*`options`*] *`patch`*
Get a patch from a GitHub commit or pull request and apply it to Homebrew.
Each *`patch`* may be the number of a pull request in `homebrew/core` or the URL
of any pull request or commit on GitHub.
* `--bump`:
For one-formula PRs, automatically reword commit message to our preferred format.
* `--clean`:
Do not rewrite or otherwise modify the commits found in the pulled PR.
* `--ignore-whitespace`:
Silently ignore whitespace discrepancies when applying diffs.
* `--resolve`:
When a patch fails to apply, leave in progress and allow user to resolve, instead of aborting.
* `--branch-okay`:
Do not warn if pulling to a branch besides master (useful for testing).
* `--no-pbcopy`:
Do not copy anything to the system clipboard.
### `release-notes` [*`options`*] [*`previous_tag`*] [*`end_ref`*] ### `release-notes` [*`options`*] [*`previous_tag`*] [*`end_ref`*]
Print the merged pull requests on Homebrew/brew between two Git refs. If no Print the merged pull requests on Homebrew/brew between two Git refs. If no

2
manpages/brew-cask.1
View File

@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3 .\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3
. .
.TH "BREW\-CASK" "1" "May 2020" "Homebrew" "brew-cask" .TH "BREW\-CASK" "1" "June 2020" "Homebrew" "brew-cask"
. .
.SH "NAME" .SH "NAME"
\fBbrew\-cask\fR \- a friendly binary installer for macOS \fBbrew\-cask\fR \- a friendly binary installer for macOS

32
manpages/brew.1
View File

@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3 .\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3
. .
.TH "BREW" "1" "May 2020" "Homebrew" "brew" .TH "BREW" "1" "June 2020" "Homebrew" "brew"
. .
.SH "NAME" .SH "NAME"
\fBbrew\fR \- The Missing Package Manager for macOS \fBbrew\fR \- The Missing Package Manager for macOS
@ -1189,36 +1189,6 @@ Use the specified \fIURL\fR as the root of the bottle\'s URL instead of Homebrew
.SS "\fBprof\fR \fIcommand\fR" .SS "\fBprof\fR \fIcommand\fR"
Run Homebrew with the Ruby profiler, e\.g\. \fBbrew prof readall\fR\. Run Homebrew with the Ruby profiler, e\.g\. \fBbrew prof readall\fR\.
. .
.SS "\fBpull\fR [\fIoptions\fR] \fIpatch\fR"
Get a patch from a GitHub commit or pull request and apply it to Homebrew\.
.
.P
Each \fIpatch\fR may be the number of a pull request in \fBhomebrew/core\fR or the URL of any pull request or commit on GitHub\.
.
.TP
\fB\-\-bump\fR
For one\-formula PRs, automatically reword commit message to our preferred format\.
.
.TP
\fB\-\-clean\fR
Do not rewrite or otherwise modify the commits found in the pulled PR\.
.
.TP
\fB\-\-ignore\-whitespace\fR
Silently ignore whitespace discrepancies when applying diffs\.
.
.TP
\fB\-\-resolve\fR
When a patch fails to apply, leave in progress and allow user to resolve, instead of aborting\.
.
.TP
\fB\-\-branch\-okay\fR
Do not warn if pulling to a branch besides master (useful for testing)\.
.
.TP
\fB\-\-no\-pbcopy\fR
Do not copy anything to the system clipboard\.
.
.SS "\fBrelease\-notes\fR [\fIoptions\fR] [\fIprevious_tag\fR] [\fIend_ref\fR]" .SS "\fBrelease\-notes\fR [\fIoptions\fR] [\fIprevious_tag\fR] [\fIend_ref\fR]"
Print the merged pull requests on Homebrew/brew between two Git refs\. If no \fIprevious_tag\fR is provided it defaults to the latest tag\. If no \fIend_ref\fR is provided it defaults to \fBorigin/master\fR\. Print the merged pull requests on Homebrew/brew between two Git refs\. If no \fIprevious_tag\fR is provided it defaults to the latest tag\. If no \fIend_ref\fR is provided it defaults to \fBorigin/master\fR\.
. .