diff options
| author | James Moger <james.moger@gitblit.com> | 2011-05-27 23:37:24 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2011-05-27 23:37:24 -0400 |
| commit | 1f9daef870a8c7a984955166a542628d69012ed5 (patch) | |
| tree | 93972413a5affb9ae3096c7c15ae7b411b08b1ff /src/com/gitblit/utils/DiffUtils.java | |
| parent | 17c417dad5c7be28df4b6e1fd25ec56b484faaff (diff) | |
| download | gitblit-1f9daef870a8c7a984955166a542628d69012ed5.tar.gz gitblit-1f9daef870a8c7a984955166a542628d69012ed5.zip | |
Codepro analyze dependencies. Documentation.
Diffstat (limited to 'src/com/gitblit/utils/DiffUtils.java')
| -rw-r--r-- | src/com/gitblit/utils/DiffUtils.java | 149 |
1 files changed, 149 insertions, 0 deletions
diff --git a/src/com/gitblit/utils/DiffUtils.java b/src/com/gitblit/utils/DiffUtils.java new file mode 100644 index 00000000..d7a4a632 --- /dev/null +++ b/src/com/gitblit/utils/DiffUtils.java @@ -0,0 +1,149 @@ +package com.gitblit.utils;
+
+import java.io.ByteArrayOutputStream;
+import java.util.List;
+
+import org.eclipse.jgit.diff.DiffEntry;
+import org.eclipse.jgit.diff.DiffFormatter;
+import org.eclipse.jgit.diff.RawTextComparator;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevTree;
+import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.treewalk.TreeWalk;
+import org.eclipse.jgit.treewalk.filter.TreeFilter;
+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 String getCommitDiff(Repository r, RevCommit commit, DiffOutputType outputType) {
+ return getCommitDiff(r, null, commit, null, outputType);
+ }
+
+ public static String getCommitDiff(Repository r, RevCommit commit, String path,
+ DiffOutputType outputType) {
+ return getCommitDiff(r, null, commit, path, outputType);
+ }
+
+ public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit,
+ DiffOutputType outputType) {
+ return getCommitDiff(r, baseCommit, commit, null, outputType);
+ }
+
+ public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit,
+ String path, DiffOutputType outputType) {
+ try {
+ RevTree baseTree;
+ if (baseCommit == null) {
+ final RevWalk rw = new RevWalk(r);
+ RevCommit parent = rw.parseCommit(commit.getParent(0).getId());
+ rw.dispose();
+ baseTree = parent.getTree();
+ } else {
+ baseTree = baseCommit.getTree();
+ }
+
+ RevTree commitTree = commit.getTree();
+
+ final TreeWalk walk = new TreeWalk(r);
+ walk.reset();
+ walk.setRecursive(true);
+ walk.addTree(baseTree);
+ walk.addTree(commitTree);
+ walk.setFilter(TreeFilter.ANY_DIFF);
+
+ final ByteArrayOutputStream os = new ByteArrayOutputStream();
+ RawTextComparator cmp = RawTextComparator.DEFAULT;
+ DiffFormatter df;
+ switch (outputType) {
+ case GITWEB:
+ df = new GitWebDiffFormatter(os);
+ break;
+ case GITBLIT:
+ df = new GitBlitDiffFormatter(os);
+ break;
+ case PLAIN:
+ default:
+ df = new DiffFormatter(os);
+ break;
+ }
+ df.setRepository(r);
+ df.setDiffComparator(cmp);
+ df.setDetectRenames(true);
+ List<DiffEntry> diffs = df.scan(baseTree, commitTree);
+ if (path != null && path.length() > 0) {
+ for (DiffEntry diff : diffs) {
+ if (diff.getNewPath().equalsIgnoreCase(path)) {
+ df.format(diff);
+ break;
+ }
+ }
+ } else {
+ df.format(diffs);
+ }
+ String diff;
+ if (df instanceof GitWebDiffFormatter) {
+ // workaround for complex private methods in DiffFormatter
+ diff = ((GitWebDiffFormatter) df).getHtml();
+ } else {
+ diff = os.toString();
+ }
+ df.flush();
+ return diff;
+ } catch (Throwable t) {
+ LOGGER.error("failed to generate commit diff!", t);
+ }
+ return null;
+ }
+
+ public static String getCommitPatch(Repository r, RevCommit baseCommit, RevCommit commit,
+ String path) {
+ try {
+ RevTree baseTree;
+ if (baseCommit == null) {
+ final RevWalk rw = new RevWalk(r);
+ RevCommit parent = rw.parseCommit(commit.getParent(0).getId());
+ baseTree = parent.getTree();
+ } else {
+ baseTree = baseCommit.getTree();
+ }
+ RevTree commitTree = commit.getTree();
+
+ final TreeWalk walk = new TreeWalk(r);
+ walk.reset();
+ walk.setRecursive(true);
+ walk.addTree(baseTree);
+ walk.addTree(commitTree);
+ walk.setFilter(TreeFilter.ANY_DIFF);
+
+ final ByteArrayOutputStream os = new ByteArrayOutputStream();
+ RawTextComparator cmp = RawTextComparator.DEFAULT;
+ PatchFormatter df = new PatchFormatter(os);
+ df.setRepository(r);
+ df.setDiffComparator(cmp);
+ df.setDetectRenames(true);
+ List<DiffEntry> diffs = df.scan(baseTree, commitTree);
+ if (path != null && path.length() > 0) {
+ for (DiffEntry diff : diffs) {
+ if (diff.getNewPath().equalsIgnoreCase(path)) {
+ df.format(diff);
+ break;
+ }
+ }
+ } else {
+ df.format(diffs);
+ }
+ String diff = df.getPatch(commit);
+ df.flush();
+ return diff;
+ } catch (Throwable t) {
+ LOGGER.error("failed to generate commit diff!", t);
+ }
+ return null;
+ }
+}
|