The Unified and Autonomous Development Platform
Do not display build status on some pages to avoid confusion
Robin Shen33a971f0866a
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex fb55b9f769..7bd9f0158c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -1,16 +1,40 @@package io.onedev.server.web.component.commit.list;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashMap;-import java.util.HashSet;-import java.util.List;-import java.util.Map;-import java.util.Stack;-import java.util.regex.Pattern;--import javax.annotation.Nullable;-+import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.google.common.collect.Lists;+import io.onedev.commons.codeassist.parser.TerminalExpect;+import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.git.GitUtils;+import io.onedev.server.git.command.RevListOptions;+import io.onedev.server.git.service.GitService;+import io.onedev.server.git.service.RefFacade;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.search.commit.*;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.Constants;+import io.onedev.server.util.ProjectAndRevision;+import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.web.behavior.CommitQueryBehavior;+import io.onedev.server.web.behavior.RunTaskBehavior;+import io.onedev.server.web.component.commit.message.CommitMessagePanel;+import io.onedev.server.web.component.commit.status.CommitStatusLink;+import io.onedev.server.web.component.commit.status.CommitStatusSupport;+import io.onedev.server.web.component.contributorpanel.ContributorPanel;+import io.onedev.server.web.component.gitsignature.GitSignaturePanel;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;+import io.onedev.server.web.component.savedquery.SavedQueriesClosed;+import io.onedev.server.web.component.savedquery.SavedQueriesOpened;+import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.compare.RevisionComparePage;+import io.onedev.server.web.util.QuerySaveSupport;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -47,46 +71,9 @@ import org.joda.time.DateTime;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.google.common.collect.Lists;--import io.onedev.commons.codeassist.parser.TerminalExpect;-import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.git.BlobIdent;-import io.onedev.server.git.GitUtils;-import io.onedev.server.git.command.RevListOptions;-import io.onedev.server.git.service.GitService;-import io.onedev.server.git.service.RefFacade;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.search.commit.CommitCriteria;-import io.onedev.server.search.commit.CommitQuery;-import io.onedev.server.search.commit.MessageCriteria;-import io.onedev.server.search.commit.PathCriteria;-import io.onedev.server.search.commit.Revision;-import io.onedev.server.search.commit.RevisionCriteria;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.Constants;-import io.onedev.server.util.ProjectAndRevision;-import io.onedev.server.util.patternset.PatternSet;-import io.onedev.server.web.behavior.CommitQueryBehavior;-import io.onedev.server.web.behavior.RunTaskBehavior;-import io.onedev.server.web.component.commit.message.CommitMessagePanel;-import io.onedev.server.web.component.commit.status.CommitStatusLink;-import io.onedev.server.web.component.contributorpanel.ContributorPanel;-import io.onedev.server.web.component.gitsignature.GitSignaturePanel;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;-import io.onedev.server.web.component.savedquery.SavedQueriesClosed;-import io.onedev.server.web.component.savedquery.SavedQueriesOpened;-import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.commits.CommitDetailPage;-import io.onedev.server.web.page.project.compare.RevisionComparePage;-import io.onedev.server.web.util.QuerySaveSupport;+import javax.annotation.Nullable;+import java.util.*;+import java.util.regex.Pattern;@SuppressWarnings("serial")public abstract class CommitListPanel extends Panel {@@ -260,7 +247,8 @@ public abstract class CommitListPanel extends Panel {protected abstract Project getProject();- protected String getRefName() {+ @Nullable+ protected CommitStatusSupport getStatusSupport() {return null;}@@ -662,19 +650,23 @@ public abstract class CommitListPanel extends Panel {});- item.add(new CommitStatusLink("buildStatus", commit.copy(), getRefName()) {+ if (getStatusSupport() != null) {+ item.add(new CommitStatusLink("buildStatus", commit.copy(), getStatusSupport().getRefName()) {- @Override- protected Project getProject() {- return CommitListPanel.this.getProject();- }+ @Override+ protected Project getProject() {+ return CommitListPanel.this.getProject();+ }- @Override- protected PullRequest getPullRequest() {- return null;- }-- });+ @Override+ protected PullRequest getPullRequest() {+ return null;+ }++ });+ } else {+ item.add(new WebMarkupContainer("buildStatus").setVisible(false));+ }item.add(AttributeAppender.append("class", "commit"));} else {item = new Fragment(itemId, "dateFrag", this);diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusSupport.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusSupport.javanew file mode 100644index 0000000000..a6713d2533--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusSupport.java@@ -0,0 +1,10 @@+package io.onedev.server.web.component.commit.status;++import javax.annotation.Nullable;++public interface CommitStatusSupport {++ @Nullable+ String getRefName();++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.javaindex f401be8c4e..49ce32d84e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java@@ -1,20 +1,5 @@package io.onedev.server.web.page.project.commits;-import java.io.Serializable;-import java.util.ArrayList;--import javax.annotation.Nullable;--import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-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.model.IModel;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;import io.onedev.server.entitymanager.ProjectManager;@@ -25,6 +10,8 @@ import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QueryPersonalization;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.commit.list.CommitListPanel;+import io.onedev.server.web.component.commit.status.CommitStatusSupport;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;import io.onedev.server.web.component.savedquery.PersonalQuerySupport;@@ -33,6 +20,18 @@ import io.onedev.server.web.component.savedquery.SavedQueriesPanel;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.QuerySaveSupport;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+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.model.IModel;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import javax.annotation.Nullable;+import java.io.Serializable;+import java.util.ArrayList;@SuppressWarnings("serial")public class ProjectCommitsPage extends ProjectPage {@@ -186,6 +185,11 @@ public class ProjectCommitsPage extends ProjectPage {};}+ @Override+ protected CommitStatusSupport getStatusSupport() {+ return () -> null;+ }+@Overrideprotected String getCompareWith() {return compare;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 7bd78b1f45..42384ee6ad 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -1,37 +1,6 @@package io.onedev.server.web.page.project.compare;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashMap;-import java.util.HashSet;-import java.util.List;-import java.util.Map;-import java.util.Set;--import javax.annotation.Nullable;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.CheckBox;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.model.AbstractReadOnlyModel;-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.ObjectId;-import com.google.common.collect.Lists;-import io.onedev.commons.utils.PlanarRange;import io.onedev.server.OneDev;import io.onedev.server.codequality.CodeProblem;@@ -43,12 +12,7 @@ import io.onedev.server.entitymanager.CodeCommentReplyManager;import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.git.service.GitService;-import io.onedev.server.model.Build;-import io.onedev.server.model.CodeComment;-import io.onedev.server.model.CodeCommentReply;-import io.onedev.server.model.CodeCommentStatusChange;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;+import io.onedev.server.model.*;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.Mark;import io.onedev.server.search.commit.CommitQuery;@@ -73,6 +37,28 @@ import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPaimport io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.util.EditParamsAware;import io.onedev.server.web.util.RevisionDiff;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.CheckBox;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.model.AbstractReadOnlyModel;+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.ObjectId;++import javax.annotation.Nullable;+import java.io.Serializable;+import java.util.*;@SuppressWarnings("serial")public class RevisionComparePage extends ProjectPage implements RevisionDiff.AnnotationSupport, EditParamsAware {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex b05a285be2..78717dc1eb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -1,56 +1,6 @@package io.onedev.server.web.page.project.pullrequests.create;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.Arrays;-import java.util.Collection;-import java.util.Comparator;-import java.util.HashMap;-import java.util.HashSet;-import java.util.List;-import java.util.Map;-import java.util.Set;-import java.util.concurrent.atomic.AtomicReference;-import java.util.stream.Collectors;--import javax.annotation.Nullable;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.Component;-import org.apache.wicket.RestartResponseAtInterceptPageException;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Button;-import org.apache.wicket.markup.html.form.DropDownChoice;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;-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.apache.wicket.validation.IErrorMessageSource;-import org.apache.wicket.validation.IValidatable;-import org.apache.wicket.validation.IValidationError;-import org.apache.wicket.validation.IValidator;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.RevCommit;-import org.joda.time.DateTime;-import com.google.common.collect.Lists;-import io.onedev.commons.utils.PlanarRange;import io.onedev.server.OneDev;import io.onedev.server.attachment.AttachmentSupport;@@ -66,18 +16,8 @@ import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.git.GitUtils;import io.onedev.server.git.service.GitService;import io.onedev.server.git.service.RefFacade;-import io.onedev.server.model.Build;-import io.onedev.server.model.CodeComment;-import io.onedev.server.model.CodeCommentReply;-import io.onedev.server.model.CodeCommentStatusChange;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;+import io.onedev.server.model.*;import io.onedev.server.model.PullRequest.Status;-import io.onedev.server.model.PullRequestAssignment;-import io.onedev.server.model.PullRequestReview;-import io.onedev.server.model.PullRequestUpdate;-import io.onedev.server.model.User;-import io.onedev.server.model.UserAuthorization;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.Mark;import io.onedev.server.model.support.pullrequest.MergePreview;@@ -94,10 +34,10 @@ import io.onedev.server.web.ajaxlistener.DisableGlobalAjaxIndicatorListener;import io.onedev.server.web.behavior.ReferenceInputBehavior;import io.onedev.server.web.component.branch.BranchLink;import io.onedev.server.web.component.branch.picker.AffinalBranchPicker;+import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.component.commit.list.CommitListPanel;import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.component.pullrequest.assignment.AssignmentListPanel;import io.onedev.server.web.component.pullrequest.review.ReviewListPanel;import io.onedev.server.web.component.svg.SpriteImage;@@ -113,6 +53,45 @@ import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPaimport io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.page.simple.security.LoginPage;import io.onedev.server.web.util.RevisionDiff;+import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.Component;+import org.apache.wicket.RestartResponseAtInterceptPageException;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Button;+import org.apache.wicket.markup.html.form.DropDownChoice;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.model.AbstractReadOnlyModel;+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.apache.wicket.validation.IErrorMessageSource;+import org.apache.wicket.validation.IValidatable;+import org.apache.wicket.validation.IValidationError;+import org.apache.wicket.validation.IValidator;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;+import org.joda.time.DateTime;++import javax.annotation.Nullable;+import java.io.Serializable;+import java.util.*;+import java.util.concurrent.atomic.AtomicReference;+import java.util.stream.Collectors;@SuppressWarnings("serial")public class NewPullRequestPage extends ProjectPage implements RevisionDiff.AnnotationSupport {@@ -467,11 +446,6 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Annoreturn new CommitQuery(Lists.newArrayList(new RevisionCriteria(revisions)));}- @Override- protected String getRefName() {- return NewPullRequestPage.this.getPullRequest().getSourceRef();- }-@Overrideprotected Project getProject() {return NewPullRequestPage.this.getPullRequest().getSourceProject();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.htmlindex 2501decd9f..426e2ce099 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html@@ -13,7 +13,6 @@<div class="actions flex-shrink-0 ml-auto d-none d-lg-block"><span class="btn-group mr-1"><a wicket:id="signature" class="btn btn-sm btn-outline-secondary"></a>- <a wicket:id="buildStatus" class="btn btn-outline-secondary btn-sm build-status"></a></span><span class="btn-group hash mr-1"><a wicket:id="hashLink" class="hash btn btn-sm btn-outline-secondary"><span wicket:id="hash"></span></a>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.javaindex 1452c00394..a0bb9d325e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java@@ -1,26 +1,6 @@package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;-import java.util.ArrayList;-import java.util.Collection;-import java.util.List;--import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.markup.html.basic.Label;-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.GenericPanel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevObject;-import com.google.common.collect.Sets;-import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;@@ -30,7 +10,6 @@ import io.onedev.server.util.DateUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.commit.message.CommitMessagePanel;-import io.onedev.server.web.component.commit.status.CommitStatusLink;import io.onedev.server.web.component.gitsignature.GitSignaturePanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;@@ -38,6 +17,23 @@ import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.PersonIdentPanel;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.markup.html.basic.Label;+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.GenericPanel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.revwalk.RevCommit;+import org.eclipse.jgit.revwalk.RevObject;++import java.util.Collection;+import java.util.List;@SuppressWarnings("serial")class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {@@ -103,38 +99,6 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {});- String refName = getUpdate().getRequest().getSourceRef();- item.add(new CommitStatusLink("buildStatus", commit.copy(), refName) {-- @Override- protected Project getProject() {- return getUpdate().getRequest().getSourceProject();- }-- @Override- protected PullRequest getPullRequest() {- return null;- }-- @Override- protected Collection<String> getWebSocketObservables() {- if (getUpdate().getRequest().getSourceProject() != null)- return super.getWebSocketObservables();- else- return new ArrayList<>();- }-- @Override- protected void onConfigure() {- if (getUpdate().getRequest().getSourceProject() != null) {- super.onConfigure();- } else {- setVisible(false);- }- }-- });-Project project = getUpdate().getRequest().getTarget().getProject();CommitDetailPage.State commitState = new CommitDetailPage.State();commitState.revision = commit.name();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.javaindex 3ecfd02e25..f6ec343112 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java@@ -947,7 +947,25 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev@Overridepublic Collection<CodeProblem> getOldProblems(String blobPath) {- return new HashSet<>();+ Set<CodeProblem> problems = new HashSet<>();+ ObjectId buildCommitId = ObjectId.fromString(state.oldCommitHash);+ for (Build build: getProject().getBuilds(buildCommitId)) {+ for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class)) {+ for (CodeProblem problem: contribution.getCodeProblems(build, blobPath, null)) {+ if (!buildCommitId.equals(getComparisonBase())) {+ Map<Integer, Integer> lineMapping = getLineMapping(buildCommitId, getComparisonBase(), blobPath);+ PlanarRange range = DiffUtils.mapRange(lineMapping, problem.getRange());+ if (range != null) {+ problems.add(new CodeProblem(problem.getSeverity(), problem.getType(),+ problem.getBlobPath(), range, problem.getMessage()));+ }+ } else {+ problems.add(problem);+ }+ }+ }+ }+ return problems;}@Override@@ -984,7 +1002,23 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev@Overridepublic Map<Integer, CoverageStatus> getOldCoverages(String blobPath) {- return new HashMap<>();+ Map<Integer, CoverageStatus> coverages = new HashMap<>();+ ObjectId buildCommitId = ObjectId.fromString(state.oldCommitHash);+ for (Build build: getProject().getBuilds(buildCommitId)) {+ for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {+ for (Map.Entry<Integer, CoverageStatus> entry: contribution.getLineCoverages(build, blobPath, null).entrySet()) {+ if (!buildCommitId.equals(getComparisonBase())) {+ Map<Integer, Integer> lineMapping = getLineMapping(buildCommitId, getComparisonBase(), blobPath);+ Integer mappedLine = lineMapping.get(entry.getKey());+ if (mappedLine != null)+ coverages.put(mappedLine, entry.getValue());+ } else {+ coverages.put(entry.getKey(), entry.getValue());+ }+ }+ }+ }+ return coverages;}@Override