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

pr-pull: pass --keep-old option to pr-upload

Browse Source 
also fix typo in `--root-url` option
This commit is contained in:
Dawid Dziurla 2020-08-14 13:40:21 +02:00
parent 0227ac5b11
commit d5c8f2e102
No known key found for this signature in database
GPG Key ID: 7B6D8368172E9B0B
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,9 @@ module Homebrew
description: "Print what would be done rather than doing it." description: "Print what would be done rather than doing it."
switch "--clean", switch "--clean",
description: "Do not amend the commits from pull requests." description: "Do not amend the commits from pull requests."
switch "--keep-old",
description: "If the formula specifies a rebuild version, " \
"attempt to preserve its value in the generated DSL."
switch "--branch-okay", switch "--branch-okay",
description: "Do not warn if pulling to a branch besides master (useful for testing)." description: "Do not warn if pulling to a branch besides master (useful for testing)."
switch "--resolve", switch "--resolve",
@ -262,8 +265,9 @@ module Homebrew
upload_args << "--verbose" if args.verbose? upload_args << "--verbose" if args.verbose?
upload_args << "--no-publish" if args.no_publish? upload_args << "--no-publish" if args.no_publish?
upload_args << "--dry-run" if args.dry_run? upload_args << "--dry-run" if args.dry_run?
upload_args << "--keep-old" if args.keep_old?
upload_args << "--warn-on-upload-failure" if args.warn_on_upload_failure? upload_args << "--warn-on-upload-failure" if args.warn_on_upload_failure?
upload_args << "--root_url=#{args.root_url}" if args.root_url upload_args << "--root-url=#{args.root_url}" if args.root_url
upload_args << "--bintray-org=#{bintray_org}" upload_args << "--bintray-org=#{bintray_org}"
safe_system HOMEBREW_BREW_FILE, *upload_args safe_system HOMEBREW_BREW_FILE, *upload_args
end end

2
docs/Manpage.md
View File

@ -1034,6 +1034,8 @@ Requires write access to the repository.
Print what would be done rather than doing it. Print what would be done rather than doing it.
* `--clean`: * `--clean`:
Do not amend the commits from pull requests. Do not amend the commits from pull requests.
* `--keep-old`:
If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL.
* `--branch-okay`: * `--branch-okay`:
Do not warn if pulling to a branch besides master (useful for testing). Do not warn if pulling to a branch besides master (useful for testing).
* `--resolve`: * `--resolve`:

4
manpages/brew.1
View File

@ -1424,6 +1424,10 @@ Print what would be done rather than doing it\.
Do not amend the commits from pull requests\. Do not amend the commits from pull requests\.
. .
.TP .TP
\fB\-\-keep\-old\fR
If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL\.
.
.TP
\fB\-\-branch\-okay\fR \fB\-\-branch\-okay\fR
Do not warn if pulling to a branch besides master (useful for testing)\. Do not warn if pulling to a branch besides master (useful for testing)\.
. .