dependabot-common 0.273.0 → 0.274.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be0c28765d665424088cb737d933cf376c29d931e1d642f96562d362c406fcf0
-  data.tar.gz: de8f912ee099ed27b8d14811f7fb67f9b83119dc7db2483645947b2cd12b380d
+  metadata.gz: b66339af7fa82be186be4ee8d99c24b172a12a4f2233da1bebe2817f154066bf
+  data.tar.gz: eeec78de4dda472c4a53845919ff52a047569cbc57591fd413be347ccce48d0c
 SHA512:
-  metadata.gz: e45c119606e121da9f919de9e40ff1ae63e22ad0167308bcb1e74b626296607fa8d05634ccb7ac922943d547c0f99820fab5c89fe105580146b5dc2224fbd97a
-  data.tar.gz: 2bc6a5d526316d9d81cbfb0e03d06699a28e03757ff36f07a46d870a1e55a89794ffd834f3c1c8e21c7ccf737ed325bc1af111a2e22234641c54e1bb9d8cd56b
+  metadata.gz: 785f6759f110b6fe1ddbe90140f11a5232765af5d89e61d375cb6c65bbfa5638d465da7881cea0c500a11a01ea91771466fab3e27a38023d88132455df3b85a7
+  data.tar.gz: 85c60d21f9a03997bf4b18dd8048c05934a6a01e755bce68e3adbea553662d62d16c24610103731c9d6e145030dcf67730f3961c9aefce9a893ae3da782c6d4b

data/lib/dependabot/pull_request_creator/branch_namer/base.rb

@@ -18,6 +18,9 @@ module Dependabot
         sig { returns(T.nilable(String)) }
         attr_reader :target_branch
 
+        sig { returns(T::Array[String]) }
+        attr_reader :existing_branches
+
         sig { returns(String) }
         attr_reader :separator
 
@@ -32,20 +35,22 @@ module Dependabot
             dependencies: T::Array[Dependency],
             files: T::Array[DependencyFile],
             target_branch: T.nilable(String),
+            existing_branches: T::Array[String],
             separator: String,
             prefix: String,
             max_length: T.nilable(Integer)
           )
             .void
         end
-        def initialize(dependencies:, files:, target_branch:, separator: "/",
-                       prefix: "dependabot", max_length: nil)
-          @dependencies  = dependencies
-          @files         = files
-          @target_branch = target_branch
-          @separator     = separator
-          @prefix        = prefix
-          @max_length    = max_length
+        def initialize(dependencies:, files:, target_branch:, existing_branches: [],
+                       separator: "/", prefix: "dependabot", max_length: nil)
+          @dependencies      = dependencies
+          @files             = files
+          @target_branch     = target_branch
+          @existing_branches = existing_branches
+          @separator         = separator
+          @prefix            = prefix
+          @max_length        = max_length
         end
 
         sig { overridable.returns(String) }
@@ -69,7 +74,25 @@ module Dependabot
             sanitized_name[[T.must(max_length) - sha.size, 0].max..] = sha
           end
 
-          sanitized_name
+          if Dependabot::Experiments.enabled?(:dedup_branch_names)
+            dedup_existing_branches(sanitized_name)
+          else
+            sanitized_name
+          end
+        end
+
+        sig { params(ref: String).returns(String) }
+        def dedup_existing_branches(ref)
+          return ref unless existing_branches.include?(ref)
+
+          i = 1
+          new_ref = "#{ref}-#{i}"
+          while existing_branches.include?(new_ref)
+            i += 1
+            new_ref = "#{ref}-#{i}"
+          end
+
+          new_ref
         end
 
         sig { params(ref: String).returns(String) }

data/lib/dependabot/pull_request_creator/branch_namer/dependency_group_strategy.rb

@@ -17,6 +17,7 @@ module Dependabot
             target_branch: T.nilable(String),
             dependency_group: Dependabot::DependencyGroup,
             includes_security_fixes: T::Boolean,
+            existing_branches: T::Array[String],
             separator: String,
             prefix: String,
             max_length: T.nilable(Integer)
@@ -24,11 +25,12 @@ module Dependabot
             .void
         end
         def initialize(dependencies:, files:, target_branch:, dependency_group:, includes_security_fixes:,
-                       separator: "/", prefix: "dependabot", max_length: nil)
+                       existing_branches: [], separator: "/", prefix: "dependabot", max_length: nil)
           super(
             dependencies: dependencies,
             files: files,
             target_branch: target_branch,
+            existing_branches: existing_branches,
             separator: separator,
             prefix: prefix,
             max_length: max_length,

data/lib/dependabot/pull_request_creator/branch_namer.rb

@@ -23,6 +23,9 @@ module Dependabot
       sig { returns(T.nilable(String)) }
       attr_reader :target_branch
 
+      sig { returns(T::Array[String]) }
+      attr_reader :existing_branches
+
       sig { returns(String) }
       attr_reader :separator
 
@@ -44,6 +47,7 @@ module Dependabot
           files: T::Array[Dependabot::DependencyFile],
           target_branch: T.nilable(String),
           dependency_group: T.nilable(Dependabot::DependencyGroup),
+          existing_branches: T::Array[String],
           separator: String,
           prefix: String,
           max_length: T.nilable(Integer),
@@ -51,12 +55,13 @@ module Dependabot
         )
           .void
       end
-      def initialize(dependencies:, files:, target_branch:, dependency_group: nil,
+      def initialize(dependencies:, files:, target_branch:, dependency_group: nil, existing_branches: [],
                      separator: "/", prefix: "dependabot", max_length: nil, includes_security_fixes: false)
         @dependencies  = dependencies
         @files         = files
         @target_branch = target_branch
         @dependency_group = dependency_group
+        @existing_branches = existing_branches
         @separator     = separator
         @prefix        = prefix
         @max_length    = max_length
@@ -78,6 +83,7 @@ module Dependabot
               dependencies: dependencies,
               files: files,
               target_branch: target_branch,
+              existing_branches: existing_branches,
               separator: separator,
               prefix: prefix,
               max_length: max_length
@@ -89,6 +95,7 @@ module Dependabot
               target_branch: target_branch,
               dependency_group: T.must(dependency_group),
               includes_security_fixes: includes_security_fixes,
+              existing_branches: existing_branches,
               separator: separator,
               prefix: prefix,
               max_length: max_length

data/lib/dependabot/pull_request_creator.rb

@@ -115,6 +115,9 @@ module Dependabot
     sig { returns(T.nilable(T.any(T::Array[String], Integer))) }
     attr_reader :milestone
 
+    sig { returns(T::Array[String]) }
+    attr_reader :existing_branches
+
     sig { returns(String) }
     attr_reader :branch_name_separator
 
@@ -159,6 +162,7 @@ module Dependabot
         reviewers: Reviewers,
         assignees: T.nilable(T.any(T::Array[String], T::Array[Integer])),
         milestone: T.nilable(T.any(T::Array[String], Integer)),
+        existing_branches: T::Array[String],
         branch_name_separator: String,
         branch_name_prefix: String,
         branch_name_max_length: T.nilable(Integer),
@@ -182,9 +186,9 @@ module Dependabot
                    custom_labels: nil, author_details: nil, signature_key: nil,
                    commit_message_options: {}, vulnerabilities_fixed: {},
                    reviewers: nil, assignees: nil, milestone: nil,
-                   branch_name_separator: "/", branch_name_prefix: "dependabot",
-                   branch_name_max_length: nil, label_language: false,
-                   automerge_candidate: false,
+                   existing_branches: [], branch_name_separator: "/",
+                   branch_name_prefix: "dependabot", branch_name_max_length: nil,
+                   label_language: false, automerge_candidate: false,
                    github_redirection_service: DEFAULT_GITHUB_REDIRECTION_SERVICE,
                    custom_headers: nil, require_up_to_date_base: false,
                    provider_metadata: {}, message: nil, dependency_group: nil, pr_message_max_length: nil,
@@ -204,6 +208,7 @@ module Dependabot
       @assignees                  = assignees
       @milestone                  = milestone
       @vulnerabilities_fixed      = vulnerabilities_fixed
+      @existing_branches          = existing_branches
       @branch_name_separator      = branch_name_separator
       @branch_name_prefix         = branch_name_prefix
       @branch_name_max_length     = branch_name_max_length
@@ -397,6 +402,7 @@ module Dependabot
           files: files,
           target_branch: source.branch,
           dependency_group: dependency_group,
+          existing_branches: existing_branches,
           separator: branch_name_separator,
           prefix: branch_name_prefix,
           max_length: branch_name_max_length,

data/lib/dependabot.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.273.0"
+  VERSION = "0.274.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.273.0
+  version: 0.274.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-29 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-codecommit
@@ -600,7 +600,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.273.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.274.0
 post_install_message: 
 rdoc_options: []
 require_paths: