From 7ba0f34f72229e5d2d3f0d1408e0366938bb458a Mon Sep 17 00:00:00 2001
From: Alexander Bayandin <a.bayandin@gmail.com>
Date: Sun, 26 Apr 2020 15:11:31 +0100
Subject: [PATCH 1/2] Revert "Merge pull request #7316 from
 bayandin/fix-bump-revision"

This reverts commit a7fdc7046f5cda8743591040117e409cd24dae76, reversing
changes made to bfa175d118112989b24908ea16c5a97c1dd011e4.
---
 Library/Homebrew/dev-cmd/bump-revision.rb | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/Library/Homebrew/dev-cmd/bump-revision.rb b/Library/Homebrew/dev-cmd/bump-revision.rb
index 2718c32ffd..5070520752 100644
--- a/Library/Homebrew/dev-cmd/bump-revision.rb
+++ b/Library/Homebrew/dev-cmd/bump-revision.rb
@@ -42,14 +42,7 @@ module Homebrew
         [checksum.hash_type, checksum.hexdigest]
       end
 
-      stable_block_given = formula.path.read.include? "  stable do"
-
-      old = if stable_block_given
-        # insert replacement revision before stable block
-        <<~EOS
-          stable do
-        EOS
-      elsif hash_type
+      old = if hash_type
         # insert replacement revision after hash
         <<~EOS
           #{hash_type} "#{old_hash}"
@@ -60,12 +53,8 @@ module Homebrew
           :revision => "#{formula_spec.specs[:revision]}"
         EOS
       end
+      replacement = old + "  revision 1\n"
 
-      replacement = if stable_block_given
-        "revision 1\n  " + old
-      else
-        old + "  revision 1\n"
-      end
     else
       old = "revision #{current_revision}"
       replacement = "revision #{current_revision+1}"

From 5a4a57310fd23d18bb2c823eb63b29b05b1622f6 Mon Sep 17 00:00:00 2001
From: EricFromCanada <enk3@outlook.com>
Date: Sat, 25 Apr 2020 00:32:13 -0400
Subject: [PATCH 2/2] bump-revision: insert after homepage if stable block is
 present

---
 Library/Homebrew/dev-cmd/bump-revision.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/dev-cmd/bump-revision.rb b/Library/Homebrew/dev-cmd/bump-revision.rb
index 5070520752..dab2f3cdd1 100644
--- a/Library/Homebrew/dev-cmd/bump-revision.rb
+++ b/Library/Homebrew/dev-cmd/bump-revision.rb
@@ -42,7 +42,12 @@ module Homebrew
         [checksum.hash_type, checksum.hexdigest]
       end
 
-      old = if hash_type
+      old = if formula.path.read.include?("stable do\n")
+        # insert replacement revision after homepage
+        <<~EOS
+          homepage "#{formula.homepage}"
+        EOS
+      elsif hash_type
         # insert replacement revision after hash
         <<~EOS
           #{hash_type} "#{old_hash}"