From 332f915f52e2829be53fde4ff5efec777afd3e3a Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 22 Jun 2011 13:31:55 +0200
Subject: [PATCH] fix wrong commit message and commit date in git repository

---
 .../scm/repository/GitRepositoryBrowser.java  | 50 +++++++++++--------
 .../src/main/java/sonia/scm/util/Util.java    | 44 ++++++++++++++++
 2 files changed, 73 insertions(+), 21 deletions(-)

diff --git a/plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryBrowser.java b/plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryBrowser.java
index 20d8ea97ca..b2ce205085 100644
--- a/plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryBrowser.java
+++ b/plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryBrowser.java
@@ -45,12 +45,16 @@ import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevTree;
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.treewalk.TreeWalk;
+import org.eclipse.jgit.treewalk.filter.AndTreeFilter;
 import org.eclipse.jgit.treewalk.filter.PathFilter;
+import org.eclipse.jgit.treewalk.filter.TreeFilter;
 import org.eclipse.jgit.util.FS;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import sonia.scm.util.Util;
+
 //~--- JDK imports ------------------------------------------------------------
 
 import java.io.File;
@@ -58,7 +62,6 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -192,7 +195,7 @@ public class GitRepositoryBrowser implements RepositoryBrowser
 
       while (treeWalk.next())
       {
-        files.add(createFileObject(git, revId, treeWalk));
+        files.add(createFileObject(repo, revId, treeWalk));
       }
 
       result.setFiles(files);
@@ -214,7 +217,8 @@ public class GitRepositoryBrowser implements RepositoryBrowser
    *
    *
    *
-   * @param git
+   *
+   * @param repo
    * @param revId
    * @param treeWalk
    *
@@ -222,8 +226,8 @@ public class GitRepositoryBrowser implements RepositoryBrowser
    *
    * @throws IOException
    */
-  private FileObject createFileObject(Git git, ObjectId revId,
-          TreeWalk treeWalk)
+  private FileObject createFileObject(org.eclipse.jgit.lib.Repository repo,
+          ObjectId revId, TreeWalk treeWalk)
           throws IOException
   {
     FileObject file = new FileObject();
@@ -232,12 +236,12 @@ public class GitRepositoryBrowser implements RepositoryBrowser
     file.setName(treeWalk.getNameString());
     file.setPath(path);
 
-    ObjectLoader loader = git.getRepository().open(treeWalk.getObjectId(0));
+    ObjectLoader loader = repo.open(treeWalk.getObjectId(0));
 
     file.setDirectory(loader.getType() == Constants.OBJ_TREE);
     file.setLength(loader.getSize());
 
-    RevCommit commit = getLatestCommit(git, revId, path);
+    RevCommit commit = getLatestCommit(repo, revId, path);
 
     if (commit != null)
     {
@@ -258,36 +262,40 @@ public class GitRepositoryBrowser implements RepositoryBrowser
    * Method description
    *
    *
-   * @param git
+   *
+   * @param repo
    * @param revId
    * @param path
    *
    * @return
    */
-  private RevCommit getLatestCommit(Git git, ObjectId revId, String path)
+  private RevCommit getLatestCommit(org.eclipse.jgit.lib.Repository repo,
+                                    ObjectId revId, String path)
   {
-    RevCommit commit = null;
+    RevCommit result = null;
+    RevWalk walk = null;
 
     try
     {
-      Iterable<RevCommit> iterable = git.log().add(revId).addPath(path).call();
+      walk = new RevWalk(repo);
+      walk.setTreeFilter(AndTreeFilter.create(PathFilter.create(path),
+              TreeFilter.ANY_DIFF));
 
-      if (iterable != null)
-      {
-        Iterator<RevCommit> it = iterable.iterator();
+      RevCommit commit = walk.parseCommit(revId);
 
-        if ((it != null) && it.hasNext())
-        {
-          commit = it.next();
-        }
-      }
+      walk.markStart(commit);
+      result = Util.getFirst(walk);
     }
     catch (Exception ex)
     {
-      logger.error("could not fetch latest commit", ex);
+      logger.error("could not parse commit for file", ex);
+    }
+    finally
+    {
+      GitUtil.release(walk);
     }
 
-    return commit;
+    return result;
   }
 
   //~--- fields ---------------------------------------------------------------
diff --git a/scm-core/src/main/java/sonia/scm/util/Util.java b/scm-core/src/main/java/sonia/scm/util/Util.java
index 9ef1bcb039..14286adfb0 100644
--- a/scm-core/src/main/java/sonia/scm/util/Util.java
+++ b/scm-core/src/main/java/sonia/scm/util/Util.java
@@ -439,6 +439,50 @@ public class Util
 
   //~--- get methods ----------------------------------------------------------
 
+  /**
+   * Method description
+   *
+   *
+   * @param iterable
+   * @param <T>
+   *
+   * @return
+   * @since 1.5
+   */
+  public static <T> T getFirst(Iterable<T> iterable)
+  {
+    T result = null;
+
+    if (iterable != null)
+    {
+      result = getFirst(iterable.iterator());
+    }
+
+    return result;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param iterator
+   * @param <T>
+   *
+   * @return
+   * @since 1.5
+   */
+  public static <T> T getFirst(Iterator<T> iterator)
+  {
+    T result = null;
+
+    if ((iterator != null) && iterator.hasNext())
+    {
+      result = iterator.next();
+    }
+
+    return result;
+  }
+
   /**
    * Method description
    *