From 080bd8bd4a0723c585984509aa3ed257b094c4f2 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Sun, 18 Jul 2021 05:27:07 +0800 Subject: [PATCH 1/6] dev-cmd/pr-publish: pass `--autosquash` by default It's too easy to forget to, and the consequences of forgetting to pass `--autosquash` are worse (i.e. almost always permanent) than forgetting to pass `--no-autosquash` (i.e. just do `pr-publish --no-autosquash` when your command fails). See the discussion at Homebrew/homebrew-core#80717. --- Library/Homebrew/dev-cmd/pr-publish.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/pr-publish.rb b/Library/Homebrew/dev-cmd/pr-publish.rb index c13ad95a6..5126e8315 100644 --- a/Library/Homebrew/dev-cmd/pr-publish.rb +++ b/Library/Homebrew/dev-cmd/pr-publish.rb @@ -19,6 +19,9 @@ module Homebrew switch "--autosquash", description: "If supported on the target tap, automatically reformat and reword commits "\ "in the pull request to our preferred format." + switch "--no-autosquash", + description: "Skip automatically reformatting and rewording commits in the pull request "\ + "to the preferred format, even if supported on the target tap." flag "--branch=", description: "Branch to publish to (default: `master`)." flag "--message=", @@ -40,8 +43,10 @@ module Homebrew workflow = args.workflow || "publish-commit-bottles.yml" ref = args.branch || "master" + odeprecated "`brew pr-publish --autosquash`" if args.autosquash? + extra_args = [] - extra_args << "--autosquash" if args.autosquash? + extra_args << "--autosquash" unless args.no_autosquash? extra_args << "--message='#{args.message}'" if args.message.presence dispatch_args = extra_args.join " " From 3325b79726c39f10e69339f7009de3ff921ad117 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Sun, 18 Jul 2021 15:36:19 +0800 Subject: [PATCH 2/6] dev-cmd/pr-automerge: deprecate `--autosquash` --- Library/Homebrew/dev-cmd/pr-automerge.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/pr-automerge.rb b/Library/Homebrew/dev-cmd/pr-automerge.rb index 5f58d20d0..2b3285033 100644 --- a/Library/Homebrew/dev-cmd/pr-automerge.rb +++ b/Library/Homebrew/dev-cmd/pr-automerge.rb @@ -30,6 +30,9 @@ module Homebrew switch "--autosquash", description: "Instruct `brew pr-publish` to automatically reformat and reword commits "\ "in the pull request to our preferred format." + switch "--no_autosquash", + description: "Instruct `brew pr-publish` to skip automatically reformattin and rewording commits "\ + "in the pull request to the preferred format." switch "--ignore-failures", description: "Include pull requests that have failing status checks." @@ -40,6 +43,8 @@ module Homebrew def pr_automerge args = pr_automerge_args.parse + odeprecated "`brew pr-publish --autosquash`" if args.autosquash? + without_labels = args.without_labels || [ "do not merge", "new formula", @@ -71,7 +76,7 @@ module Homebrew publish_args = ["pr-publish"] publish_args << "--tap=#{tap}" if tap - publish_args << "--autosquash" if args.autosquash? + publish_args << "--autosquash" unless args.no_autosquash? if args.publish? safe_system HOMEBREW_BREW_FILE, *publish_args, *pr_urls else From 171859d3ad8efaa8249e50a234a72c465ae6514a Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Sun, 18 Jul 2021 15:54:52 +0800 Subject: [PATCH 3/6] Fix typos Co-authored-by: Dawid Dziurla --- Library/Homebrew/dev-cmd/pr-automerge.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/pr-automerge.rb b/Library/Homebrew/dev-cmd/pr-automerge.rb index 2b3285033..55fcbec23 100644 --- a/Library/Homebrew/dev-cmd/pr-automerge.rb +++ b/Library/Homebrew/dev-cmd/pr-automerge.rb @@ -30,7 +30,7 @@ module Homebrew switch "--autosquash", description: "Instruct `brew pr-publish` to automatically reformat and reword commits "\ "in the pull request to our preferred format." - switch "--no_autosquash", + switch "--no-autosquash", description: "Instruct `brew pr-publish` to skip automatically reformattin and rewording commits "\ "in the pull request to the preferred format." switch "--ignore-failures", @@ -43,7 +43,7 @@ module Homebrew def pr_automerge args = pr_automerge_args.parse - odeprecated "`brew pr-publish --autosquash`" if args.autosquash? + odeprecated "`brew pr-automerge --autosquash`" if args.autosquash? without_labels = args.without_labels || [ "do not merge", From 654d10d6d3bec8775d836ae04266cdbac224e0dc Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Mon, 19 Jul 2021 09:43:08 +0800 Subject: [PATCH 4/6] Fix more typos Co-authored-by: Rylan Polster --- Library/Homebrew/dev-cmd/pr-automerge.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/pr-automerge.rb b/Library/Homebrew/dev-cmd/pr-automerge.rb index 55fcbec23..7ad672c8d 100644 --- a/Library/Homebrew/dev-cmd/pr-automerge.rb +++ b/Library/Homebrew/dev-cmd/pr-automerge.rb @@ -31,7 +31,7 @@ module Homebrew description: "Instruct `brew pr-publish` to automatically reformat and reword commits "\ "in the pull request to our preferred format." switch "--no-autosquash", - description: "Instruct `brew pr-publish` to skip automatically reformattin and rewording commits "\ + description: "Instruct `brew pr-publish` to skip automatically reformatting and rewording commits "\ "in the pull request to the preferred format." switch "--ignore-failures", description: "Include pull requests that have failing status checks." From 9370c7cca702b9535b78f328b60a14bb70bbc15d Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Tue, 20 Jul 2021 09:28:38 +0800 Subject: [PATCH 5/6] Fix logic error in pr-automerge Co-authored-by: Rylan Polster --- Library/Homebrew/dev-cmd/pr-automerge.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/pr-automerge.rb b/Library/Homebrew/dev-cmd/pr-automerge.rb index 7ad672c8d..b01c468e8 100644 --- a/Library/Homebrew/dev-cmd/pr-automerge.rb +++ b/Library/Homebrew/dev-cmd/pr-automerge.rb @@ -76,7 +76,7 @@ module Homebrew publish_args = ["pr-publish"] publish_args << "--tap=#{tap}" if tap - publish_args << "--autosquash" unless args.no_autosquash? + publish_args << "--no-autosquash" if args.no_autosquash? if args.publish? safe_system HOMEBREW_BREW_FILE, *publish_args, *pr_urls else From ae788550f9b5599e308b7f3b7ff8bef96c4387e6 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Tue, 20 Jul 2021 09:39:51 +0800 Subject: [PATCH 6/6] Show replacement command in `odeprecated` Co-authored-by: Rylan Polster --- Library/Homebrew/dev-cmd/pr-automerge.rb | 2 +- Library/Homebrew/dev-cmd/pr-publish.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/pr-automerge.rb b/Library/Homebrew/dev-cmd/pr-automerge.rb index b01c468e8..fc0abab80 100644 --- a/Library/Homebrew/dev-cmd/pr-automerge.rb +++ b/Library/Homebrew/dev-cmd/pr-automerge.rb @@ -43,7 +43,7 @@ module Homebrew def pr_automerge args = pr_automerge_args.parse - odeprecated "`brew pr-automerge --autosquash`" if args.autosquash? + odeprecated "`brew pr-automerge --autosquash`", "`brew pr-automerge`" if args.autosquash? without_labels = args.without_labels || [ "do not merge", diff --git a/Library/Homebrew/dev-cmd/pr-publish.rb b/Library/Homebrew/dev-cmd/pr-publish.rb index 5126e8315..40d91c133 100644 --- a/Library/Homebrew/dev-cmd/pr-publish.rb +++ b/Library/Homebrew/dev-cmd/pr-publish.rb @@ -43,7 +43,7 @@ module Homebrew workflow = args.workflow || "publish-commit-bottles.yml" ref = args.branch || "master" - odeprecated "`brew pr-publish --autosquash`" if args.autosquash? + odeprecated "`brew pr-publish --autosquash`", "`brew pr-publish`" if args.autosquash? extra_args = [] extra_args << "--autosquash" unless args.no_autosquash?