From 16856603ec575718857768e2d18e455c95fd6ea4 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 07 Jun 2011 19:08:24 -0400 Subject: [PATCH] Documentation. Moved clone and fetch into JGitUtils. Create bare only. --- src/com/gitblit/wicket/pages/CommitDiffPage.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/com/gitblit/wicket/pages/CommitDiffPage.java b/src/com/gitblit/wicket/pages/CommitDiffPage.java index 81ee520..4815b2c 100644 --- a/src/com/gitblit/wicket/pages/CommitDiffPage.java +++ b/src/com/gitblit/wicket/pages/CommitDiffPage.java @@ -24,19 +24,20 @@ import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; +import org.eclipse.jgit.diff.DiffEntry.ChangeType; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; import com.gitblit.GitBlit; import com.gitblit.Keys; +import com.gitblit.models.PathModel.PathChangeModel; +import com.gitblit.utils.DiffUtils; +import com.gitblit.utils.DiffUtils.DiffOutputType; import com.gitblit.utils.JGitUtils; -import com.gitblit.utils.JGitUtils.DiffOutputType; -import com.gitblit.wicket.LinkPanel; -import com.gitblit.wicket.RepositoryPage; import com.gitblit.wicket.WicketUtils; -import com.gitblit.wicket.models.PathModel.PathChangeModel; import com.gitblit.wicket.panels.CommitHeaderPanel; import com.gitblit.wicket.panels.CommitLegendPanel; +import com.gitblit.wicket.panels.LinkPanel; public class CommitDiffPage extends RepositoryPage { @@ -47,7 +48,7 @@ RevCommit commit = getCommit(); DiffOutputType diffType = DiffOutputType.forName(GitBlit.getString(Keys.web.diffStyle, DiffOutputType.GITBLIT.name())); - String diff = JGitUtils.getCommitDiff(r, commit, diffType); + String diff = DiffUtils.getCommitDiff(r, commit, diffType); List<String> parents = new ArrayList<String>(); if (commit.getParentCount() > 0) { @@ -99,7 +100,7 @@ newPathParameter(entry.path))); item.add(new BookmarkablePageLink<Void>("blame", BlobPage.class).setEnabled(false)); item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, - newPathParameter(entry.path))); + newPathParameter(entry.path)).setEnabled(!entry.changeType.equals(ChangeType.ADD) && !entry.changeType.equals(ChangeType.DELETE))); WicketUtils.setAlternatingBackground(item, counter); counter++; -- Gitblit v1.9.1