Merge tag '3.11.1' into develop

release version 3.11.1

Author: pfeuffer

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 3.11.1 - 2025-09-04
+### Fixed
+- Failing post-commit hook on SVN repository, because it does not support the BranchResolver
+
 ## 3.11.0 - 2025-08-20
 ### Added
 - Support for the new merge strategy fast forward only

gradle.properties

@@ -14,4 +14,4 @@
 # along with this program. If not, see https://www.gnu.org/licenses/.
 #
 
-version = 3.11.1-SNAPSHOT
+version = 3.11.1

package.json

@@ -1,7 +1,7 @@
 {
     "name": "@scm-manager/scm-review-plugin",
     "private": false,
-    "version": "3.11.1-SNAPSHOT",
+    "version": "3.11.1",
     "license": "AGPL-3.0-only",
     "main": "./src/main/js/index.tsx",
     "scripts": {

src/main/java/com/cloudogu/scm/review/pullrequest/service/PullRequestSuggestionService.java

@@ -70,9 +70,14 @@ public void onBranchUpdated(PostReceiveRepositoryHookEvent event) {
     Repository repository = event.getRepository();
 
     boolean isNotSupported = !pullRequestService.supportsPullRequests(repository);
-    boolean isSingleOrNoBranch = branchResolver.getAll(repository).size() < 2;
+    if (isNotSupported) {
+      return;
+    }
 
-    if (isNotSupported || isSingleOrNoBranch) {
+    // check the branches only if PullRequests support (abort before branch check)
+    // because BranchResolver throws an error to the client if the repository type does not support branches
+    boolean isSingleOrNoBranch = branchResolver.getAll(repository).size() < 2;
+    if (isSingleOrNoBranch) {
       return;
     }
 

src/test/java/com/cloudogu/scm/review/pullrequest/service/PullRequestSuggestionServiceTest.java

@@ -31,6 +31,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import sonia.scm.HandlerEventType;
 import sonia.scm.repository.Branch;
+import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.Person;
 import sonia.scm.repository.PostReceiveRepositoryHookEvent;
 import sonia.scm.repository.Repository;
@@ -47,6 +48,7 @@
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 @ExtendWith({MockitoExtension.class, ShiroExtension.class})
@@ -78,10 +80,10 @@ class OnBranchPushed {
     @BeforeEach
     void setup() {
       when(pullRequestService.supportsPullRequests(repository)).thenReturn(true);
-      when(hookContext.getBranchProvider().getCreatedOrModified()).thenReturn(
+      lenient().when(hookContext.getBranchProvider().getCreatedOrModified()).thenReturn(
         List.of("feature")
       );
-      when(branchResolver.getAll(repository)).thenReturn(List.of(
+      lenient().when(branchResolver.getAll(repository)).thenReturn(List.of(
         Branch.defaultBranch(
           "main",
           "revisionOnMain",
@@ -108,7 +110,10 @@ private PostReceiveRepositoryHookEvent createPostReceiveRepositoryHookEvent() {
     @Test
     void shouldIgnorePushBecauseRepositoryDoesNotSupportPullRequests() {
       when(pullRequestService.supportsPullRequests(repository)).thenReturn(false);
+      lenient().when(branchResolver.getAll(repository)).thenThrow(InternalRepositoryException.class);
+
       suggestionService.onBranchUpdated(createPostReceiveRepositoryHookEvent());
+
       assertThat(suggestionService.getPushEntries()).isEmpty();
     }