From 32dc8c83e3f8f0e67c9e0c11d536371244852d18 Mon Sep 17 00:00:00 2001 From: ajermakovics Date: Tue, 18 Sep 2012 17:45:32 +0100 Subject: [PATCH] Diff page can now show a diff between two branches To see a diff between two branches use the syntax: /commitdiff/myRepo/branch1..branch2 --- .../gitblit/wicket/pages/CommitDiffPage.java | 346 ++++++++++-------- 1 file changed, 195 insertions(+), 151 deletions(-) diff --git a/src/com/gitblit/wicket/pages/CommitDiffPage.java b/src/com/gitblit/wicket/pages/CommitDiffPage.java index dbf981b4..585ce8e3 100644 --- a/src/com/gitblit/wicket/pages/CommitDiffPage.java +++ b/src/com/gitblit/wicket/pages/CommitDiffPage.java @@ -1,151 +1,195 @@ -/* - * Copyright 2011 gitblit.com. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gitblit.wicket.pages; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.wicket.PageParameters; -import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.link.BookmarkablePageLink; -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.models.SubmoduleModel; -import com.gitblit.utils.DiffUtils; -import com.gitblit.utils.DiffUtils.DiffOutputType; -import com.gitblit.utils.JGitUtils; -import com.gitblit.wicket.WicketUtils; -import com.gitblit.wicket.panels.CommitHeaderPanel; -import com.gitblit.wicket.panels.CommitLegendPanel; -import com.gitblit.wicket.panels.LinkPanel; - -public class CommitDiffPage extends RepositoryPage { - - public CommitDiffPage(PageParameters params) { - super(params); - - Repository r = getRepository(); - RevCommit commit = getCommit(); - DiffOutputType diffType = DiffOutputType.forName(GitBlit.getString(Keys.web.diffStyle, - DiffOutputType.GITBLIT.name())); - String diff = DiffUtils.getCommitDiff(r, commit, diffType); - - List parents = new ArrayList(); - if (commit.getParentCount() > 0) { - for (RevCommit parent : commit.getParents()) { - parents.add(parent.name()); - } - } - - // commit page links - if (parents.size() == 0) { - add(new Label("parentLink", getString("gb.none"))); - } else { - add(new LinkPanel("parentLink", null, parents.get(0).substring(0, 8), - CommitDiffPage.class, newCommitParameter(parents.get(0)))); - } - add(new BookmarkablePageLink("patchLink", PatchPage.class, - WicketUtils.newObjectParameter(repositoryName, objectId))); - add(new BookmarkablePageLink("commitLink", CommitPage.class, - WicketUtils.newObjectParameter(repositoryName, objectId))); - - add(new CommitHeaderPanel("commitHeader", repositoryName, commit)); - - // changed paths list - List paths = JGitUtils.getFilesInCommit(r, commit); - add(new CommitLegendPanel("commitLegend", paths)); - ListDataProvider pathsDp = new ListDataProvider(paths); - DataView pathsView = new DataView("changedPath", pathsDp) { - private static final long serialVersionUID = 1L; - int counter; - - public void populateItem(final Item item) { - final PathChangeModel entry = item.getModelObject(); - Label changeType = new Label("changeType", ""); - WicketUtils.setChangeTypeCssClass(changeType, entry.changeType); - setChangeTypeTooltip(changeType, entry.changeType); - item.add(changeType); - - boolean hasSubmodule = false; - String submodulePath = null; - if (entry.isTree()) { - // tree - item.add(new LinkPanel("pathName", null, entry.path, TreePage.class, - WicketUtils - .newPathParameter(repositoryName, entry.commitId, entry.path))); - } else if (entry.isSubmodule()) { - // submodule - String submoduleId = entry.objectId; - SubmoduleModel submodule = getSubmodule(entry.path); - submodulePath = submodule.gitblitPath; - hasSubmodule = submodule.hasSubmodule; - - item.add(new LinkPanel("pathName", "list", entry.path + " @ " + - getShortObjectId(submoduleId), TreePage.class, - WicketUtils - .newPathParameter(submodulePath, submoduleId, "")).setEnabled(hasSubmodule)); - } else { - // blob - item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class, - WicketUtils - .newPathParameter(repositoryName, entry.commitId, entry.path))); - } - - // quick links - if (entry.isSubmodule()) { - // submodule - item.add(new BookmarkablePageLink("patch", PatchPage.class, WicketUtils - .newPathParameter(submodulePath, entry.objectId, entry.path)).setEnabled(false)); - item.add(new BookmarkablePageLink("view", CommitPage.class, WicketUtils - .newObjectParameter(submodulePath, entry.objectId)).setEnabled(hasSubmodule)); - item.add(new BookmarkablePageLink("blame", BlamePage.class, WicketUtils - .newPathParameter(submodulePath, entry.objectId, entry.path)).setEnabled(false)); - item.add(new BookmarkablePageLink("history", HistoryPage.class, WicketUtils - .newPathParameter(submodulePath, entry.objectId, entry.path)) - .setEnabled(hasSubmodule)); - } else { - // tree or blob - item.add(new BookmarkablePageLink("patch", PatchPage.class, WicketUtils - .newPathParameter(repositoryName, entry.commitId, entry.path))); - item.add(new BookmarkablePageLink("view", BlobPage.class, WicketUtils - .newPathParameter(repositoryName, entry.commitId, entry.path))); - item.add(new BookmarkablePageLink("blame", BlamePage.class, WicketUtils - .newPathParameter(repositoryName, entry.commitId, entry.path))); - item.add(new BookmarkablePageLink("history", HistoryPage.class, WicketUtils - .newPathParameter(repositoryName, entry.commitId, entry.path)) - .setEnabled(!entry.changeType.equals(ChangeType.ADD))); - } - WicketUtils.setAlternatingBackground(item, counter); - counter++; - } - }; - add(pathsView); - add(new Label("diffText", diff).setEscapeModelStrings(false)); - } - - @Override - protected String getPageName() { - return getString("gb.commitdiff"); - } -} +/* + * Copyright 2011 gitblit.com. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gitblit.wicket.pages; + +import java.util.ArrayList; +import java.util.List; + +import java.text.MessageFormat; + +import org.apache.wicket.PageParameters; +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.link.BookmarkablePageLink; +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.models.SubmoduleModel; +import com.gitblit.utils.DiffUtils; +import com.gitblit.utils.DiffUtils.DiffOutputType; +import com.gitblit.utils.JGitUtils; +import com.gitblit.wicket.WicketUtils; +import com.gitblit.wicket.panels.CommitHeaderPanel; +import com.gitblit.wicket.panels.CommitLegendPanel; +import com.gitblit.wicket.panels.LinkPanel; + +public class CommitDiffPage extends RepositoryPage { + + public CommitDiffPage(PageParameters params) { + super(params); + + Repository r = getRepository(); + + DiffOutputType diffType = DiffOutputType.forName(GitBlit.getString(Keys.web.diffStyle, + DiffOutputType.GITBLIT.name())); + + RevCommit commit = null, otherCommit = null; + + if( objectId.contains("..") ) + { + String[] parts = objectId.split("\\.\\."); + commit = getCommit(r, parts[0]); + otherCommit = getCommit(r, parts[1]); + } + else + { + commit = getCommit(); + } + + String diff; + + if(otherCommit == null) + { + diff = DiffUtils.getCommitDiff(r, commit, diffType); + } + else + { + diff = DiffUtils.getDiff(r, commit, otherCommit, diffType); + } + + List parents = new ArrayList(); + if (commit.getParentCount() > 0) { + for (RevCommit parent : commit.getParents()) { + parents.add(parent.name()); + } + } + + // commit page links + if (parents.size() == 0) { + add(new Label("parentLink", getString("gb.none"))); + } else { + add(new LinkPanel("parentLink", null, parents.get(0).substring(0, 8), + CommitDiffPage.class, newCommitParameter(parents.get(0)))); + } + add(new BookmarkablePageLink("patchLink", PatchPage.class, + WicketUtils.newObjectParameter(repositoryName, objectId))); + add(new BookmarkablePageLink("commitLink", CommitPage.class, + WicketUtils.newObjectParameter(repositoryName, objectId))); + + add(new CommitHeaderPanel("commitHeader", repositoryName, commit)); + + // changed paths list + List paths; + + if( otherCommit == null ) + { + paths = JGitUtils.getFilesInCommit(r, commit); + } + else + { + paths = JGitUtils.getFilesInCommit(r, otherCommit); + } + + add(new CommitLegendPanel("commitLegend", paths)); + ListDataProvider pathsDp = new ListDataProvider(paths); + DataView pathsView = new DataView("changedPath", pathsDp) { + private static final long serialVersionUID = 1L; + int counter; + + public void populateItem(final Item item) { + final PathChangeModel entry = item.getModelObject(); + Label changeType = new Label("changeType", ""); + WicketUtils.setChangeTypeCssClass(changeType, entry.changeType); + setChangeTypeTooltip(changeType, entry.changeType); + item.add(changeType); + + boolean hasSubmodule = false; + String submodulePath = null; + if (entry.isTree()) { + // tree + item.add(new LinkPanel("pathName", null, entry.path, TreePage.class, + WicketUtils + .newPathParameter(repositoryName, entry.commitId, entry.path))); + } else if (entry.isSubmodule()) { + // submodule + String submoduleId = entry.objectId; + SubmoduleModel submodule = getSubmodule(entry.path); + submodulePath = submodule.gitblitPath; + hasSubmodule = submodule.hasSubmodule; + + item.add(new LinkPanel("pathName", "list", entry.path + " @ " + + getShortObjectId(submoduleId), TreePage.class, + WicketUtils + .newPathParameter(submodulePath, submoduleId, "")).setEnabled(hasSubmodule)); + } else { + // blob + item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class, + WicketUtils + .newPathParameter(repositoryName, entry.commitId, entry.path))); + } + + // quick links + if (entry.isSubmodule()) { + // submodule + item.add(new BookmarkablePageLink("patch", PatchPage.class, WicketUtils + .newPathParameter(submodulePath, entry.objectId, entry.path)).setEnabled(false)); + item.add(new BookmarkablePageLink("view", CommitPage.class, WicketUtils + .newObjectParameter(submodulePath, entry.objectId)).setEnabled(hasSubmodule)); + item.add(new BookmarkablePageLink("blame", BlamePage.class, WicketUtils + .newPathParameter(submodulePath, entry.objectId, entry.path)).setEnabled(false)); + item.add(new BookmarkablePageLink("history", HistoryPage.class, WicketUtils + .newPathParameter(submodulePath, entry.objectId, entry.path)) + .setEnabled(hasSubmodule)); + } else { + // tree or blob + item.add(new BookmarkablePageLink("patch", PatchPage.class, WicketUtils + .newPathParameter(repositoryName, entry.commitId, entry.path))); + item.add(new BookmarkablePageLink("view", BlobPage.class, WicketUtils + .newPathParameter(repositoryName, entry.commitId, entry.path))); + item.add(new BookmarkablePageLink("blame", BlamePage.class, WicketUtils + .newPathParameter(repositoryName, entry.commitId, entry.path))); + item.add(new BookmarkablePageLink("history", HistoryPage.class, WicketUtils + .newPathParameter(repositoryName, entry.commitId, entry.path)) + .setEnabled(!entry.changeType.equals(ChangeType.ADD))); + } + WicketUtils.setAlternatingBackground(item, counter); + counter++; + } + }; + add(pathsView); + add(new Label("diffText", diff).setEscapeModelStrings(false)); + } + + @Override + protected String getPageName() { + return getString("gb.commitdiff"); + } + + private RevCommit getCommit(Repository r, String rev) + { + RevCommit otherCommit = JGitUtils.getCommit(r, rev); + if (otherCommit == null) { + error(MessageFormat.format(getString("gb.failedToFindCommit"), rev, repositoryName, getPageName()), true); + } + return otherCommit; + } +} -- 2.39.5