The Unified and Autonomous Development Platform
Minor adjustment of commit hash displaying in commit detail page
robin shine36ab14711164
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitDetailPage.html b/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitDetailPage.htmlindex 5fd9d8092a..160675bc8e 100644--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitDetailPage.html+++ b/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitDetailPage.html@@ -1,53 +1,51 @@-<wicket:extend>- <div id="commit-detail">- <div class="info">- <div class="message">- <div class="subject clearfix">- <div wicket:id="text" class="pull-left"></div>- <div class="btn-group pull-right">- <a wicket:id="browseCode" title="browse code" class="btn btn-default btn-sm"><i class="fa fa-file-text-o"></i></a>- <a wicket:id="createBranch" title="Branch from this commit" class="btn btn-default btn-sm"><i class="fa fa-code-fork"></i></a>- <a wicket:id="createTag" title="Tag this commit" class="btn btn-default btn-sm"><i class="fa fa-tag"></i></a>- </div>- </div>- <pre wicket:id="detail" class="detail"></pre>- </div>- <div wicket:id="refs" class="refs"></div>- <div class="contribution-and-parents clearfix">- <div class="contribution pull-left">- <span wicket:id="contributorAvatars"></span>- <span wicket:id="contribution"></span>- </div>- <div wicket:id="parents" class="parents pull-right">- <wicket:enclosure child="parent">- <div class="single">- <label>1 parent</label>- <a wicket:id="parent" class="parent hash"><span wicket:id="label"></span></a>- </div>- </wicket:enclosure>- <wicket:enclosure child="parents">- <div class="multiple">- <label wicket:id="count"></label>- <div wicket:id="parents" class="parent btn-group">- <a wicket:id="link" title="Show commit of this parent" class="commit btn btn-default btn-sm"><span wicket:id="label"></span></a>- <a wicket:id="diff" title="Compare with this parent" class="diff btn btn-default btn-sm"><i class="fa fa-ext fa-file-diff"></i></a>- </div>- </div>- </wicket:enclosure>- </div>- <div class="commit pull-right">- <span class="btn-group">- <a wicket:id="hashLink" class="hash btn btn-sm btn-default" title="Browse code"><span wicket:id="hash"></span></a>- <a wicket:id="copyHash" class="btn btn-sm btn-default"><i class="fa fa-clipboard"></i></a>- </span>- </div>- </div>- </div>- <div wicket:id="revisionDiff"></div>- </div>- <wicket:fragment wicket:id="refsFrag">- <span wicket:id="refs">- <a wicket:id="link"><span wicket:id="label"></span></a>- </span>- </wicket:fragment>-</wicket:extend>+<wicket:extend>+ <div id="commit-detail">+ <div class="info">+ <div class="message">+ <div class="subject clearfix">+ <div wicket:id="text" class="pull-left"></div>+ <div class="btn-group pull-right">+ <a wicket:id="browseCode" title="browse code" class="btn btn-default btn-sm"><i class="fa fa-file-text-o"></i></a>+ <a wicket:id="createBranch" title="Branch from this commit" class="btn btn-default btn-sm"><i class="fa fa-code-fork"></i></a>+ <a wicket:id="createTag" title="Tag this commit" class="btn btn-default btn-sm"><i class="fa fa-tag"></i></a>+ </div>+ </div>+ <pre wicket:id="detail" class="detail"></pre>+ </div>+ <div wicket:id="refs" class="refs"></div>+ <div class="contribution-and-parents clearfix">+ <div class="contribution pull-left">+ <span wicket:id="contributorAvatars"></span>+ <span wicket:id="contribution"></span>+ </div>+ <div wicket:id="parents" class="parents pull-right">+ <wicket:enclosure child="parent">+ <div class="single">+ <label>1 parent</label>+ <a wicket:id="parent" class="parent hash"><span wicket:id="label"></span></a>+ </div>+ </wicket:enclosure>+ <wicket:enclosure child="parents">+ <div class="multiple">+ <label wicket:id="count"></label>+ <div wicket:id="parents" class="parent btn-group">+ <a wicket:id="link" title="Show commit of this parent" class="commit btn btn-default btn-sm"><span wicket:id="label"></span></a>+ <a wicket:id="diff" title="Compare with this parent" class="diff btn btn-default btn-sm"><i class="fa fa-ext fa-file-diff"></i></a>+ </div>+ </div>+ </wicket:enclosure>+ </div>+ <div class="commit pull-right">+ <span wicket:id="hash" class="hash"></span>+ <a wicket:id="copyHash"><i class="fa fa-clipboard"></i></a>+ </div>+ </div>+ </div>+ <div wicket:id="revisionDiff"></div>+ </div>+ <wicket:fragment wicket:id="refsFrag">+ <span wicket:id="refs">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </span>+ </wicket:fragment>+</wicket:extend>diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitDetailPage.java b/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitDetailPage.javaindex e27b52d9e7..5ec08e2bd8 100644--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitDetailPage.java+++ b/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitDetailPage.java@@ -1,549 +1,544 @@-package com.pmease.gitplex.web.page.depot.commit;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.HashMap;-import java.util.List;-import java.util.Map;-import java.util.Set;-import java.util.stream.Collectors;--import javax.annotation.Nullable;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.RevCommit;--import com.google.common.base.Preconditions;-import com.pmease.commons.git.BlobIdent;-import com.pmease.commons.git.GitUtils;-import com.pmease.commons.git.RefInfo;-import com.pmease.commons.lang.diff.WhitespaceOption;-import com.pmease.commons.wicket.behavior.clipboard.CopyClipboardBehavior;-import com.pmease.gitplex.core.GitPlex;-import com.pmease.gitplex.core.entity.CodeComment;-import com.pmease.gitplex.core.entity.Depot;-import com.pmease.gitplex.core.entity.PullRequest;-import com.pmease.gitplex.core.entity.support.CommentPos;-import com.pmease.gitplex.core.manager.CodeCommentManager;-import com.pmease.gitplex.core.manager.CommitInfoManager;-import com.pmease.gitplex.web.component.avatar.ContributorAvatars;-import com.pmease.gitplex.web.component.commitmessage.CommitMessageLabel;-import com.pmease.gitplex.web.component.contributorpanel.ContributorPanel;-import com.pmease.gitplex.web.component.createbranch.CreateBranchLink;-import com.pmease.gitplex.web.component.createtag.CreateTagLink;-import com.pmease.gitplex.web.component.diff.revision.CommentSupport;-import com.pmease.gitplex.web.component.diff.revision.RevisionDiffPanel;-import com.pmease.gitplex.web.page.depot.DepotPage;-import com.pmease.gitplex.web.page.depot.branches.DepotBranchesPage;-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;-import com.pmease.gitplex.web.page.depot.tags.DepotTagsPage;--@SuppressWarnings("serial")-public class CommitDetailPage extends DepotPage implements CommentSupport {-- private static final String PARAM_REVISION = "revision";-- // make sure to use a different value from wicket:id according to wicket bug:- // https://issues.apache.org/jira/browse/WICKET-6069- private static final String PARAM_COMPARE_WITH = "compare-with";-- private static final String PARAM_BLAME_FILE = "blame-file";-- private static final String PARAM_WHITESPACE_OPTION = "whitespace-option";-- private static final String PARAM_PATH_FILTER = "path-filter";-- private static final String PARAM_COMMENT = "comment";-- private static final String PARAM_MARK = "mark";-- private State state;-- private ObjectId resolvedRevision;-- private ObjectId resolvedCompareWith;-- private RevisionDiffPanel revisionDiff;-- public CommitDetailPage(PageParameters params) {- super(params);-- state = new State(params);- resolvedRevision = getDepot().getRevCommit(state.revision).copy();- if (state.compareWith != null)- resolvedCompareWith = getDepot().getRevCommit(state.compareWith).copy();- }-- private RevCommit getCommit() {- return getDepot().getRevCommit(state.revision);- }-- private List<RevCommit> getParents() {- List<RevCommit> parents = new ArrayList<>();- for (RevCommit parent: getCommit().getParents())- parents.add(parent);- return parents;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new CommitMessageLabel("text", depotModel, Model.of(getCommit().getShortMessage())));-- DepotFilePage.State browseState = new DepotFilePage.State();- browseState.blobIdent = new BlobIdent(getCommit().name(), null, FileMode.TYPE_TREE);- PageParameters params = DepotFilePage.paramsOf(depotModel.getObject(), browseState);- add(new BookmarkablePageLink<Void>("browseCode", DepotFilePage.class, params));-- add(new CreateBranchLink("createBranch", depotModel, state.revision) {-- @Override- protected void onCreate(AjaxRequestTarget target, String branch) {- setResponsePage(DepotBranchesPage.class, DepotBranchesPage.paramsOf(getDepot()));- }-- });-- add(new CreateTagLink("createTag", depotModel, state.revision) {-- @Override- protected void onCreate(AjaxRequestTarget target, String tag) {- setResponsePage(DepotTagsPage.class, DepotTagsPage.paramsOf(getDepot()));- }-- });-- String message = GitUtils.getDetailMessage(getCommit());- if (message != null) {- add(new CommitMessageLabel("detail", depotModel, Model.of(message)));- } else {- add(new WebMarkupContainer("detail").setVisible(false));- }-- add(new AjaxLazyLoadPanel("refs") {-- @Override- public Component getLazyLoadComponent(String markupId) {- Fragment fragment = new Fragment(markupId, "refsFrag", CommitDetailPage.this) {-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- String script = String.format("gitplex.commitdetail.initRefs('%s');", getMarkupId());- response.render(OnDomReadyHeaderItem.forScript(script));- }-- };- fragment.add(new ListView<RefInfo>("refs", new LoadableDetachableModel<List<RefInfo>>() {-- @Override- protected List<RefInfo> load() {- Set<ObjectId> descendants = GitPlex.getInstance(CommitInfoManager.class)- .getDescendants(getDepot(), getCommit().getId());- descendants.add(getCommit().getId());-- List<RefInfo> refs = new ArrayList<>();- refs.addAll(getDepot().getBranches());- refs.addAll(getDepot().getTags());- return refs.stream().filter(ref->descendants.contains(ref.getPeeledObj())).collect(Collectors.toList());- }-- }) {-- @Override- protected void populateItem(ListItem<RefInfo> item) {- String ref = item.getModelObject().getRef().getName();- String branch = GitUtils.ref2branch(ref);- if (branch != null) {- DepotFilePage.State state = new DepotFilePage.State();- state.blobIdent.revision = branch;- Link<Void> link = new BookmarkablePageLink<Void>("link", DepotFilePage.class,- DepotFilePage.paramsOf(depotModel.getObject(), state));- link.add(new Label("label", branch));- item.add(link);- item.add(AttributeAppender.append("class", "branch"));- } else {- String tag = Preconditions.checkNotNull(GitUtils.ref2tag(ref));- DepotFilePage.State state = new DepotFilePage.State();- state.blobIdent.revision = tag;- Link<Void> link = new BookmarkablePageLink<Void>("link", DepotFilePage.class,- DepotFilePage.paramsOf(depotModel.getObject(), state));- link.add(new Label("label", tag));- item.add(link);- item.add(AttributeAppender.append("class", "tag"));- }- }-- });- return fragment;- }-- });-- add(new ContributorAvatars("contributorAvatars", getCommit().getAuthorIdent(), getCommit().getCommitterIdent()));- add(new ContributorPanel("contribution", getCommit().getAuthorIdent(), getCommit().getCommitterIdent(), true));-- DepotFilePage.State fileState = new DepotFilePage.State();- fileState.blobIdent.revision = getCommit().name();- params = DepotFilePage.paramsOf(depotModel.getObject(), fileState);- Link<Void> hashLink = new BookmarkablePageLink<Void>("hashLink", DepotFilePage.class, params);- add(hashLink);- hashLink.add(new Label("hash", GitUtils.abbreviateSHA(getCommit().name())));- add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(getCommit().name()))));-- newParentsContainer(null);-- if (getCommit().getParentCount() != 0) {- newRevisionDiff(null);- } else {- add(new WebMarkupContainer("revisionDiff").setVisible(false));- }- }-- private void newParentsContainer(@Nullable AjaxRequestTarget target) {- WebMarkupContainer parentsContainer = new WebMarkupContainer("parents");- parentsContainer.setOutputMarkupId(true);- if (getParents().size() == 1) {- RevCommit parent = getParents().get(0);- State newState = new State();- newState.revision = parent.name();- newState.whitespaceOption = state.whitespaceOption;- newState.pathFilter = state.pathFilter;- Link<Void> link = new BookmarkablePageLink<Void>("parent", CommitDetailPage.class,- paramsOf(depotModel.getObject(), newState));- link.add(new Label("label", GitUtils.abbreviateSHA(parent.name())));- parentsContainer.add(link);- parentsContainer.add(new WebMarkupContainer("parents").setVisible(false));- } else {- parentsContainer.add(new WebMarkupContainer("parent").setVisible(false));- parentsContainer.add(new Label("count", getParents().size() + " parents"));- parentsContainer.add(new ListView<RevCommit>("parents", new LoadableDetachableModel<List<RevCommit>>() {-- @Override- protected List<RevCommit> load() {- return getParents();- }-- }) {-- @Override- protected void populateItem(ListItem<RevCommit> item) {- RevCommit parent = item.getModelObject();-- State newState = new State();- newState.revision = parent.name();- newState.whitespaceOption = state.whitespaceOption;- newState.pathFilter = state.pathFilter;-- Link<Void> link = new BookmarkablePageLink<Void>("link", CommitDetailPage.class,- paramsOf(depotModel.getObject(), newState));- link.add(new Label("label", GitUtils.abbreviateSHA(parent.name())));- item.add(link);-- item.add(new AjaxLink<Void>("diff") {-- @Override- public void onClick(AjaxRequestTarget target) {- state.compareWith = item.getModelObject().name();- resolvedCompareWith = item.getModelObject().copy();-- target.add(parentsContainer);- newRevisionDiff(target);- pushState(target);- }-- @Override- protected void onInitialize() {- super.onInitialize();- if (item.getModelObject().equals(getCompareWith()))- add(AttributeAppender.append("class", "active"));- }-- });- }-- });- }- if (target != null) {- replace(parentsContainer);- target.add(parentsContainer);- } else {- add(parentsContainer);- }- }-- private ObjectId getCompareWith() {- List<RevCommit> parents = getParents();- if (resolvedCompareWith != null) {- if (parents.contains(resolvedCompareWith))- return resolvedCompareWith;- else- return parents.get(0);- } else {- return parents.get(0);- }- }-- private void newRevisionDiff(@Nullable AjaxRequestTarget target) {- IModel<String> blameModel = new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return state.blameFile;- }-- @Override- public void setObject(String object) {- state.blameFile = object;- pushState(RequestCycle.get().find(AjaxRequestTarget.class));- }-- };- IModel<String> pathFilterModel = new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return state.pathFilter;- }-- @Override- public void setObject(String object) {- state.pathFilter = object;- pushState(RequestCycle.get().find(AjaxRequestTarget.class));- }-- };- IModel<WhitespaceOption> whitespaceOptionModel = new IModel<WhitespaceOption>() {-- @Override- public void detach() {- }-- @Override- public WhitespaceOption getObject() {- return state.whitespaceOption;- }-- @Override- public void setObject(WhitespaceOption object) {- state.whitespaceOption = object;- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);- newParentsContainer(target);- pushState(target);- }-- };- revisionDiff = new RevisionDiffPanel("revisionDiff", depotModel,- Model.of((PullRequest)null), getCompareWith().name(), state.revision,- pathFilterModel, whitespaceOptionModel, blameModel, this);- revisionDiff.setOutputMarkupId(true);- if (target != null) {- replace(revisionDiff);- target.add(revisionDiff);- } else {- add(revisionDiff);- }- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new CommitDetailResourceReference()));- }-- public static PageParameters paramsOf(Depot depot, State state) {- PageParameters params = paramsOf(depot);- params.set(PARAM_REVISION, state.revision);- if (state.compareWith != null)- params.set(PARAM_COMPARE_WITH, state.compareWith);- if (state.whitespaceOption != WhitespaceOption.DEFAULT)- params.set(PARAM_WHITESPACE_OPTION, state.whitespaceOption.name());- if (state.pathFilter != null)- params.set(PARAM_PATH_FILTER, state.pathFilter);- if (state.blameFile != null)- params.set(PARAM_BLAME_FILE, state.blameFile);- if (state.commentId != null)- params.set(PARAM_COMMENT, state.commentId);- if (state.mark != null)- params.set(PARAM_MARK, state.mark.toString());- return params;- }-- public static PageParameters paramsOf(Depot depot, String revision) {- State state = new State();- state.revision = revision;- return paramsOf(depot, state);- }-- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(DepotCommitsPage.class, paramsOf(depot));- }-- private void pushState(AjaxRequestTarget target) {- PageParameters params = paramsOf(getDepot(), state);- CharSequence url = RequestCycle.get().urlFor(CommitDetailPage.class, params);- pushState(target, url.toString(), state);- }-- @Override- protected void onPopState(AjaxRequestTarget target, Serializable data) {- super.onPopState(target, data);-- state = (State) data;- newRevisionDiff(target);- }-- public static class State implements Serializable {-- private static final long serialVersionUID = 1L;-- public String revision;-- @Nullable- public String compareWith;-- @Nullable- public Long commentId;-- public WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;-- @Nullable- public String pathFilter;-- @Nullable- public String blameFile;-- @Nullable- public CommentPos mark;-- public State() {- }-- public State(PageParameters params) {- revision = GitUtils.normalizePath(params.get(PARAM_REVISION).toString());- compareWith = params.get(PARAM_COMPARE_WITH).toString();- whitespaceOption = WhitespaceOption.ofNullableName(params.get(PARAM_WHITESPACE_OPTION).toString());- pathFilter = params.get(PARAM_PATH_FILTER).toString();- blameFile = params.get(PARAM_BLAME_FILE).toString();- commentId = params.get(PARAM_COMMENT).toOptionalLong();- mark = CommentPos.fromString(params.get(PARAM_MARK).toString());- }-- }-- @Override- public CommentPos getMark() {- return state.mark;- }-- @Override- public String getMarkUrl(CommentPos mark) {- State markState = new State();- markState.mark = mark;- markState.whitespaceOption = state.whitespaceOption;- markState.compareWith = state.compareWith;- markState.pathFilter = state.pathFilter;- markState.revision = resolvedRevision.name();- return urlFor(CommitDetailPage.class, paramsOf(getDepot(), markState)).toString();- }-- @Override- public String getCommentUrl(CodeComment comment) {- State commentState = new State();- String compareWith = getCompareWith().name();- commentState.mark = comment.getCommentPos();- commentState.commentId = comment.getId();- commentState.whitespaceOption = state.whitespaceOption;- commentState.compareWith = compareWith;- commentState.pathFilter = state.pathFilter;- commentState.revision = resolvedRevision.name();- return urlFor(CommitDetailPage.class, paramsOf(getDepot(), commentState)).toString();- }-- @Override- public CodeComment getOpenComment() {- if (state.commentId != null)- return GitPlex.getInstance(CodeCommentManager.class).load(state.commentId);- else- return null;- }-- @Override- public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {- if (comment != null) {- state.commentId = comment.getId();- state.mark = comment.getCommentPos();- } else {- state.commentId = null;- state.mark = null;- }- pushState(target);- }-- @Override- public void onMark(AjaxRequestTarget target, CommentPos mark) {- state.mark = mark;- pushState(target);- }-- @Override- public void onAddComment(AjaxRequestTarget target, CommentPos mark) {- state.commentId = null;- state.mark = mark;- pushState(target);- }-- /*- * In case we are on a branch, this operation makes sure that the branch resolves- * to a certain commit during the life cycle of our page, unless the page is- * refreshed. This can avoid the issue that displayed file content and subsequent- * operations encounters different commit if someone commits to the branch while- * we are staying on the page.- */- @Override- protected Map<String, ObjectId> getObjectIdCache() {- Map<String, ObjectId> objectIdCache = new HashMap<>();- if (resolvedRevision != null)- objectIdCache.put(state.revision, resolvedRevision);- if (resolvedCompareWith != null)- objectIdCache.put(state.compareWith, resolvedCompareWith);- return objectIdCache;- }-- @Override- public String getAnchor() {- return null;- }--}+package com.pmease.gitplex.web.page.depot.commit;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.Set;+import java.util.stream.Collectors;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;++import com.google.common.base.Preconditions;+import com.pmease.commons.git.BlobIdent;+import com.pmease.commons.git.GitUtils;+import com.pmease.commons.git.RefInfo;+import com.pmease.commons.lang.diff.WhitespaceOption;+import com.pmease.commons.wicket.behavior.clipboard.CopyClipboardBehavior;+import com.pmease.gitplex.core.GitPlex;+import com.pmease.gitplex.core.entity.CodeComment;+import com.pmease.gitplex.core.entity.Depot;+import com.pmease.gitplex.core.entity.PullRequest;+import com.pmease.gitplex.core.entity.support.CommentPos;+import com.pmease.gitplex.core.manager.CodeCommentManager;+import com.pmease.gitplex.core.manager.CommitInfoManager;+import com.pmease.gitplex.web.component.avatar.ContributorAvatars;+import com.pmease.gitplex.web.component.commitmessage.CommitMessageLabel;+import com.pmease.gitplex.web.component.contributorpanel.ContributorPanel;+import com.pmease.gitplex.web.component.createbranch.CreateBranchLink;+import com.pmease.gitplex.web.component.createtag.CreateTagLink;+import com.pmease.gitplex.web.component.diff.revision.CommentSupport;+import com.pmease.gitplex.web.component.diff.revision.RevisionDiffPanel;+import com.pmease.gitplex.web.page.depot.DepotPage;+import com.pmease.gitplex.web.page.depot.branches.DepotBranchesPage;+import com.pmease.gitplex.web.page.depot.file.DepotFilePage;+import com.pmease.gitplex.web.page.depot.tags.DepotTagsPage;++@SuppressWarnings("serial")+public class CommitDetailPage extends DepotPage implements CommentSupport {++ private static final String PARAM_REVISION = "revision";++ // make sure to use a different value from wicket:id according to wicket bug:+ // https://issues.apache.org/jira/browse/WICKET-6069+ private static final String PARAM_COMPARE_WITH = "compare-with";++ private static final String PARAM_BLAME_FILE = "blame-file";++ private static final String PARAM_WHITESPACE_OPTION = "whitespace-option";++ private static final String PARAM_PATH_FILTER = "path-filter";++ private static final String PARAM_COMMENT = "comment";++ private static final String PARAM_MARK = "mark";++ private State state;++ private ObjectId resolvedRevision;++ private ObjectId resolvedCompareWith;++ private RevisionDiffPanel revisionDiff;++ public CommitDetailPage(PageParameters params) {+ super(params);++ state = new State(params);+ resolvedRevision = getDepot().getRevCommit(state.revision).copy();+ if (state.compareWith != null)+ resolvedCompareWith = getDepot().getRevCommit(state.compareWith).copy();+ }++ private RevCommit getCommit() {+ return getDepot().getRevCommit(state.revision);+ }++ private List<RevCommit> getParents() {+ List<RevCommit> parents = new ArrayList<>();+ for (RevCommit parent: getCommit().getParents())+ parents.add(parent);+ return parents;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new CommitMessageLabel("text", depotModel, Model.of(getCommit().getShortMessage())));++ DepotFilePage.State browseState = new DepotFilePage.State();+ browseState.blobIdent = new BlobIdent(getCommit().name(), null, FileMode.TYPE_TREE);+ PageParameters params = DepotFilePage.paramsOf(depotModel.getObject(), browseState);+ add(new BookmarkablePageLink<Void>("browseCode", DepotFilePage.class, params));++ add(new CreateBranchLink("createBranch", depotModel, state.revision) {++ @Override+ protected void onCreate(AjaxRequestTarget target, String branch) {+ setResponsePage(DepotBranchesPage.class, DepotBranchesPage.paramsOf(getDepot()));+ }++ });++ add(new CreateTagLink("createTag", depotModel, state.revision) {++ @Override+ protected void onCreate(AjaxRequestTarget target, String tag) {+ setResponsePage(DepotTagsPage.class, DepotTagsPage.paramsOf(getDepot()));+ }++ });++ String message = GitUtils.getDetailMessage(getCommit());+ if (message != null) {+ add(new CommitMessageLabel("detail", depotModel, Model.of(message)));+ } else {+ add(new WebMarkupContainer("detail").setVisible(false));+ }++ add(new AjaxLazyLoadPanel("refs") {++ @Override+ public Component getLazyLoadComponent(String markupId) {+ Fragment fragment = new Fragment(markupId, "refsFrag", CommitDetailPage.this) {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ String script = String.format("gitplex.commitdetail.initRefs('%s');", getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ };+ fragment.add(new ListView<RefInfo>("refs", new LoadableDetachableModel<List<RefInfo>>() {++ @Override+ protected List<RefInfo> load() {+ Set<ObjectId> descendants = GitPlex.getInstance(CommitInfoManager.class)+ .getDescendants(getDepot(), getCommit().getId());+ descendants.add(getCommit().getId());++ List<RefInfo> refs = new ArrayList<>();+ refs.addAll(getDepot().getBranches());+ refs.addAll(getDepot().getTags());+ return refs.stream().filter(ref->descendants.contains(ref.getPeeledObj())).collect(Collectors.toList());+ }++ }) {++ @Override+ protected void populateItem(ListItem<RefInfo> item) {+ String ref = item.getModelObject().getRef().getName();+ String branch = GitUtils.ref2branch(ref);+ if (branch != null) {+ DepotFilePage.State state = new DepotFilePage.State();+ state.blobIdent.revision = branch;+ Link<Void> link = new BookmarkablePageLink<Void>("link", DepotFilePage.class,+ DepotFilePage.paramsOf(depotModel.getObject(), state));+ link.add(new Label("label", branch));+ item.add(link);+ item.add(AttributeAppender.append("class", "branch"));+ } else {+ String tag = Preconditions.checkNotNull(GitUtils.ref2tag(ref));+ DepotFilePage.State state = new DepotFilePage.State();+ state.blobIdent.revision = tag;+ Link<Void> link = new BookmarkablePageLink<Void>("link", DepotFilePage.class,+ DepotFilePage.paramsOf(depotModel.getObject(), state));+ link.add(new Label("label", tag));+ item.add(link);+ item.add(AttributeAppender.append("class", "tag"));+ }+ }++ });+ return fragment;+ }++ });++ add(new ContributorAvatars("contributorAvatars", getCommit().getAuthorIdent(), getCommit().getCommitterIdent()));+ add(new ContributorPanel("contribution", getCommit().getAuthorIdent(), getCommit().getCommitterIdent(), true));++ add(new Label("hash", GitUtils.abbreviateSHA(getCommit().name())));+ add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(getCommit().name()))));++ newParentsContainer(null);++ if (getCommit().getParentCount() != 0) {+ newRevisionDiff(null);+ } else {+ add(new WebMarkupContainer("revisionDiff").setVisible(false));+ }+ }++ private void newParentsContainer(@Nullable AjaxRequestTarget target) {+ WebMarkupContainer parentsContainer = new WebMarkupContainer("parents");+ parentsContainer.setOutputMarkupId(true);+ if (getParents().size() == 1) {+ RevCommit parent = getParents().get(0);+ State newState = new State();+ newState.revision = parent.name();+ newState.whitespaceOption = state.whitespaceOption;+ newState.pathFilter = state.pathFilter;+ Link<Void> link = new BookmarkablePageLink<Void>("parent", CommitDetailPage.class,+ paramsOf(depotModel.getObject(), newState));+ link.add(new Label("label", GitUtils.abbreviateSHA(parent.name())));+ parentsContainer.add(link);+ parentsContainer.add(new WebMarkupContainer("parents").setVisible(false));+ } else {+ parentsContainer.add(new WebMarkupContainer("parent").setVisible(false));+ parentsContainer.add(new Label("count", getParents().size() + " parents"));+ parentsContainer.add(new ListView<RevCommit>("parents", new LoadableDetachableModel<List<RevCommit>>() {++ @Override+ protected List<RevCommit> load() {+ return getParents();+ }++ }) {++ @Override+ protected void populateItem(ListItem<RevCommit> item) {+ RevCommit parent = item.getModelObject();++ State newState = new State();+ newState.revision = parent.name();+ newState.whitespaceOption = state.whitespaceOption;+ newState.pathFilter = state.pathFilter;++ Link<Void> link = new BookmarkablePageLink<Void>("link", CommitDetailPage.class,+ paramsOf(depotModel.getObject(), newState));+ link.add(new Label("label", GitUtils.abbreviateSHA(parent.name())));+ item.add(link);++ item.add(new AjaxLink<Void>("diff") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ state.compareWith = item.getModelObject().name();+ resolvedCompareWith = item.getModelObject().copy();++ target.add(parentsContainer);+ newRevisionDiff(target);+ pushState(target);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ if (item.getModelObject().equals(getCompareWith()))+ add(AttributeAppender.append("class", "active"));+ }++ });+ }++ });+ }+ if (target != null) {+ replace(parentsContainer);+ target.add(parentsContainer);+ } else {+ add(parentsContainer);+ }+ }++ private ObjectId getCompareWith() {+ List<RevCommit> parents = getParents();+ if (resolvedCompareWith != null) {+ if (parents.contains(resolvedCompareWith))+ return resolvedCompareWith;+ else+ return parents.get(0);+ } else {+ return parents.get(0);+ }+ }++ private void newRevisionDiff(@Nullable AjaxRequestTarget target) {+ IModel<String> blameModel = new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return state.blameFile;+ }++ @Override+ public void setObject(String object) {+ state.blameFile = object;+ pushState(RequestCycle.get().find(AjaxRequestTarget.class));+ }++ };+ IModel<String> pathFilterModel = new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return state.pathFilter;+ }++ @Override+ public void setObject(String object) {+ state.pathFilter = object;+ pushState(RequestCycle.get().find(AjaxRequestTarget.class));+ }++ };+ IModel<WhitespaceOption> whitespaceOptionModel = new IModel<WhitespaceOption>() {++ @Override+ public void detach() {+ }++ @Override+ public WhitespaceOption getObject() {+ return state.whitespaceOption;+ }++ @Override+ public void setObject(WhitespaceOption object) {+ state.whitespaceOption = object;+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ newParentsContainer(target);+ pushState(target);+ }++ };+ revisionDiff = new RevisionDiffPanel("revisionDiff", depotModel,+ Model.of((PullRequest)null), getCompareWith().name(), state.revision,+ pathFilterModel, whitespaceOptionModel, blameModel, this);+ revisionDiff.setOutputMarkupId(true);+ if (target != null) {+ replace(revisionDiff);+ target.add(revisionDiff);+ } else {+ add(revisionDiff);+ }+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new CommitDetailResourceReference()));+ }++ public static PageParameters paramsOf(Depot depot, State state) {+ PageParameters params = paramsOf(depot);+ params.set(PARAM_REVISION, state.revision);+ if (state.compareWith != null)+ params.set(PARAM_COMPARE_WITH, state.compareWith);+ if (state.whitespaceOption != WhitespaceOption.DEFAULT)+ params.set(PARAM_WHITESPACE_OPTION, state.whitespaceOption.name());+ if (state.pathFilter != null)+ params.set(PARAM_PATH_FILTER, state.pathFilter);+ if (state.blameFile != null)+ params.set(PARAM_BLAME_FILE, state.blameFile);+ if (state.commentId != null)+ params.set(PARAM_COMMENT, state.commentId);+ if (state.mark != null)+ params.set(PARAM_MARK, state.mark.toString());+ return params;+ }++ public static PageParameters paramsOf(Depot depot, String revision) {+ State state = new State();+ state.revision = revision;+ return paramsOf(depot, state);+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Depot depot) {+ setResponsePage(DepotCommitsPage.class, paramsOf(depot));+ }++ private void pushState(AjaxRequestTarget target) {+ PageParameters params = paramsOf(getDepot(), state);+ CharSequence url = RequestCycle.get().urlFor(CommitDetailPage.class, params);+ pushState(target, url.toString(), state);+ }++ @Override+ protected void onPopState(AjaxRequestTarget target, Serializable data) {+ super.onPopState(target, data);++ state = (State) data;+ newRevisionDiff(target);+ }++ public static class State implements Serializable {++ private static final long serialVersionUID = 1L;++ public String revision;++ @Nullable+ public String compareWith;++ @Nullable+ public Long commentId;++ public WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;++ @Nullable+ public String pathFilter;++ @Nullable+ public String blameFile;++ @Nullable+ public CommentPos mark;++ public State() {+ }++ public State(PageParameters params) {+ revision = GitUtils.normalizePath(params.get(PARAM_REVISION).toString());+ compareWith = params.get(PARAM_COMPARE_WITH).toString();+ whitespaceOption = WhitespaceOption.ofNullableName(params.get(PARAM_WHITESPACE_OPTION).toString());+ pathFilter = params.get(PARAM_PATH_FILTER).toString();+ blameFile = params.get(PARAM_BLAME_FILE).toString();+ commentId = params.get(PARAM_COMMENT).toOptionalLong();+ mark = CommentPos.fromString(params.get(PARAM_MARK).toString());+ }++ }++ @Override+ public CommentPos getMark() {+ return state.mark;+ }++ @Override+ public String getMarkUrl(CommentPos mark) {+ State markState = new State();+ markState.mark = mark;+ markState.whitespaceOption = state.whitespaceOption;+ markState.compareWith = state.compareWith;+ markState.pathFilter = state.pathFilter;+ markState.revision = resolvedRevision.name();+ return urlFor(CommitDetailPage.class, paramsOf(getDepot(), markState)).toString();+ }++ @Override+ public String getCommentUrl(CodeComment comment) {+ State commentState = new State();+ String compareWith = getCompareWith().name();+ commentState.mark = comment.getCommentPos();+ commentState.commentId = comment.getId();+ commentState.whitespaceOption = state.whitespaceOption;+ commentState.compareWith = compareWith;+ commentState.pathFilter = state.pathFilter;+ commentState.revision = resolvedRevision.name();+ return urlFor(CommitDetailPage.class, paramsOf(getDepot(), commentState)).toString();+ }++ @Override+ public CodeComment getOpenComment() {+ if (state.commentId != null)+ return GitPlex.getInstance(CodeCommentManager.class).load(state.commentId);+ else+ return null;+ }++ @Override+ public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {+ if (comment != null) {+ state.commentId = comment.getId();+ state.mark = comment.getCommentPos();+ } else {+ state.commentId = null;+ state.mark = null;+ }+ pushState(target);+ }++ @Override+ public void onMark(AjaxRequestTarget target, CommentPos mark) {+ state.mark = mark;+ pushState(target);+ }++ @Override+ public void onAddComment(AjaxRequestTarget target, CommentPos mark) {+ state.commentId = null;+ state.mark = mark;+ pushState(target);+ }++ /*+ * In case we are on a branch, this operation makes sure that the branch resolves+ * to a certain commit during the life cycle of our page, unless the page is+ * refreshed. This can avoid the issue that displayed file content and subsequent+ * operations encounters different commit if someone commits to the branch while+ * we are staying on the page.+ */+ @Override+ protected Map<String, ObjectId> getObjectIdCache() {+ Map<String, ObjectId> objectIdCache = new HashMap<>();+ if (resolvedRevision != null)+ objectIdCache.put(state.revision, resolvedRevision);+ if (resolvedCompareWith != null)+ objectIdCache.put(state.compareWith, resolvedCompareWith);+ return objectIdCache;+ }++ @Override+ public String getAnchor() {+ return null;+ }++}diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/commit-detail.css b/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/commit-detail.cssindex 6dcb343037..a492986c62 100644--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/commit-detail.css+++ b/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/commit-detail.css@@ -1,88 +1,88 @@-#commit-detail {- padding: 20px;-}-#commit-detail>div {- margin-bottom: 16px;-}-#commit-detail>.info {- border: 1px solid #BBB;- border-radius: 4px;-}--#commit-detail>.info>.message {- background: #F9F9F9;- border-bottom: 1px dashed #BBB;- padding: 8px 12px;- border-radius: 4px 4px 0 0;-}-#commit-detail>.info>.message>.subject>.pull-left {- font-size: 17px;- font-weight: bold;- padding-top: 2px;- color: #555;-}-#commit-detail>.info>.message>.subject>.pull-right {- margin-left: 8px;-}-#commit-detail>.info>.message>.subject .btn-group .fa {- color: #666;- font-size: 12px;-}-#commit-detail>.info>.message>.detail {- color: #666;- padding: 12px;- font-size: 13px;- border: none;- background: none;- margin-bottom: 0;-}-#commit-detail>.info>.refs {- padding: 12px;- background: #F9F9F9;- border-bottom: 1px solid #DDD;-}-#commit-detail>.info>.refs .branch:before {- font-family: Fontawesome;- content: "\f126";- color: #444;-}-#commit-detail>.info>.refs .tag:before {- font-family: Fontawesome;- content: "\f02b";- color: #444;-}-#commit-detail>.info>.refs>div>span {- margin-right: 6px;-}-#commit-detail>.info>.refs a {- color: #444;-}-#commit-detail>.info>.contribution-and-parents {- padding: 12px;-}-#commit-detail>.info>.contribution-and-parents a {- color: #444;-}-#commit-detail>.info>.contribution-and-parents .contributor-avatars {- margin-right: 4px;-}-#commit-detail>.info>.contribution-and-parents div.commit {- margin: 2px 24px 0 20px;-}-#commit-detail>.info>.contribution-and-parents .hash {- color: #444;-}-#commit-detail>.info>.contribution-and-parents label {- color: #666;- font-weight: normal;- margin-right: 8px;-}-#commit-detail>.info>.contribution-and-parents>.parents .single {- margin-top: 7px;-}-#commit-detail>.info>.contribution-and-parents>.parents .multiple {- margin-top: 3px;-}-#commit-detail>.info>.contribution-and-parents .btn-group.parent {- margin-right: 8px;+#commit-detail {+ padding: 20px;+}+#commit-detail>div {+ margin-bottom: 16px;+}+#commit-detail>.info {+ border: 1px solid #BBB;+ border-radius: 4px;+}++#commit-detail>.info>.message {+ background: #F9F9F9;+ border-bottom: 1px dashed #BBB;+ padding: 8px 12px;+ border-radius: 4px 4px 0 0;+}+#commit-detail>.info>.message>.subject>.pull-left {+ font-size: 17px;+ font-weight: bold;+ padding-top: 2px;+ color: #555;+}+#commit-detail>.info>.message>.subject>.pull-right {+ margin-left: 8px;+}+#commit-detail>.info>.message>.subject .btn-group .fa {+ color: #666;+ font-size: 12px;+}+#commit-detail>.info>.message>.detail {+ color: #666;+ padding: 12px;+ font-size: 13px;+ border: none;+ background: none;+ margin-bottom: 0;+}+#commit-detail>.info>.refs {+ padding: 12px;+ background: #F9F9F9;+ border-bottom: 1px solid #DDD;+}+#commit-detail>.info>.refs .branch:before {+ font-family: Fontawesome;+ content: "\f126";+ color: #444;+}+#commit-detail>.info>.refs .tag:before {+ font-family: Fontawesome;+ content: "\f02b";+ color: #444;+}+#commit-detail>.info>.refs>div>span {+ margin-right: 6px;+}+#commit-detail>.info>.refs a {+ color: #444;+}+#commit-detail>.info>.contribution-and-parents {+ padding: 12px;+}+#commit-detail>.info>.contribution-and-parents a {+ color: #444;+}+#commit-detail>.info>.contribution-and-parents .contributor-avatars {+ margin-right: 4px;+}+#commit-detail>.info>.contribution-and-parents div.commit {+ margin: 8px 20px 0 20px;+}+#commit-detail>.info>.contribution-and-parents .hash {+ color: #444;+}+#commit-detail>.info>.contribution-and-parents label {+ color: #666;+ font-weight: normal;+ margin-right: 8px;+}+#commit-detail>.info>.contribution-and-parents>.parents .single {+ margin-top: 7px;+}+#commit-detail>.info>.contribution-and-parents>.parents .multiple {+ margin-top: 3px;+}+#commit-detail>.info>.contribution-and-parents .btn-group.parent {+ margin-right: 8px;}\ No newline at end of file