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

Merge pull request #3398 from MikeMcQuaid/hub-no-browse

Browse Source 
bump-formula-pr: add --no-browse option.
This commit is contained in:
Mike McQuaid 2017-10-30 09:39:54 +00:00 committed by GitHub
commit 6c9ff7f642
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,10 @@
#: If `--message=`<message> is passed, append <message> to the default PR #: If `--message=`<message> is passed, append <message> to the default PR
#: message. #: message.
#: #:
#: If `--no-browse` is passed, don't pass the `--browse` argument to `hub`
#: which opens the pull request URL in a browser. Instead, output it to the
#: command line.
#:
#: Note that this command cannot be used to transition a formula from a #: Note that this command cannot be used to transition a formula from a
#: URL-and-sha256 style specification into a tag-and-revision style #: URL-and-sha256 style specification into a tag-and-revision style
#: specification, nor vice versa. It must use whichever style specification #: specification, nor vice versa. It must use whichever style specification
@ -297,13 +301,21 @@ module Homebrew
git_dir = Utils.popen_read("git rev-parse --git-dir").chomp git_dir = Utils.popen_read("git rev-parse --git-dir").chomp
shallow = !git_dir.empty? && File.exist?("#{git_dir}/shallow") shallow = !git_dir.empty? && File.exist?("#{git_dir}/shallow")
hub_args = []
git_final_checkout_args = []
if ARGV.include?("--no-browse")
git_final_checkout_args << "--quiet"
else
hub_args << "--browse"
end
if ARGV.dry_run? if ARGV.dry_run?
ohai "git fetch --unshallow origin" if shallow ohai "git fetch --unshallow origin" if shallow
ohai "git checkout --no-track -b #{branch} origin/master" ohai "git checkout --no-track -b #{branch} origin/master"
ohai "git commit --no-edit --verbose --message='#{formula.name} #{new_formula_version}#{devel_message}' -- #{formula.path}" ohai "git commit --no-edit --verbose --message='#{formula.name} #{new_formula_version}#{devel_message}' -- #{formula.path}"
ohai "hub fork # read $HUB_REMOTE" ohai "hub fork # read $HUB_REMOTE"
ohai "git push --set-upstream $HUB_REMOTE #{branch}:#{branch}" ohai "git push --set-upstream $HUB_REMOTE #{branch}:#{branch}"
ohai "hub pull-request --browse -m '#{formula.name} #{new_formula_version}#{devel_message}'" ohai "hub pull-request #{hub_args.join(" ")} -m '#{formula.name} #{new_formula_version}#{devel_message}'"
ohai "git checkout -" ohai "git checkout -"
else else
safe_system "git", "fetch", "--unshallow", "origin" if shallow safe_system "git", "fetch", "--unshallow", "origin" if shallow
@ -328,8 +340,8 @@ module Homebrew
#{user_message} #{user_message}
EOS EOS
end end
safe_system "hub", "pull-request", "--browse", "-m", pr_message safe_system "hub", "pull-request", *hub_args, "-m", pr_message
safe_system "git", "checkout", "-" safe_system "git", "checkout", *git_final_checkout_args, "-"
end end
end end
end end

4
docs/Manpage.md
View File

@ -726,6 +726,10 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
If `--message=``message` is passed, append `message` to the default PR If `--message=``message` is passed, append `message` to the default PR
message. message.
If `--no-browse` is passed, don't pass the `--browse` argument to `hub`
which opens the pull request URL in a browser. Instead, output it to the
command line.
Note that this command cannot be used to transition a formula from a Note that this command cannot be used to transition a formula from a
URL-and-sha256 style specification into a tag-and-revision style URL-and-sha256 style specification into a tag-and-revision style
specification, nor vice versa. It must use whichever style specification specification, nor vice versa. It must use whichever style specification

3
manpages/brew.1
View File

@ -757,6 +757,9 @@ If \fB\-\-version=\fR\fIversion\fR is passed, use the value to override the valu
If \fB\-\-message=\fR\fImessage\fR is passed, append \fImessage\fR to the default PR message\. If \fB\-\-message=\fR\fImessage\fR is passed, append \fImessage\fR to the default PR message\.
. .
.IP .IP
If \fB\-\-no\-browse\fR is passed, don\'t pass the \fB\-\-browse\fR argument to \fBhub\fR which opens the pull request URL in a browser\. Instead, output it to the command line\.
.
.IP
Note that this command cannot be used to transition a formula from a URL\-and\-sha256 style specification into a tag\-and\-revision style specification, nor vice versa\. It must use whichever style specification the preexisting formula already uses\. Note that this command cannot be used to transition a formula from a URL\-and\-sha256 style specification into a tag\-and\-revision style specification, nor vice versa\. It must use whichever style specification the preexisting formula already uses\.
. .
.TP .TP