From b607fb0712a4adb1ee2b26ce818c5f1fb68e027d Mon Sep 17 00:00:00 2001
From: Nanda H Krishna <me@nandahkrishna.com>
Date: Mon, 7 Jun 2021 15:13:29 +0530
Subject: [PATCH] `brew pr-{pull,upload}`: remove `--no-publish` flag

The `--no-publish` flag isn't used anywhere since we removed all the
Bintray code. Also, the `--no-upload` flag used in `pr-pull` doesn't
apply the bottle commit, so its description has been modified.
---
 Library/Homebrew/dev-cmd/pr-pull.rb   | 7 +------
 Library/Homebrew/dev-cmd/pr-upload.rb | 2 --
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Library/Homebrew/dev-cmd/pr-pull.rb b/Library/Homebrew/dev-cmd/pr-pull.rb
index 9c22f9cbcd..d4a0db16a2 100644
--- a/Library/Homebrew/dev-cmd/pr-pull.rb
+++ b/Library/Homebrew/dev-cmd/pr-pull.rb
@@ -20,12 +20,8 @@ module Homebrew
         pull request with artifacts generated by GitHub Actions.
         Requires write access to the repository.
       EOS
-      switch "--no-publish",
-             description: "Download the bottles, apply the bottle commit and "\
-                          "upload the bottles, but don't publish them."
       switch "--no-upload",
-             description: "Download the bottles and apply the bottle commit, "\
-                          "but don't upload."
+             description: "Download the bottles but don't upload them."
       switch "--no-commit",
              description: "Do not generate a new commit before uploading."
       switch "-n", "--dry-run",
@@ -406,7 +402,6 @@ module Homebrew
           upload_args << "--debug" if args.debug?
           upload_args << "--verbose" if args.verbose?
           upload_args << "--no-commit" if args.no_commit?
-          upload_args << "--no-publish" if args.no_publish?
           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?
diff --git a/Library/Homebrew/dev-cmd/pr-upload.rb b/Library/Homebrew/dev-cmd/pr-upload.rb
index 4607686504..4bf3333cbb 100644
--- a/Library/Homebrew/dev-cmd/pr-upload.rb
+++ b/Library/Homebrew/dev-cmd/pr-upload.rb
@@ -17,8 +17,6 @@ module Homebrew
       description <<~EOS
         Apply the bottle commit and publish bottles to a host.
       EOS
-      switch "--no-publish",
-             description: "Apply the bottle commit and upload the bottles, but don't publish them."
       switch "--keep-old",
              description: "If the formula specifies a rebuild version, " \
                           "attempt to preserve its value in the generated DSL."