From 9d6874e745d32274aa7c52754208db09df9b0f93 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Tue, 28 Mar 2023 14:29:30 +0000 Subject: [PATCH] Update manpage and completions. Autogenerated by the [sponsors-maintainers-man-completions](https://github.com/Homebrew/brew/blob/HEAD/.github/workflows/sponsors-maintainers-man-completions.yml) workflow. --- completions/bash/brew | 8 +++++--- completions/fish/brew.fish | 12 +++++++----- completions/zsh/_brew | 18 ++++++++++-------- docs/Manpage.md | 20 ++++++++++++-------- manpages/brew.1 | 24 ++++++++++++++++-------- 5 files changed, 50 insertions(+), 32 deletions(-) diff --git a/completions/bash/brew b/completions/bash/brew index 75de306c45..e1af35f25e 100644 --- a/completions/bash/brew +++ b/completions/bash/brew @@ -1661,10 +1661,10 @@ _brew_pr_automerge() { case "${cur}" in -*) __brewcomp " + --autosquash --debug --help --ignore-failures - --no-autosquash --publish --quiet --tap @@ -1685,11 +1685,13 @@ _brew_pr_publish() { case "${cur}" in -*) __brewcomp " + --autosquash --branch + --commit-bottles-to-pr-branch --debug --help + --large-runner --message - --no-autosquash --quiet --tap --verbose @@ -1707,6 +1709,7 @@ _brew_pr_pull() { -*) __brewcomp " --artifact + --autosquash --branch-okay --clean --committer @@ -1716,7 +1719,6 @@ _brew_pr_pull() { --ignore-missing-artifacts --keep-old --message - --no-autosquash --no-cherry-pick --no-commit --no-upload diff --git a/completions/fish/brew.fish b/completions/fish/brew.fish index 7d356fdb41..c32373fd34 100644 --- a/completions/fish/brew.fish +++ b/completions/fish/brew.fish @@ -1142,26 +1142,28 @@ __fish_brew_complete_arg 'postinstall' -a '(__fish_brew_suggest_formulae_install __fish_brew_complete_cmd 'pr-automerge' 'Find pull requests that can be automatically merged using `brew pr-publish`' +__fish_brew_complete_arg 'pr-automerge' -l autosquash -d 'Instruct `brew pr-publish` to automatically reformat and reword commits in the pull request to the preferred format' __fish_brew_complete_arg 'pr-automerge' -l debug -d 'Display any debugging information' __fish_brew_complete_arg 'pr-automerge' -l help -d 'Show this message' __fish_brew_complete_arg 'pr-automerge' -l ignore-failures -d 'Include pull requests that have failing status checks' -__fish_brew_complete_arg 'pr-automerge' -l no-autosquash -d 'Instruct `brew pr-publish` to skip automatically reformatting and rewording commits in the pull request to the preferred format' __fish_brew_complete_arg 'pr-automerge' -l publish -d 'Run `brew pr-publish` on matching pull requests' __fish_brew_complete_arg 'pr-automerge' -l quiet -d 'Make some output more quiet' __fish_brew_complete_arg 'pr-automerge' -l tap -d 'Target tap repository (default: `homebrew/core`)' __fish_brew_complete_arg 'pr-automerge' -l verbose -d 'Make some output more verbose' __fish_brew_complete_arg 'pr-automerge' -l with-label -d 'Pull requests must have this label' __fish_brew_complete_arg 'pr-automerge' -l without-approval -d 'Pull requests do not require approval to be merged' -__fish_brew_complete_arg 'pr-automerge' -l without-labels -d 'Pull requests must not have these labels (default: `do not merge`, `new formula`, `automerge-skip`)' +__fish_brew_complete_arg 'pr-automerge' -l without-labels -d 'Pull requests must not have these labels (default: `do not merge`, `new formula`, `automerge-skip`, `CI-published-bottle-commits`)' __fish_brew_complete_arg 'pr-automerge' -l workflow -d 'Workflow file to use with `brew pr-publish`' __fish_brew_complete_cmd 'pr-publish' 'Publish bottles for a pull request with GitHub Actions' -__fish_brew_complete_arg 'pr-publish' -l branch -d 'Branch to publish to (default: `master`)' +__fish_brew_complete_arg 'pr-publish' -l autosquash -d 'If supported on the target tap, automatically reformat and reword commits to our preferred format' +__fish_brew_complete_arg 'pr-publish' -l branch -d 'Branch to use the workflow from (default: `master`)' +__fish_brew_complete_arg 'pr-publish' -l commit-bottles-to-pr-branch -d 'Push bottle commits to the pull request branch' __fish_brew_complete_arg 'pr-publish' -l debug -d 'Display any debugging information' __fish_brew_complete_arg 'pr-publish' -l help -d 'Show this message' +__fish_brew_complete_arg 'pr-publish' -l large-runner -d 'Run the upload job on a large runner' __fish_brew_complete_arg 'pr-publish' -l message -d 'Message to include when autosquashing revision bumps, deletions, and rebuilds' -__fish_brew_complete_arg 'pr-publish' -l no-autosquash -d 'Skip automatically reformatting and rewording commits in the pull request to the preferred format, even if supported on the target tap' __fish_brew_complete_arg 'pr-publish' -l quiet -d 'Make some output more quiet' __fish_brew_complete_arg 'pr-publish' -l tap -d 'Target tap repository (default: `homebrew/core`)' __fish_brew_complete_arg 'pr-publish' -l verbose -d 'Make some output more verbose' @@ -1170,6 +1172,7 @@ __fish_brew_complete_arg 'pr-publish' -l workflow -d 'Target workflow filename ( __fish_brew_complete_cmd 'pr-pull' 'Download and publish bottles, and apply the bottle commit from a pull request with artifacts generated by GitHub Actions' __fish_brew_complete_arg 'pr-pull' -l artifact -d 'Download artifacts with the specified name (default: `bottles`)' +__fish_brew_complete_arg 'pr-pull' -l autosquash -d 'Automatically reformat and reword commits in the pull request to our preferred format' __fish_brew_complete_arg 'pr-pull' -l branch-okay -d 'Do not warn if pulling to a branch besides the repository default (useful for testing)' __fish_brew_complete_arg 'pr-pull' -l clean -d 'Do not amend the commits from pull requests' __fish_brew_complete_arg 'pr-pull' -l committer -d 'Specify a committer name and email in `git`\'s standard author format' @@ -1179,7 +1182,6 @@ __fish_brew_complete_arg 'pr-pull' -l help -d 'Show this message' __fish_brew_complete_arg 'pr-pull' -l ignore-missing-artifacts -d 'Comma-separated list of workflows which can be ignored if they have not been run' __fish_brew_complete_arg 'pr-pull' -l keep-old -d 'If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL' __fish_brew_complete_arg 'pr-pull' -l message -d 'Message to include when autosquashing revision bumps, deletions, and rebuilds' -__fish_brew_complete_arg 'pr-pull' -l no-autosquash -d 'Skip automatically reformatting and rewording commits in the pull request to our preferred format' __fish_brew_complete_arg 'pr-pull' -l no-cherry-pick -d 'Do not cherry-pick commits from the pull request branch' __fish_brew_complete_arg 'pr-pull' -l no-commit -d 'Do not generate a new commit before uploading' __fish_brew_complete_arg 'pr-pull' -l no-upload -d 'Download the bottles but don\'t upload them' diff --git a/completions/zsh/_brew b/completions/zsh/_brew index b1f72effb8..0670703170 100644 --- a/completions/zsh/_brew +++ b/completions/zsh/_brew @@ -1403,28 +1403,30 @@ _brew_postinstall() { # brew pr-automerge _brew_pr_automerge() { _arguments \ + '--autosquash[Instruct `brew pr-publish` to automatically reformat and reword commits in the pull request to the preferred format]' \ '--debug[Display any debugging information]' \ '--help[Show this message]' \ '--ignore-failures[Include pull requests that have failing status checks]' \ - '--no-autosquash[Instruct `brew pr-publish` to skip automatically reformatting and rewording commits in the pull request to the preferred format]' \ '--publish[Run `brew pr-publish` on matching pull requests]' \ '--quiet[Make some output more quiet]' \ '--tap[Target tap repository (default: `homebrew/core`)]' \ '--verbose[Make some output more verbose]' \ '--with-label[Pull requests must have this label]' \ '--without-approval[Pull requests do not require approval to be merged]' \ - '--without-labels[Pull requests must not have these labels (default: `do not merge`, `new formula`, `automerge-skip`)]' \ + '--without-labels[Pull requests must not have these labels (default: `do not merge`, `new formula`, `automerge-skip`, `CI-published-bottle-commits`)]' \ '--workflow[Workflow file to use with `brew pr-publish`]' } # brew pr-publish _brew_pr_publish() { _arguments \ - '--branch[Branch to publish to (default: `master`)]' \ + '(--clean)--autosquash[If supported on the target tap, automatically reformat and reword commits to our preferred format]' \ + '--branch[Branch to use the workflow from (default: `master`)]' \ + '--commit-bottles-to-pr-branch[Push bottle commits to the pull request branch]' \ '--debug[Display any debugging information]' \ '--help[Show this message]' \ - '(--no-autosquash)--message[Message to include when autosquashing revision bumps, deletions, and rebuilds]' \ - '(--message)--no-autosquash[Skip automatically reformatting and rewording commits in the pull request to the preferred format, even if supported on the target tap]' \ + '--large-runner[Run the upload job on a large runner]' \ + '--message[Message to include when autosquashing revision bumps, deletions, and rebuilds]' \ '--quiet[Make some output more quiet]' \ '--tap[Target tap repository (default: `homebrew/core`)]' \ '--verbose[Make some output more verbose]' \ @@ -1435,16 +1437,16 @@ _brew_pr_publish() { _brew_pr_pull() { _arguments \ '--artifact[Download artifacts with the specified name (default: `bottles`)]' \ + '(--clean)--autosquash[Automatically reformat and reword commits in the pull request to our preferred format]' \ '--branch-okay[Do not warn if pulling to a branch besides the repository default (useful for testing)]' \ - '--clean[Do not amend the commits from pull requests]' \ + '(--autosquash)--clean[Do not amend the commits from pull requests]' \ '--committer[Specify a committer name and email in `git`'\''s standard author format]' \ '--debug[Display any debugging information]' \ '--dry-run[Print what would be done rather than doing it]' \ '--help[Show this message]' \ '--ignore-missing-artifacts[Comma-separated list of workflows which can be ignored if they have not been run]' \ '--keep-old[If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL]' \ - '(--no-autosquash)--message[Message to include when autosquashing revision bumps, deletions, and rebuilds]' \ - '(--message)--no-autosquash[Skip automatically reformatting and rewording commits in the pull request to our preferred format]' \ + '--message[Message to include when autosquashing revision bumps, deletions, and rebuilds]' \ '--no-cherry-pick[Do not cherry-pick commits from the pull request branch]' \ '--no-commit[Do not generate a new commit before uploading]' \ '--no-upload[Download the bottles but don'\''t upload them]' \ diff --git a/docs/Manpage.md b/docs/Manpage.md index 36eb479ddd..fb5a03226d 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -1330,13 +1330,13 @@ Find pull requests that can be automatically merged using `brew pr-publish`. * `--with-label`: Pull requests must have this label. * `--without-labels`: - Pull requests must not have these labels (default: `do not merge`, `new formula`, `automerge-skip`). + Pull requests must not have these labels (default: `do not merge`, `new formula`, `automerge-skip`, `CI-published-bottle-commits`). * `--without-approval`: Pull requests do not require approval to be merged. * `--publish`: Run `brew pr-publish` on matching pull requests. -* `--no-autosquash`: - Instruct `brew pr-publish` to skip automatically reformatting and rewording commits in the pull request to the preferred format. +* `--autosquash`: + Instruct `brew pr-publish` to automatically reformat and reword commits in the pull request to the preferred format. * `--ignore-failures`: Include pull requests that have failing status checks. @@ -1345,10 +1345,14 @@ Find pull requests that can be automatically merged using `brew pr-publish`. Publish bottles for a pull request with GitHub Actions. Requires write access to the repository. -* `--no-autosquash`: - Skip automatically reformatting and rewording commits in the pull request to the preferred format, even if supported on the target tap. +* `--commit-bottles-to-pr-branch`: + Push bottle commits to the pull request branch. +* `--autosquash`: + If supported on the target tap, automatically reformat and reword commits to our preferred format. +* `--large-runner`: + Run the upload job on a large runner. * `--branch`: - Branch to publish to (default: `master`). + Branch to use the workflow from (default: `master`). * `--message`: Message to include when autosquashing revision bumps, deletions, and rebuilds. * `--tap`: @@ -1374,8 +1378,8 @@ Requires write access to the repository. 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. -* `--no-autosquash`: - Skip automatically reformatting and rewording commits in the pull request to our preferred format. +* `--autosquash`: + Automatically reformat and reword commits in the pull request to our preferred format. * `--branch-okay`: Do not warn if pulling to a branch besides the repository default (useful for testing). * `--resolve`: diff --git a/manpages/brew.1 b/manpages/brew.1 index 8d3e4f84a1..34c40c8408 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1898,7 +1898,7 @@ Pull requests must have this label\. . .TP \fB\-\-without\-labels\fR -Pull requests must not have these labels (default: \fBdo not merge\fR, \fBnew formula\fR, \fBautomerge\-skip\fR)\. +Pull requests must not have these labels (default: \fBdo not merge\fR, \fBnew formula\fR, \fBautomerge\-skip\fR, \fBCI\-published\-bottle\-commits\fR)\. . .TP \fB\-\-without\-approval\fR @@ -1909,8 +1909,8 @@ Pull requests do not require approval to be merged\. Run \fBbrew pr\-publish\fR on matching pull requests\. . .TP -\fB\-\-no\-autosquash\fR -Instruct \fBbrew pr\-publish\fR to skip automatically reformatting and rewording commits in the pull request to the preferred format\. +\fB\-\-autosquash\fR +Instruct \fBbrew pr\-publish\fR to automatically reformat and reword commits in the pull request to the preferred format\. . .TP \fB\-\-ignore\-failures\fR @@ -1920,12 +1920,20 @@ Include pull requests that have failing status checks\. Publish bottles for a pull request with GitHub Actions\. Requires write access to the repository\. . .TP -\fB\-\-no\-autosquash\fR -Skip automatically reformatting and rewording commits in the pull request to the preferred format, even if supported on the target tap\. +\fB\-\-commit\-bottles\-to\-pr\-branch\fR +Push bottle commits to the pull request branch\. +. +.TP +\fB\-\-autosquash\fR +If supported on the target tap, automatically reformat and reword commits to our preferred format\. +. +.TP +\fB\-\-large\-runner\fR +Run the upload job on a large runner\. . .TP \fB\-\-branch\fR -Branch to publish to (default: \fBmaster\fR)\. +Branch to use the workflow from (default: \fBmaster\fR)\. . .TP \fB\-\-message\fR @@ -1967,8 +1975,8 @@ Do not amend the commits from pull requests\. If the formula specifies a rebuild version, attempt to preserve its value in the generated DSL\. . .TP -\fB\-\-no\-autosquash\fR -Skip automatically reformatting and rewording commits in the pull request to our preferred format\. +\fB\-\-autosquash\fR +Automatically reformat and reword commits in the pull request to our preferred format\. . .TP \fB\-\-branch\-okay\fR