DefaultBuildChooser.getCandidateRevisions() now returns Set<Revision>…

… to filter duplicates. [FIXED JENKINS-25639]
jenkinsci · Nov 26, 2014 · c0a95d9 · KostyaSha · Sep 16, 2015 · c0a95d9
1 parent ed6e10a
commit c0a95d9
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/git/util/DefaultBuildChooser.java b/src/main/java/hudson/plugins/git/util/DefaultBuildChooser.java
@@ -69,7 +69,7 @@ public Collection<Revision> getCandidateRevisions(boolean isPollCall, String bra
             }
         }
 
-        Collection<Revision> revisions = new ArrayList<Revision>();
+        Collection<Revision> revisions = new HashSet<Revision>();
 
         // if it doesn't contain '/' then it could be an unqualified branch
         if (!branchSpec.contains("/")) {

diff --git a/src/test/java/hudson/plugins/git/GitSCMTest.java b/src/test/java/hudson/plugins/git/GitSCMTest.java
@@ -23,6 +23,7 @@
 import hudson.plugins.git.util.BuildChooserContext;
 import hudson.plugins.git.util.BuildChooserContext.ContextCallable;
 import hudson.plugins.git.util.BuildData;
+import hudson.plugins.git.util.DefaultBuildChooser;
 import hudson.plugins.git.util.GitUtils;
 import hudson.plugins.parameterizedtrigger.BuildTrigger;
 import hudson.plugins.parameterizedtrigger.ResultCondition;
@@ -62,6 +63,7 @@
 import java.net.URI;
 import java.net.URL;
 import java.util.*;
+import org.eclipse.jgit.transport.RemoteConfig;
 
 /**
  * Tests for {@link GitSCM}.
@@ -866,6 +868,35 @@ public void testFetchFromMultipleRepositories() throws Exception {
         assertFalse("scm polling should not detect any more changes after build", project.poll(listener).hasChanges());
     }
 
+    @Bug(25639)
+    public void testCommitDetectedOnlyOnceInMultipleRepositories() throws Exception {
+        FreeStyleProject project = setupSimpleProject("master");
+
+        TestGitRepo secondTestRepo = new TestGitRepo("secondRepo", this, listener);
+        List<UserRemoteConfig> remotes = new ArrayList<UserRemoteConfig>();
+        remotes.addAll(testRepo.remoteConfigs());
+        remotes.addAll(secondTestRepo.remoteConfigs());
+
+        GitSCM gitSCM = new GitSCM(
+                remotes,
+                Collections.singletonList(new BranchSpec("origin/master")),
+                false, Collections.<SubmoduleConfig>emptyList(),
+                null, null,
+                Collections.<GitSCMExtension>emptyList());
+        project.setScm(gitSCM);
+
+        commit("commitFile1", johnDoe, "Commit number 1");
+        FreeStyleBuild build = build(project, Result.SUCCESS, "commitFile1");
+
+        commit("commitFile2", johnDoe, "Commit number 2");
+        git = Git.with(listener, new EnvVars()).in(build.getWorkspace()).getClient();
+        for (RemoteConfig remoteConfig : gitSCM.getRepositories()) {
+            git.fetch_().from(remoteConfig.getURIs().get(0), remoteConfig.getFetchRefSpecs());
+        }
+        Collection<Revision> candidateRevisions = ((DefaultBuildChooser) (gitSCM).getBuildChooser()).getCandidateRevisions(false, "origin/master", git, listener, project.getLastBuild().getAction(BuildData.class), null);
+        assertEquals(1, candidateRevisions.size());
+    }
+
     public void testMerge() throws Exception {
         FreeStyleProject project = setupSimpleProject("master");