Added git-notes to docs. Fixed parent path mode.

James Moger

2011-06-05 f08c1ca55e1ffaef81f3d6514aa4bffa5d716c5b

 src/com/gitblit/utils/DiffUtils.java

@@ -30,28 +30,39 @@
import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



import com.gitblit.utils.JGitUtils.DiffOutputType;



public class DiffUtils {



   private static final Logger LOGGER = LoggerFactory.getLogger(DiffUtils.class);

	


   public static enum DiffOutputType {

      PLAIN, GITWEB, GITBLIT;



      public static DiffOutputType forName(String name) {

         for (DiffOutputType type : values()) {

            if (type.name().equalsIgnoreCase(name)) {

               return type;

            }

         }

         return null;

      }

   }



   public static String getCommitDiff(Repository r, RevCommit commit, DiffOutputType outputType) {

      return getCommitDiff(r, null, commit, null, outputType);

      return getDiff(r, null, commit, null, outputType);

   }



   public static String getCommitDiff(Repository r, RevCommit commit, String path,

   public static String getDiff(Repository r, RevCommit commit, String path,

         DiffOutputType outputType) {

      return getCommitDiff(r, null, commit, path, outputType);

      return getDiff(r, null, commit, path, outputType);

   }



   public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit,

   public static String getDiff(Repository r, RevCommit baseCommit, RevCommit commit,

         DiffOutputType outputType) {

      return getCommitDiff(r, baseCommit, commit, null, outputType);

      return getDiff(r, baseCommit, commit, null, outputType);

   }



   public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit,

         String path, DiffOutputType outputType) {

   public static String getDiff(Repository r, RevCommit baseCommit, RevCommit commit, String path,

         DiffOutputType outputType) {

      try {

         RevTree baseTree;

         if (baseCommit == null) {