Merge pull request hudson2-plugins#30 from kevinsawicki/duplicates

Prevent parsing duplicates from the change log.

Author: magnayn

src/main/java/hudson/plugins/git/GitChangeLogParser.java

@@ -8,7 +8,9 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.xml.sax.SAXException;
 
@@ -27,7 +29,7 @@ public GitChangeLogParser(boolean authorOrCommitter) {
     public GitChangeSetList parse(AbstractBuild build, File changelogFile)
         throws IOException, SAXException {
 
-        ArrayList<GitChangeSet> r = new ArrayList<GitChangeSet>();
+        Set<GitChangeSet> r = new LinkedHashSet<GitChangeSet>();
 
         // Parse the log file into GitChangeSet items - each one is a commit
 
@@ -55,7 +57,7 @@ public GitChangeSetList parse(AbstractBuild build, File changelogFile)
                 r.add(parseCommit(lines, authorOrCommitter));
             }
 
-            return new GitChangeSetList(build, r);
+            return new GitChangeSetList(build, new ArrayList<GitChangeSet>(r));
         }
         finally {
             rdr.close();

src/main/java/hudson/plugins/git/GitChangeSet.java

@@ -350,4 +350,16 @@ public EditType getEditType() {
             }
         }
     }
+    
+    public int hashCode() {
+        return id != null ? id.hashCode() : super.hashCode();
+    }
+
+    public boolean equals(Object obj) {
+        if (obj == this)
+            return true;
+        if (obj instanceof GitChangeSet)
+            return id != null && id.equals(((GitChangeSet) obj).id);
+        return false;
+    }
 }

src/test/java/hudson/plugins/git/GitChangeLogParserTest.java

@@ -0,0 +1,36 @@
+package hudson.plugins.git;
+
+import java.io.File;
+import java.io.FileWriter;
+
+import org.jvnet.hudson.test.HudsonTestCase;
+
+/**
+ * Unit tests of {@link GitChangeLogParser}
+ */
+public class GitChangeLogParserTest extends HudsonTestCase {
+
+    /**
+     * Test duplicate changes filtered from parsed change set list.
+     * 
+     * @throws Exception
+     */
+    public void testDuplicatesFiltered() throws Exception {
+        GitChangeLogParser parser = new GitChangeLogParser(true);
+        File log = File.createTempFile(getClass().getName(), ".tmp");
+        FileWriter writer = new FileWriter(log);
+        writer.write("commit 123abc456def\n");
+        writer.write("    first message\n");
+        writer.write("commit 123abc456def\n");
+        writer.write("    second message");
+        writer.close();
+        GitChangeSetList list = parser.parse(null, log);
+        assertNotNull(list);
+        assertNotNull(list.getLogs());
+        assertEquals(1, list.getLogs().size());
+        GitChangeSet first = list.getLogs().get(0);
+        assertNotNull(first);
+        assertEquals("123abc456def", first.getId());
+        assertEquals("first message", first.getMsg());
+    }
+}