| | |
|---|
| | | /*
|
|---|
| | | * 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.Arrays;
|
|---|
| | | 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.html.link.ExternalLink;
|
|---|
| | | 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.StringResourceModel;
|
|---|
| | | import org.eclipse.jgit.diff.DiffEntry.ChangeType;
|
|---|
| | | import org.eclipse.jgit.lib.Repository;
|
|---|
| | | import org.eclipse.jgit.revwalk.RevCommit;
|
|---|
| | |
|
|---|
| | | import com.gitblit.Constants;
|
|---|
| | | import com.gitblit.DownloadZipServlet;
|
|---|
| | | import com.gitblit.GitBlit;
|
|---|
| | | import com.gitblit.Keys;
|
|---|
| | | import com.gitblit.models.GitNote;
|
|---|
| | | import com.gitblit.models.SubmoduleModel;
|
|---|
| | | import com.gitblit.models.PathModel.PathChangeModel;
|
|---|
| | | import com.gitblit.utils.JGitUtils;
|
|---|
| | | import com.gitblit.utils.JGitUtils.SearchType;
|
|---|
| | | 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.GravatarImage;
|
|---|
| | | import com.gitblit.wicket.panels.LinkPanel;
|
|---|
| | | import com.gitblit.wicket.panels.RefsPanel;
|
|---|
| | |
|
|---|
| | | public class CommitPage extends RepositoryPage {
|
|---|
| | |
|
|---|
| | |
|---|
| | | super(params);
|
|---|
| | |
|
|---|
| | | Repository r = getRepository();
|
|---|
| | | RevCommit c = JGitUtils.getCommit(r, objectId);
|
|---|
| | |
|
|---|
| | | RevCommit c = getCommit();
|
|---|
| | | |
|---|
| | | List<String> parents = new ArrayList<String>();
|
|---|
| | | if (c.getParentCount() > 0) {
|
|---|
| | | for (RevCommit parent : c.getParents()) {
|
|---|
| | |
|---|
| | | add(new Label("parentLink", "none"));
|
|---|
| | | add(new Label("commitdiffLink", getString("gb.commitdiff")));
|
|---|
| | | } else {
|
|---|
| | | add(new LinkPanel("parentLink", null, parents.get(0).substring(0, 8), CommitPage.class, newCommitParameter(parents.get(0))));
|
|---|
| | | add(new LinkPanel("commitdiffLink", null, new StringResourceModel("gb.commitdiff", this, null), CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));
|
|---|
| | | add(new LinkPanel("parentLink", null, getShortObjectId(parents.get(0)),
|
|---|
| | | CommitPage.class, newCommitParameter(parents.get(0))));
|
|---|
| | | add(new LinkPanel("commitdiffLink", null, new StringResourceModel("gb.commitdiff",
|
|---|
| | | this, null), CommitDiffPage.class, WicketUtils.newObjectParameter(
|
|---|
| | | repositoryName, objectId)));
|
|---|
| | | }
|
|---|
| | | add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));
|
|---|
| | | add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class,
|
|---|
| | | WicketUtils.newObjectParameter(repositoryName, objectId)));
|
|---|
| | |
|
|---|
| | | add(new LinkPanel("shortlog", "title", c.getShortMessage(), CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));
|
|---|
| | | add(new CommitHeaderPanel("commitHeader", repositoryName, c));
|
|---|
| | |
|
|---|
| | | addRefs(r, c);
|
|---|
| | |
|
|---|
| | | // author
|
|---|
| | | add(createPersonPanel("commitAuthor", c.getAuthorIdent(), SearchType.AUTHOR));
|
|---|
| | | add(WicketUtils.createTimestampLabel("commitAuthorDate", c.getAuthorIdent().getWhen(), getTimeZone()));
|
|---|
| | |
|
|---|
| | | add(createPersonPanel("commitAuthor", c.getAuthorIdent(), Constants.SearchType.AUTHOR));
|
|---|
| | | add(WicketUtils.createTimestampLabel("commitAuthorDate", c.getAuthorIdent().getWhen(),
|
|---|
| | | getTimeZone(), getTimeUtils()));
|
|---|
| | | |
|---|
| | | // committer
|
|---|
| | | add(createPersonPanel("commitCommitter", c.getCommitterIdent(), SearchType.COMMITTER)); |
|---|
| | | add(WicketUtils.createTimestampLabel("commitCommitterDate", c.getCommitterIdent().getWhen(), getTimeZone()));
|
|---|
| | | add(createPersonPanel("commitCommitter", c.getCommitterIdent(), Constants.SearchType.COMMITTER));
|
|---|
| | | add(WicketUtils.createTimestampLabel("commitCommitterDate",
|
|---|
| | | c.getCommitterIdent().getWhen(), getTimeZone(), getTimeUtils()));
|
|---|
| | |
|
|---|
| | | add(new Label("commitId", c.getName()));
|
|---|
| | |
|
|---|
| | | add(new LinkPanel("commitTree", "list", c.getTree().getName(), TreePage.class, newCommitParameter()));
|
|---|
| | | add(new LinkPanel("commitTree", "list", c.getTree().getName(), TreePage.class,
|
|---|
| | | newCommitParameter()));
|
|---|
| | | add(new BookmarkablePageLink<Void>("treeLink", TreePage.class, newCommitParameter()));
|
|---|
| | | final String baseUrl = WicketUtils.getGitblitURL(getRequest());
|
|---|
| | | add(new ExternalLink("zipLink", DownloadZipServlet.asLink(baseUrl, repositoryName,
|
|---|
| | | objectId, null)).setVisible(GitBlit.getBoolean(Keys.web.allowZipDownloads, true)));
|
|---|
| | |
|
|---|
| | | // Parent Commits
|
|---|
| | | ListDataProvider<String> parentsDp = new ListDataProvider<String>(parents);
|
|---|
| | |
|---|
| | |
|
|---|
| | | public void populateItem(final Item<String> item) {
|
|---|
| | | String entry = item.getModelObject();
|
|---|
| | | item.add(new LinkPanel("commitParent", "list", entry, CommitPage.class, newCommitParameter(entry)));
|
|---|
| | | item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, newCommitParameter(entry)));
|
|---|
| | | item.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class, newCommitParameter(entry)));
|
|---|
| | | item.add(new LinkPanel("commitParent", "list", entry, CommitPage.class,
|
|---|
| | | newCommitParameter(entry)));
|
|---|
| | | item.add(new BookmarkablePageLink<Void>("view", CommitPage.class,
|
|---|
| | | newCommitParameter(entry)));
|
|---|
| | | item.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class,
|
|---|
| | | newCommitParameter(entry)));
|
|---|
| | | }
|
|---|
| | | };
|
|---|
| | | add(parentsView);
|
|---|
| | |
|
|---|
| | | addFullText("fullMessage", c.getFullMessage(), true);
|
|---|
| | |
|
|---|
| | | // git notes
|
|---|
| | | List<GitNote> notes = JGitUtils.getNotesOnCommit(r, c);
|
|---|
| | | ListDataProvider<GitNote> notesDp = new ListDataProvider<GitNote>(notes);
|
|---|
| | | DataView<GitNote> notesView = new DataView<GitNote>("notes", notesDp) {
|
|---|
| | | private static final long serialVersionUID = 1L;
|
|---|
| | |
|
|---|
| | | public void populateItem(final Item<GitNote> item) {
|
|---|
| | | GitNote entry = item.getModelObject();
|
|---|
| | | item.add(new RefsPanel("refName", repositoryName, Arrays.asList(entry.notesRef)));
|
|---|
| | | item.add(createPersonPanel("authorName", entry.notesRef.getAuthorIdent(),
|
|---|
| | | Constants.SearchType.AUTHOR));
|
|---|
| | | item.add(new GravatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent()));
|
|---|
| | | item.add(WicketUtils.createTimestampLabel("authorDate", entry.notesRef
|
|---|
| | | .getAuthorIdent().getWhen(), getTimeZone(), getTimeUtils()));
|
|---|
| | | item.add(new Label("noteContent", GitBlit.self().processCommitMessage(
|
|---|
| | | repositoryName, entry.content)).setEscapeModelStrings(false));
|
|---|
| | | }
|
|---|
| | | };
|
|---|
| | | add(notesView.setVisible(notes.size() > 0));
|
|---|
| | |
|
|---|
| | | // changed paths list
|
|---|
| | | List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, c);
|
|---|
| | | add(new CommitLegendPanel("commitLegend", paths));
|
|---|
| | | ListDataProvider<PathChangeModel> pathsDp = new ListDataProvider<PathChangeModel>(paths);
|
|---|
| | | DataView<PathChangeModel> pathsView = new DataView<PathChangeModel>("changedPath", pathsDp) {
|
|---|
| | | private static final long serialVersionUID = 1L;
|
|---|
| | | int counter = 0;
|
|---|
| | | int counter;
|
|---|
| | |
|
|---|
| | | public void populateItem(final Item<PathChangeModel> item) {
|
|---|
| | | final PathChangeModel entry = item.getModelObject();
|
|---|
| | |
|---|
| | | WicketUtils.setChangeTypeCssClass(changeType, entry.changeType);
|
|---|
| | | setChangeTypeTooltip(changeType, entry.changeType);
|
|---|
| | | item.add(changeType);
|
|---|
| | | |
|---|
| | | boolean hasSubmodule = false;
|
|---|
| | | String submodulePath = null;
|
|---|
| | | if (entry.isTree()) {
|
|---|
| | | item.add(new LinkPanel("pathName", null, entry.path, TreePage.class, newPathParameter(entry.path)));
|
|---|
| | | // 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 {
|
|---|
| | | item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class, newPathParameter(entry.path)));
|
|---|
| | | // blob
|
|---|
| | | item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class,
|
|---|
| | | WicketUtils
|
|---|
| | | .newPathParameter(repositoryName, entry.commitId, entry.path)));
|
|---|
| | | }
|
|---|
| | |
|
|---|
| | | item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, newPathParameter(entry.path)));
|
|---|
| | | item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, newPathParameter(entry.path)));
|
|---|
| | | item.add(new BookmarkablePageLink<Void>("blame", BlobPage.class).setEnabled(false));
|
|---|
| | | item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, newPathParameter(entry.path)));
|
|---|
| | | |
|---|
| | | // quick links
|
|---|
| | | if (entry.isSubmodule()) {
|
|---|
| | | // submodule |
|---|
| | | item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, WicketUtils
|
|---|
| | | .newPathParameter(submodulePath, entry.objectId, entry.path))
|
|---|
| | | .setEnabled(false));
|
|---|
| | | item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils
|
|---|
| | | .newObjectParameter(submodulePath, entry.objectId)).setEnabled(hasSubmodule));
|
|---|
| | | item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils
|
|---|
| | | .newPathParameter(submodulePath, entry.objectId, entry.path))
|
|---|
| | | .setEnabled(false));
|
|---|
| | | item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils
|
|---|
| | | .newPathParameter(submodulePath, entry.objectId, entry.path))
|
|---|
| | | .setEnabled(hasSubmodule));
|
|---|
| | | } else {
|
|---|
| | | // tree or blob
|
|---|
| | | item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, WicketUtils
|
|---|
| | | .newPathParameter(repositoryName, entry.commitId, entry.path))
|
|---|
| | | .setEnabled(!entry.changeType.equals(ChangeType.ADD)
|
|---|
| | | && !entry.changeType.equals(ChangeType.DELETE)));
|
|---|
| | | item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils
|
|---|
| | | .newPathParameter(repositoryName, entry.commitId, entry.path)));
|
|---|
| | | item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils
|
|---|
| | | .newPathParameter(repositoryName, entry.commitId, entry.path))
|
|---|
| | | .setEnabled(!entry.changeType.equals(ChangeType.ADD)));
|
|---|
| | | item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils
|
|---|
| | | .newPathParameter(repositoryName, entry.commitId, entry.path))
|
|---|
| | | .setEnabled(!entry.changeType.equals(ChangeType.ADD)));
|
|---|
| | | }
|
|---|
| | |
|
|---|
| | | WicketUtils.setAlternatingBackground(item, counter);
|
|---|
| | | counter++;
|
|---|
| | |
|---|
| | | };
|
|---|
| | | add(pathsView);
|
|---|
| | | }
|
|---|
| | | |
|---|
| | |
|
|---|
| | | @Override
|
|---|
| | | protected String getPageName() {
|
|---|
| | | return getString("gb.commit");
|
|---|
