From: James Moger Date: Fri, 24 May 2013 03:13:59 +0000 (-0400) Subject: Implemented compare page for branch/tag/manual diffs (issue-75, issue-133) X-Git-Tag: v1.3.0~120 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=722e2325300c7e5d73a93416e28c20354556fec4;p=gitblit.git Implemented compare page for branch/tag/manual diffs (issue-75, issue-133) --- diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java index 20d2f2a8..dcae53ef 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java @@ -36,6 +36,7 @@ import com.gitblit.wicket.pages.BlobPage; import com.gitblit.wicket.pages.BranchesPage; import com.gitblit.wicket.pages.CommitDiffPage; import com.gitblit.wicket.pages.CommitPage; +import com.gitblit.wicket.pages.ComparePage; import com.gitblit.wicket.pages.DocsPage; import com.gitblit.wicket.pages.FederationRegistrationPage; import com.gitblit.wicket.pages.ForkPage; @@ -106,6 +107,7 @@ public class GitBlitWebApp extends WebApplication { mount("/raw", RawPage.class, "r", "h", "f"); mount("/blobdiff", BlobDiffPage.class, "r", "h", "f"); mount("/commitdiff", CommitDiffPage.class, "r", "h"); + mount("/compare", ComparePage.class, "r", "h"); mount("/patch", PatchPage.class, "r", "h", "f"); mount("/history", HistoryPage.class, "r", "h", "f"); mount("/search", GitSearchPage.class); diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index a6cac546..bec8b35b 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -454,4 +454,8 @@ gb.viewAccess = You do not have Gitblit read or write access gb.overview = overview gb.home = home gb.monthlyActivity = monthly activity -gb.myProfile = my profile \ No newline at end of file +gb.myProfile = my profile +gb.compare = compare +gb.manual = manual +gb.from = from +gb.to = to \ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/WicketUtils.java b/src/main/java/com/gitblit/wicket/WicketUtils.java index 2170d0b7..91686b67 100644 --- a/src/main/java/com/gitblit/wicket/WicketUtils.java +++ b/src/main/java/com/gitblit/wicket/WicketUtils.java @@ -319,6 +319,10 @@ public class WicketUtils { return new PageParameters("r=" + repositoryName + ",h=" + objectId); } + public static PageParameters newRangeParameter(String repositoryName, String startRange, String endRange) { + return new PageParameters("r=" + repositoryName + ",h=" + startRange + ".." + endRange); + } + public static PageParameters newPathParameter(String repositoryName, String objectId, String path) { if (StringUtils.isEmpty(path)) { diff --git a/src/main/java/com/gitblit/wicket/pages/ComparePage.html b/src/main/java/com/gitblit/wicket/pages/ComparePage.html new file mode 100644 index 00000000..8fb6e4f8 --- /dev/null +++ b/src/main/java/com/gitblit/wicket/pages/ComparePage.html @@ -0,0 +1,79 @@ + + + + + + +

+ +

+ + + +

+ +

[commit list]

+ + + + + +

+ +

+ + + + + + +

[change type]

[commit path]

+ + | | | + +

+ + +

[diff text]

+ + + + + \ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/pages/ComparePage.java b/src/main/java/com/gitblit/wicket/pages/ComparePage.java new file mode 100644 index 00000000..f62dc649 --- /dev/null +++ b/src/main/java/com/gitblit/wicket/pages/ComparePage.java @@ -0,0 +1,277 @@ +/* + * Copyright 2013 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.text.MessageFormat; +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.form.DropDownChoice; +import org.apache.wicket.markup.html.form.TextField; +import org.apache.wicket.markup.html.link.BookmarkablePageLink; +import org.apache.wicket.markup.html.link.ExternalLink; +import org.apache.wicket.markup.html.panel.Fragment; +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.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; +import org.apache.wicket.protocol.http.RequestUtils; +import org.apache.wicket.request.target.basic.RedirectRequestTarget; +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.RefModel; +import com.gitblit.models.RepositoryModel; +import com.gitblit.models.SubmoduleModel; +import com.gitblit.utils.DiffUtils; +import com.gitblit.utils.DiffUtils.DiffOutputType; +import com.gitblit.utils.JGitUtils; +import com.gitblit.utils.StringUtils; +import com.gitblit.wicket.SessionlessForm; +import com.gitblit.wicket.WicketUtils; +import com.gitblit.wicket.panels.CommitLegendPanel; +import com.gitblit.wicket.panels.LinkPanel; +import com.gitblit.wicket.panels.LogPanel; + +/** + * The compare page allows you to compare two branches, tags, or hash ids. + * + * @author James Moger + * + */ +public class ComparePage extends RepositoryPage { + + IModel fromCommitId = new Model(""); + IModel toCommitId = new Model(""); + + IModel fromRefId = new Model(""); + IModel toRefId = new Model(""); + + public ComparePage(PageParameters params) { + super(params); + Repository r = getRepository(); + RepositoryModel repository = getRepositoryModel(); + + if (StringUtils.isEmpty(objectId)) { + // seleciton form + add(new Label("comparison").setVisible(false)); + } else { + // active comparison + Fragment comparison = new Fragment("comparison", "comparisonFragment", this); + add(comparison); + + DiffOutputType diffType = DiffOutputType.forName(GitBlit.getString(Keys.web.diffStyle, + DiffOutputType.GITBLIT.name())); + + RevCommit fromCommit; + RevCommit toCommit; + + String[] parts = objectId.split("\\.\\."); + if (parts[0].startsWith("refs/") && parts[1].startsWith("refs/")) { + // set the ref models + fromRefId.setObject(parts[0]); + toRefId.setObject(parts[1]); + + fromCommit = getCommit(r, fromRefId.getObject()); + toCommit = getCommit(r, toRefId.getObject()); + } else { + // set the id models + fromCommitId.setObject(parts[0]); + toCommitId.setObject(parts[1]); + + fromCommit = getCommit(r, fromCommitId.getObject()); + toCommit = getCommit(r, toCommitId.getObject()); + } + + final String startId = fromCommit.getId().getName(); + final String endId = toCommit.getId().getName(); + + // commit ids + fromCommitId.setObject(startId); + toCommitId.setObject(endId); + + String diff = DiffUtils.getDiff(r, fromCommit, toCommit, diffType); + + // compare page links +// comparison.add(new BookmarkablePageLink("patchLink", PatchPage.class, +// WicketUtils.newRangeParameter(repositoryName, fromCommitId.toString(), toCommitId.getObject()))); + + // display list of commits + comparison.add(new LogPanel("commitList", repositoryName, objectId, r, 0, 0, repository.showRemoteBranches)); + + // changed paths list + List paths = JGitUtils.getFilesInRange(r, fromCommit, toCommit); + + comparison.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, endId, entry.path))); + } else if (entry.isSubmodule()) { + // submodule + String submoduleId = entry.objectId; + SubmoduleModel submodule = getSubmodule(entry.path); + submodulePath = submodule.gitblitPath; + hasSubmodule = submodule.hasSubmodule; + + // add relative link + item.add(new LinkPanel("pathName", "list", entry.path + " @ " + getShortObjectId(submoduleId), "#" + entry.path)); + } else { + // add relative link + item.add(new LinkPanel("pathName", "list", entry.path, "#" + entry.path)); + } + + // quick links + if (entry.isSubmodule()) { + // submodule + item.add(new ExternalLink("patch", "").setEnabled(false)); + item.add(new BookmarkablePageLink("view", CommitPage.class, WicketUtils + .newObjectParameter(submodulePath, entry.objectId)).setEnabled(hasSubmodule)); + item.add(new ExternalLink("blame", "").setEnabled(false)); + item.add(new BookmarkablePageLink("history", HistoryPage.class, WicketUtils + .newPathParameter(repositoryName, endId, entry.path)) + .setEnabled(!entry.changeType.equals(ChangeType.ADD))); + } else { + // tree or blob + item.add(new BookmarkablePageLink("patch", PatchPage.class, WicketUtils + .newBlobDiffParameter(repositoryName, startId, endId, entry.path)) + .setEnabled(!entry.changeType.equals(ChangeType.DELETE))); + item.add(new BookmarkablePageLink("view", BlobPage.class, WicketUtils + .newPathParameter(repositoryName, endId, entry.path)) + .setEnabled(!entry.changeType.equals(ChangeType.DELETE))); + item.add(new BookmarkablePageLink("blame", BlamePage.class, WicketUtils + .newPathParameter(repositoryName, endId, entry.path)) + .setEnabled(!entry.changeType.equals(ChangeType.ADD) + && !entry.changeType.equals(ChangeType.DELETE))); + item.add(new BookmarkablePageLink("history", HistoryPage.class, WicketUtils + .newPathParameter(repositoryName, endId, entry.path)) + .setEnabled(!entry.changeType.equals(ChangeType.ADD))); + } + WicketUtils.setAlternatingBackground(item, counter); + counter++; + } + }; + comparison.add(pathsView); + comparison.add(new Label("diffText", diff).setEscapeModelStrings(false)); + } + + // + // ref selection form + // + SessionlessForm refsForm = new SessionlessForm("compareRefsForm", getClass(), getPageParameters()) { + + private static final long serialVersionUID = 1L; + + @Override + public void onSubmit() { + String from = ComparePage.this.fromRefId.getObject(); + String to = ComparePage.this.toRefId.getObject(); + + PageParameters params = WicketUtils.newRangeParameter(repositoryName, from, to); + String relativeUrl = urlFor(ComparePage.class, params).toString(); + String absoluteUrl = RequestUtils.toAbsolutePath(relativeUrl); + getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl)); + } + }; + + List refs = new ArrayList(); + for (RefModel ref : JGitUtils.getLocalBranches(r, true, -1)) { + refs.add(ref.getName()); + } + if (repository.showRemoteBranches) { + for (RefModel ref : JGitUtils.getRemoteBranches(r, true, -1)) { + refs.add(ref.getName()); + } + } + for (RefModel ref : JGitUtils.getTags(r, true, -1)) { + refs.add(ref.getName()); + } + refsForm.add(new DropDownChoice("fromRef", fromRefId, refs).setEnabled(refs.size() > 0)); + refsForm.add(new DropDownChoice("toRef", toRefId, refs).setEnabled(refs.size() > 0)); + add(refsForm); + + // + // manual ids form + // + SessionlessForm idsForm = new SessionlessForm("compareIdsForm", getClass(), getPageParameters()) { + + private static final long serialVersionUID = 1L; + + @Override + public void onSubmit() { + String from = ComparePage.this.fromCommitId.getObject(); + String to = ComparePage.this.toCommitId.getObject(); + + PageParameters params = WicketUtils.newRangeParameter(repositoryName, from, to); + String relativeUrl = urlFor(ComparePage.class, params).toString(); + String absoluteUrl = RequestUtils.toAbsolutePath(relativeUrl); + getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl)); + } + }; + + TextField fromIdField = new TextField("fromId", fromCommitId); + WicketUtils.setInputPlaceholder(fromIdField, getString("gb.from") + "..."); + idsForm.add(fromIdField); + + TextField toIdField = new TextField("toId", toCommitId); + WicketUtils.setInputPlaceholder(toIdField, getString("gb.to") + "..."); + idsForm.add(toIdField); + add(idsForm); + + r.close(); + } + + @Override + protected String getPageName() { + return getString("gb.compare"); + } + + @Override + protected Class getRepoNavPageClass() { + return ComparePage.class; + } + + 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; + } +} diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java index 90fdd40b..8a233ead 100644 --- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java @@ -169,6 +169,7 @@ public abstract class RepositoryPage extends RootPage { } pages.put("commits", new PageRegistration("gb.commits", LogPage.class, params)); pages.put("tree", new PageRegistration("gb.tree", TreePage.class, params)); + pages.put("compare", new PageRegistration("gb.compare", ComparePage.class, params)); if (GitBlit.getBoolean(Keys.web.allowForking, true)) { pages.put("forks", new PageRegistration("gb.forks", ForksPage.class, params)); } diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css index 88f7930e..0a1c3b0b 100644 --- a/src/main/resources/gitblit.css +++ b/src/main/resources/gitblit.css @@ -119,6 +119,11 @@ navbar div>ul .menu-dropdown li a:hover,.nav .menu-dropdown li a:hover,.navbar d color: #ffffff !important; } +.nav-pills > .active > a, .nav-pills > .active > a:hover { + color: #fff; + background-color: #002060; +} + .repositorynavbar { background-color: #fbfbfb; border-bottom: 1px solid #ccc;