From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/models/PathModel.java | 100 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 90 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/gitblit/models/PathModel.java b/src/main/java/com/gitblit/models/PathModel.java
index f894978..3c280eb 100644
--- a/src/main/java/com/gitblit/models/PathModel.java
+++ b/src/main/java/com/gitblit/models/PathModel.java
@@ -15,17 +15,27 @@
*/
package com.gitblit.models;
+import java.io.IOException;
import java.io.Serializable;
+import org.eclipse.jgit.diff.DiffEntry;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
+import org.eclipse.jgit.errors.IncorrectObjectTypeException;
+import org.eclipse.jgit.errors.MissingObjectException;
+import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevWalk;
+
+import com.gitblit.manager.FilestoreManager;
+import com.gitblit.utils.JGitUtils;
/**
* PathModel is a serializable model class that represents a file or a folder,
* including all its metadata and associated commit id.
- *
+ *
* @author James Moger
- *
+ *
*/
public class PathModel implements Serializable, Comparable<PathModel> {
@@ -33,16 +43,18 @@
public final String name;
public final String path;
+ private final FilestoreModel filestoreItem;
public final long size;
public final int mode;
public final String objectId;
public final String commitId;
public boolean isParentPath;
-
- public PathModel(String name, String path, long size, int mode, String objectId, String commitId) {
+
+ public PathModel(String name, String path, FilestoreModel filestoreItem, long size, int mode, String objectId, String commitId) {
this.name = name;
this.path = path;
- this.size = size;
+ this.filestoreItem = filestoreItem;
+ this.size = (filestoreItem == null) ? size : filestoreItem.getSize();
this.mode = mode;
this.objectId = objectId;
this.commitId = commitId;
@@ -55,9 +67,27 @@
public boolean isSubmodule() {
return FileMode.GITLINK.equals(mode);
}
-
+
public boolean isTree() {
return FileMode.TREE.equals(mode);
+ }
+
+ public boolean isFile() {
+ return FileMode.REGULAR_FILE.equals(mode)
+ || FileMode.EXECUTABLE_FILE.equals(mode)
+ || (FileMode.MISSING.equals(mode) && !isSymlink() && !isSubmodule() && !isTree());
+ }
+
+ public boolean isFilestoreItem() {
+ return filestoreItem != null;
+ }
+
+ public String getFilestoreOid() {
+ if (filestoreItem != null) {
+ return filestoreItem.oid;
+ }
+
+ return null;
}
@Override
@@ -98,9 +128,9 @@
/**
* PathChangeModel is a serializable class that represents a file changed in
* a commit.
- *
+ *
* @author James Moger
- *
+ *
*/
public static class PathChangeModel extends PathModel {
@@ -108,10 +138,27 @@
public ChangeType changeType;
- public PathChangeModel(String name, String path, long size, int mode, String objectId,
+ public int insertions;
+
+ public int deletions;
+
+ public PathChangeModel(String name, String path, FilestoreModel filestoreItem, long size, int mode, String objectId,
String commitId, ChangeType type) {
- super(name, path, size, mode, objectId, commitId);
+ super(name, path, filestoreItem, size, mode, objectId, commitId);
this.changeType = type;
+ }
+
+ public void update(char op) {
+ switch (op) {
+ case '+':
+ insertions++;
+ break;
+ case '-':
+ deletions++;
+ break;
+ default:
+ break;
+ }
}
@Override
@@ -123,5 +170,38 @@
public boolean equals(Object o) {
return super.equals(o);
}
+
+ public static PathChangeModel from(DiffEntry diff, String commitId, Repository repository) {
+ PathChangeModel pcm;
+ FilestoreModel filestoreItem = null;
+ long size = 0;
+
+ if (repository != null) {
+ try (RevWalk revWalk = new RevWalk(repository)) {
+ size = revWalk.getObjectReader().getObjectSize(diff.getNewId().toObjectId(), Constants.OBJ_BLOB);
+
+ if (JGitUtils.isPossibleFilestoreItem(size)) {
+ filestoreItem = JGitUtils.getFilestoreItem(revWalk.getObjectReader().open(diff.getNewId().toObjectId()));
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ if (diff.getChangeType().equals(ChangeType.DELETE)) {
+ pcm = new PathChangeModel(diff.getOldPath(), diff.getOldPath(), filestoreItem, size, diff
+ .getNewMode().getBits(), diff.getOldId().name(), commitId, diff
+ .getChangeType());
+ } else if (diff.getChangeType().equals(ChangeType.RENAME)) {
+ pcm = new PathChangeModel(diff.getOldPath(), diff.getNewPath(), filestoreItem, size, diff
+ .getNewMode().getBits(), diff.getNewId().name(), commitId, diff
+ .getChangeType());
+ } else {
+ pcm = new PathChangeModel(diff.getNewPath(), diff.getNewPath(), filestoreItem, size, diff
+ .getNewMode().getBits(), diff.getNewId().name(), commitId, diff
+ .getChangeType());
+ }
+ return pcm;
+ }
}
}
--
Gitblit v1.9.1