Add DiffComparator argument to all DiffUtils calls, default to ignore all w...

James Moger

2015-02-26 cff35236ba16e2c376c59feeff310f62554a4140

 src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java

@@ -25,6 +25,7 @@


import com.gitblit.Keys;

import com.gitblit.utils.DiffUtils;

import com.gitblit.utils.DiffUtils.DiffComparator;

import com.gitblit.utils.DiffUtils.DiffOutputType;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.StringUtils;

@@ -42,6 +43,7 @@


      final String blobPath = WicketUtils.getPath(params);

      final String baseObjectId = WicketUtils.getBaseObjectId(params);

      final DiffComparator diffComparator = DiffComparator.WS_IGNORE_ALL;



      Repository r = getRepository();

      RevCommit commit = getCommit();

@@ -54,7 +56,7 @@
         RevCommit parent = commit.getParentCount() == 0 ? null : commit.getParent(0);

         ImageDiffHandler handler = new ImageDiffHandler(this, repositoryName,

               parent.getName(), commit.getName(), imageExtensions);

         diff = DiffUtils.getDiff(r, commit, blobPath, DiffOutputType.HTML, handler).content;

         diff = DiffUtils.getDiff(r, commit, blobPath, diffComparator, DiffOutputType.HTML, handler).content;

         if (handler.getImgDiffCount() > 0) {

            addBottomScript("scripts/imgdiff.js"); // Tiny support script for image diffs

         }

@@ -65,7 +67,7 @@
         RevCommit baseCommit = JGitUtils.getCommit(r, baseObjectId);

         ImageDiffHandler handler = new ImageDiffHandler(this, repositoryName,

               baseCommit.getName(), commit.getName(), imageExtensions);

         diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, DiffOutputType.HTML, handler).content;

         diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, DiffComparator.WS_IGNORE_ALL, DiffOutputType.HTML, handler).content;

         if (handler.getImgDiffCount() > 0) {

            addBottomScript("scripts/imgdiff.js"); // Tiny support script for image diffs

         }