Fix for #976 - Filestore links via browser

Paul Martin

2015-12-25 46f33f87750573713509fbdbd0fc2ae51dc12044

 src/main/java/com/gitblit/utils/DiffUtils.java

@@ -157,13 +157,16 @@
      public final List<PathChangeModel> paths = new ArrayList<PathChangeModel>();



      private final String commitId;

		
      private final Repository repository;



      public DiffStat(String commitId) {

      public DiffStat(String commitId, Repository repository) {

         this.commitId = commitId;

         this.repository = repository;

      }



      public PathChangeModel addPath(DiffEntry entry) {

         PathChangeModel pcm = PathChangeModel.from(entry, commitId);

         PathChangeModel pcm = PathChangeModel.from(entry, commitId, repository);

         paths.add(pcm);

         return pcm;

      }

@@ -229,11 +232,12 @@
    * @param commit

    * @param comparator

    * @param outputType

    * @param tabLength

    * @return the diff

    */

   public static DiffOutput getCommitDiff(Repository repository, RevCommit commit,

         DiffComparator comparator, DiffOutputType outputType) {

      return getDiff(repository, null, commit, null, comparator, outputType);

         DiffComparator comparator, DiffOutputType outputType, int tabLength) {

      return getDiff(repository, null, commit, null, comparator, outputType, tabLength);

   }



   /**

@@ -246,11 +250,12 @@
    * @param handler

    *            to use for rendering binary diffs if {@code outputType} is {@link DiffOutputType#HTML HTML}.

    *            May be {@code null}, resulting in the default behavior.

    * @param tabLength

    * @return the diff

    */

   public static DiffOutput getCommitDiff(Repository repository, RevCommit commit,

         DiffComparator comparator, DiffOutputType outputType, BinaryDiffHandler handler) {

      return getDiff(repository, null, commit, null, comparator, outputType, handler);

         DiffComparator comparator, DiffOutputType outputType, BinaryDiffHandler handler, int tabLength) {

      return getDiff(repository, null, commit, null, comparator, outputType, handler, tabLength);

   }





@@ -263,11 +268,12 @@
    * @param path

    * @param comparator

    * @param outputType

    * @param tabLength

    * @return the diff

    */

   public static DiffOutput getDiff(Repository repository, RevCommit commit, String path,

         DiffComparator comparator, DiffOutputType outputType) {

      return getDiff(repository, null, commit, path, comparator, outputType);

         DiffComparator comparator, DiffOutputType outputType, int tabLength) {

      return getDiff(repository, null, commit, path, comparator, outputType, tabLength);

   }



   /**

@@ -282,11 +288,12 @@
    * @param handler

    *            to use for rendering binary diffs if {@code outputType} is {@link DiffOutputType#HTML HTML}.

    *            May be {@code null}, resulting in the default behavior.

    * @param tabLength

    * @return the diff

    */

   public static DiffOutput getDiff(Repository repository, RevCommit commit, String path,

         DiffComparator comparator, DiffOutputType outputType, BinaryDiffHandler handler) {

      return getDiff(repository, null, commit, path, comparator, outputType, handler);

         DiffComparator comparator, DiffOutputType outputType, BinaryDiffHandler handler, int tabLength) {

      return getDiff(repository, null, commit, path, comparator, outputType, handler, tabLength);

   }



   /**

@@ -297,11 +304,13 @@
    * @param commit

    * @param comparator

    * @param outputType

    * @param tabLength

    *

    * @return the diff

    */

   public static DiffOutput getDiff(Repository repository, RevCommit baseCommit, RevCommit commit,

         DiffComparator comparator, DiffOutputType outputType) {

      return getDiff(repository, baseCommit, commit, null, comparator, outputType);

         DiffComparator comparator, DiffOutputType outputType, int tabLength) {

      return getDiff(repository, baseCommit, commit, null, comparator, outputType, tabLength);

   }



   /**

@@ -315,11 +324,12 @@
    * @param handler

    *            to use for rendering binary diffs if {@code outputType} is {@link DiffOutputType#HTML HTML}.

    *            May be {@code null}, resulting in the default behavior.

    * @param tabLength

    * @return the diff

    */

   public static DiffOutput getDiff(Repository repository, RevCommit baseCommit, RevCommit commit,

         DiffComparator comparator, DiffOutputType outputType, BinaryDiffHandler handler) {

      return getDiff(repository, baseCommit, commit, null, comparator, outputType, handler);

         DiffComparator comparator, DiffOutputType outputType, BinaryDiffHandler handler, int tabLength) {

      return getDiff(repository, baseCommit, commit, null, comparator, outputType, handler, tabLength);

   }



   /**

@@ -335,11 +345,12 @@
    *            or folder. if unspecified, the diff is for the entire commit.

    * @param outputType

    * @param diffComparator

    * @param tabLength

    * @return the diff

    */

   public static DiffOutput getDiff(Repository repository, RevCommit baseCommit, RevCommit commit,

         String path, DiffComparator diffComparator, DiffOutputType outputType) {

      return getDiff(repository, baseCommit, commit, path, diffComparator, outputType, null);

         String path, DiffComparator diffComparator, DiffOutputType outputType, int tabLength) {

      return getDiff(repository, baseCommit, commit, path, diffComparator, outputType, null, tabLength);

   }



   /**

@@ -358,10 +369,11 @@
    * @param handler

    *            to use for rendering binary diffs if {@code outputType} is {@link DiffOutputType#HTML HTML}.

    *            May be {@code null}, resulting in the default behavior.

    * @param tabLength

    * @return the diff

    */

   public static DiffOutput getDiff(Repository repository, RevCommit baseCommit, RevCommit commit, String path,

         DiffComparator comparator, DiffOutputType outputType, final BinaryDiffHandler handler) {

         DiffComparator comparator, DiffOutputType outputType, final BinaryDiffHandler handler, int tabLength) {

      DiffStat stat = null;

      String diff = null;

      try {

@@ -370,7 +382,7 @@
         DiffFormatter df;

         switch (outputType) {

         case HTML:

            df = new GitBlitDiffFormatter(commit.getName(), path, handler);

            df = new GitBlitDiffFormatter(commit.getName(), repository, path, handler, tabLength);

            break;

         case PLAIN:

         default:

@@ -539,7 +551,7 @@
      DiffStat stat = null;

      try {

         RawTextComparator cmp = RawTextComparator.DEFAULT;

         DiffStatFormatter df = new DiffStatFormatter(commit.getName());

         DiffStatFormatter df = new DiffStatFormatter(commit.getName(), repository);

         df.setRepository(repository);

         df.setDiffComparator(cmp);

         df.setDetectRenames(true);