Merge branch 'main' into kamil/update_package_manager_abstraction_for…

…_bundler_and_composer
dependabot · Oct 24, 2024 · fafd29d · fafd29d
2 parents 634405d + 4727f38
commit fafd29d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/common/lib/dependabot/pull_request_creator.rb b/common/lib/dependabot/pull_request_creator.rb
@@ -396,6 +396,12 @@ def message
 
     sig { returns(Dependabot::PullRequestCreator::BranchNamer) }
     def branch_namer
+      if Dependabot::Experiments.enabled?(:dedup_branch_names) && existing_branches
+        Dependabot.logger.debug(
+          "Dependabot::PullRequestCreator::branch_namer : #{existing_branches}"
+        )
+      end
+
       @branch_namer ||= T.let(
         BranchNamer.new(
           dependencies: dependencies,

diff --git a/common/lib/dependabot/pull_request_creator/branch_namer.rb b/common/lib/dependabot/pull_request_creator/branch_namer.rb
@@ -77,6 +77,12 @@ def new_branch_name
 
       sig { returns(Dependabot::PullRequestCreator::BranchNamer::Base) }
       def strategy
+        if Dependabot::Experiments.enabled?(:dedup_branch_names) && existing_branches
+          Dependabot.logger.debug(
+            "Dependabot::PullRequestCreator::strategy : #{existing_branches}"
+          )
+        end
+
         @strategy ||= T.let(
           if dependency_group.nil?
             SoloStrategy.new(

diff --git a/common/lib/dependabot/pull_request_creator/branch_namer/base.rb b/common/lib/dependabot/pull_request_creator/branch_namer/base.rb
@@ -83,6 +83,9 @@ def sanitize_branch_name(ref_name)
 
         sig { params(ref: String).returns(String) }
         def dedup_existing_branches(ref)
+          Dependabot.logger.debug(
+            "Dependabot::PullRequestCreator::dedup_existing_branches::ref : #{ref}"
+          )
           return ref unless existing_branches.include?(ref)
 
           i = 1
@@ -92,6 +95,10 @@ def dedup_existing_branches(ref)
             new_ref = "#{ref}-#{i}"
           end
 
+          Dependabot.logger.debug(
+            "Dependabot::PullRequestCreator::dedup_existing_branches::new_ref : #{new_ref}"
+          )
+
           new_ref
         end