summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/utils/DiffUtils.java
diff options
context:
space:
mode:
authorPaul Martin <paul@paulsputer.com>2015-12-25 22:35:11 +0000
committerPaul Martin <paul@paulsputer.com>2015-12-25 22:35:11 +0000
commit46f33f87750573713509fbdbd0fc2ae51dc12044 (patch)
treeaa227353d88fa97da0b40c02c46d45862c7013d3 /src/main/java/com/gitblit/utils/DiffUtils.java
parent2539ceea0d47467d54cedd340afa6ede2909b2bd (diff)
downloadgitblit-46f33f87750573713509fbdbd0fc2ae51dc12044.tar.gz
gitblit-46f33f87750573713509fbdbd0fc2ae51dc12044.zip
Fix for #976 - Filestore links via browser
+ GitLFS client support + FilestoreModel now parses meta file + Read meta heading from cache if available + Authentication based on accept headers for browser view filestore login + PathModel & PathChangeModel now understands filestore items + Zip & Rar downloads contain include filestore items + Filestore servlet returns LFS JSON error only if accepted by client + DiffStat now knows repository to allow identification of filestore items + Filestore items identified and returned via view, raw & blob links on blame, commitDiff, commit and Tree pages
Diffstat (limited to 'src/main/java/com/gitblit/utils/DiffUtils.java')
-rw-r--r--src/main/java/com/gitblit/utils/DiffUtils.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/com/gitblit/utils/DiffUtils.java b/src/main/java/com/gitblit/utils/DiffUtils.java
index cdebec1b..41aab4cf 100644
--- a/src/main/java/com/gitblit/utils/DiffUtils.java
+++ b/src/main/java/com/gitblit/utils/DiffUtils.java
@@ -157,13 +157,16 @@ public class DiffUtils {
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;
}
@@ -379,7 +382,7 @@ public class DiffUtils {
DiffFormatter df;
switch (outputType) {
case HTML:
- df = new GitBlitDiffFormatter(commit.getName(), path, handler, tabLength);
+ df = new GitBlitDiffFormatter(commit.getName(), repository, path, handler, tabLength);
break;
case PLAIN:
default:
@@ -548,7 +551,7 @@ public class DiffUtils {
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);