The Unified and Autonomous Development Platform
Fix the issue that NPE is thrown when compare two commits with unrelated history
robin shen9ec5bcd6093b
diff --git a/core/src/main/java/com/gitplex/server/git/GitUtils.java b/core/src/main/java/com/gitplex/server/git/GitUtils.javaindex 9a7cb774ea..7c43ed0844 100644--- a/core/src/main/java/com/gitplex/server/git/GitUtils.java+++ b/core/src/main/java/com/gitplex/server/git/GitUtils.java@@ -263,18 +263,31 @@ public class GitUtils {return blobIdent;}- public static RevCommit getMergeBase(Repository repository, ObjectId commit1, ObjectId commit2) {+ /**+ * @return+ * merge base of specified commits, or <tt>null</tt> if two commits do not have related history. In this+ * case, these two commits can not be merged+ */+ @Nullable+ public static ObjectId getMergeBase(Repository repository, ObjectId commit1, ObjectId commit2) {try (RevWalk revWalk = new RevWalk(repository)) {revWalk.setRevFilter(RevFilter.MERGE_BASE);revWalk.markStart(revWalk.parseCommit(commit1));revWalk.markStart(revWalk.parseCommit(commit2));- return Preconditions.checkNotNull(revWalk.next());+ RevCommit mergeBase = revWalk.next();+ return mergeBase!=null?mergeBase.copy():null;} catch (IOException e) {throw new RuntimeException(e);}}+ /**+ * @return+ * merge base of specified commits, or <tt>null</tt> if two commits do not have related history. In this+ * case, these two commits can not be merged+ */+ @Nullablepublic static ObjectId getMergeBase(Repository repository1, ObjectId commit1,Repository repository2, ObjectId commit2, @Nullable String fetchRef) {if (repository1.getDirectory()!=null && repository1.getDirectory().equals(repository2.getDirectory())) {diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.javaindex 0a5896c14f..b5d156c3c0 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java@@ -478,16 +478,18 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestprivate void checkUpdate(PullRequest request, boolean independent) {if (!request.getHeadCommitHash().equals(request.getSource().getObjectName())) {- PullRequestUpdate update = new PullRequestUpdate();- update.setRequest(request);- update.setHeadCommitHash(request.getSource().getObjectName());ObjectId mergeBase = GitUtils.getMergeBase(request.getTargetDepot().getRepository(), request.getTarget().getObjectId(),request.getSourceDepot().getRepository(), request.getSource().getObjectId(),GitUtils.branch2ref(request.getSourceBranch()));- update.setMergeCommitHash(mergeBase.name());- request.addUpdate(update);- pullRequestUpdateManager.save(update, independent);+ if (mergeBase != null) {+ PullRequestUpdate update = new PullRequestUpdate();+ update.setRequest(request);+ update.setHeadCommitHash(request.getSource().getObjectName());+ update.setMergeCommitHash(mergeBase.name());+ request.addUpdate(update);+ pullRequestUpdateManager.save(update, independent);+ }}}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.html b/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.htmlindex 299ab3aa6e..455ad99b60 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.html+++ b/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.html@@ -39,6 +39,10 @@<div><a wicket:id="createRequest" class="btn btn-primary">Create Pull Request</a></div>+ <div wicket:id="unrelatedHistory" class="alert alert-danger">+ <span class="fa fa-lg fa-warning"></span>+ <span>History of left side and right side is unrelated.</span>+ </div><ul wicket:id="tabs" class="nav nav-tabs"></ul><div wicket:id="tabPanel" class="tab-panel"></div></div>diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java b/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.javaindex d424fd8262..1915bbbc77 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java@@ -98,6 +98,8 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {private static final String PARAM_TAB = "tab-panel";+ private static final String TABS_ID = "tabs";+private static final String TAB_PANEL_ID = "tabPanel";private IModel<List<RevCommit>> commitsModel;@@ -218,7 +220,7 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {mergeBase = GitUtils.getMergeBase(state.leftSide.getDepot().getRepository(), leftCommitId,state.rightSide.getDepot().getRepository(), rightCommitId,- refName).copy();+ refName);} catch (IOException e) {throw new RuntimeException(e);}@@ -292,7 +294,7 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!mergeBase.equals(leftCommitId));+ setVisible(mergeBase != null && !mergeBase.equals(leftCommitId));}};@@ -390,7 +392,7 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {protected void onConfigure() {super.onConfigure();- if (isLoggedIn() && state.leftSide.getBranch()!=null && state.rightSide.getBranch()!=null) {+ if (mergeBase != null && isLoggedIn() && state.leftSide.getBranch()!=null && state.rightSide.getBranch()!=null) {PullRequest request = requestModel.getObject();setVisible(request == null && !mergeBase.equals(rightCommitId));} else {@@ -447,43 +449,58 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {});- List<Tab> tabs = new ArrayList<>();-- tabs.add(new AjaxActionTab(Model.of("Commits")) {-- @Override- public boolean isSelected() {- return state.tabPanel == null || state.tabPanel == TabPanel.COMMITS;- }+ add(new WebMarkupContainer("unrelatedHistory") {@Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- state.tabPanel = TabPanel.COMMITS;- newTabPanel(target);- pushState(target);+ protected void onConfigure() {+ super.onConfigure();+ setVisible(mergeBase == null);}});-- tabs.add(new AjaxActionTab(Model.of("Changes")) {-- @Override- public boolean isSelected() {- return state.tabPanel == TabPanel.CHANGES;- }-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- state.tabPanel = TabPanel.CHANGES;- newTabPanel(target);- pushState(target);- }++ if (mergeBase != null) {+ List<Tab> tabs = new ArrayList<>();- });+ tabs.add(new AjaxActionTab(Model.of("Commits")) {++ @Override+ public boolean isSelected() {+ return state.tabPanel == null || state.tabPanel == TabPanel.COMMITS;+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ state.tabPanel = TabPanel.COMMITS;+ newTabPanel(target);+ pushState(target);+ }++ });++ tabs.add(new AjaxActionTab(Model.of("Changes")) {++ @Override+ public boolean isSelected() {+ return state.tabPanel == TabPanel.CHANGES;+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ state.tabPanel = TabPanel.CHANGES;+ newTabPanel(target);+ pushState(target);+ }++ });- add(tabbable = new Tabbable("tabs", tabs));+ add(tabbable = new Tabbable(TABS_ID, tabs));- newTabPanel(null);+ newTabPanel(null);+ } else {+ add(new WebMarkupContainer(TABS_ID).setVisible(false));+ add(new WebMarkupContainer(TAB_PANEL_ID).setVisible(false));+ }}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.html b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.htmlindex 2a8f706c4f..ca93aaf62d 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.html@@ -55,6 +55,14 @@</div></div></wicket:fragment>+ <wicket:fragment wicket:id="unrelatedHistoryFrag">+ <div class="alert alert-danger">+ <div class="summary">+ <span class="fa fa-lg fa-warning"></span>+ <span>History of target branch and source branch is unrelated.</span>+ </div>+ </div>+ </wicket:fragment><wicket:fragment wicket:id="rejectedFrag"><div class="alert alert-danger"><div class="summary">diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.javaindex dbf9b21853..0bf2563f46 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java@@ -84,6 +84,8 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel@SuppressWarnings("serial")public class NewRequestPage extends DepotPage implements CommentSupport {+ private static final String TABS_ID = "tabs";+private static final String TAB_PANEL_ID = "tabPanel";private DepotAndBranch target;@@ -159,39 +161,39 @@ public class NewRequestPage extends DepotPage implements CommentSupport {pullRequest = GitPlex.getInstance(PullRequestManager.class).findOpen(target, source);if (pullRequest == null) {- pullRequest = new PullRequest();- pullRequest.setTarget(target);- pullRequest.setSource(source);- pullRequest.setSubmitter(currentUser);-- PullRequestManager pullRequestManager = GitPlex.getInstance(PullRequestManager.class);- List<IntegrationStrategy> strategies = pullRequestManager.getApplicableIntegrationStrategies(pullRequest);- Preconditions.checkState(!strategies.isEmpty());- pullRequest.setIntegrationStrategy(strategies.get(0));-- ObjectPermission writePermission = ObjectPermission.ofDepotWrite(target.getDepot());- if (currentUser.asSubject().isPermitted(writePermission))- pullRequest.setAssignee(currentUser);-ObjectId baseCommitId = GitUtils.getMergeBase(target.getDepot().getRepository(), target.getObjectId(),source.getDepot().getRepository(), source.getObjectId(),GitUtils.branch2ref(source.getBranch()));-- pullRequest.setBaseCommitHash(baseCommitId.name());- if (pullRequest.getBaseCommitHash().equals(source.getObjectName())) {- CloseInfo closeInfo = new CloseInfo();- closeInfo.setCloseDate(new Date());- closeInfo.setCloseStatus(CloseInfo.Status.INTEGRATED);- pullRequest.setCloseInfo(closeInfo);- }-- PullRequestUpdate update = new PullRequestUpdate();- pullRequest.addUpdate(update);- update.setRequest(pullRequest);- update.setHeadCommitHash(source.getObjectName());- update.setMergeCommitHash(pullRequest.getBaseCommitHash());-+ if (baseCommitId != null) {+ pullRequest = new PullRequest();+ pullRequest.setTarget(target);+ pullRequest.setSource(source);+ pullRequest.setSubmitter(currentUser);++ PullRequestManager pullRequestManager = GitPlex.getInstance(PullRequestManager.class);+ List<IntegrationStrategy> strategies = pullRequestManager.getApplicableIntegrationStrategies(pullRequest);+ Preconditions.checkState(!strategies.isEmpty());+ pullRequest.setIntegrationStrategy(strategies.get(0));++ ObjectPermission writePermission = ObjectPermission.ofDepotWrite(target.getDepot());+ if (currentUser.asSubject().isPermitted(writePermission))+ pullRequest.setAssignee(currentUser);++ pullRequest.setBaseCommitHash(baseCommitId.name());+ if (pullRequest.getBaseCommitHash().equals(source.getObjectName())) {+ CloseInfo closeInfo = new CloseInfo();+ closeInfo.setCloseDate(new Date());+ closeInfo.setCloseStatus(CloseInfo.Status.INTEGRATED);+ pullRequest.setCloseInfo(closeInfo);+ }++ PullRequestUpdate update = new PullRequestUpdate();+ pullRequest.addUpdate(update);+ update.setRequest(pullRequest);+ update.setHeadCommitHash(source.getObjectName());+ update.setMergeCommitHash(pullRequest.getBaseCommitHash());+ }requestModel = Model.of(pullRequest);} else {Long requestId = pullRequest.getId();@@ -271,15 +273,16 @@ public class NewRequestPage extends DepotPage implements CommentSupport {@Overridepublic void onClick() {- PageParameters params = paramsOf(getPullRequest().getSourceDepot(),- getPullRequest().getSource(), getPullRequest().getTarget());+ PageParameters params = paramsOf(source.getDepot(), source, target);setResponsePage(NewRequestPage.class, params);}});Fragment fragment;- if (getPullRequest().getId() != null) {+ if (getPullRequest() == null) {+ fragment = newUnrelatedHistoryFrag();+ } else if (getPullRequest().getId() != null) {fragment = newOpenedFrag();} else if (getPullRequest().getSource().equals(getPullRequest().getTarget())) {fragment = newSameBranchFrag();@@ -292,42 +295,47 @@ public class NewRequestPage extends DepotPage implements CommentSupport {}add(fragment);- List<Tab> tabs = new ArrayList<>();-- tabs.add(new AjaxActionTab(Model.of("Commits")) {-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component panel = newCommitsPanel();- getPage().replace(panel);- target.add(panel);- }+ if (getPullRequest() != null) {+ List<Tab> tabs = new ArrayList<>();- });+ tabs.add(new AjaxActionTab(Model.of("Commits")) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ Component panel = newCommitsPanel();+ getPage().replace(panel);+ target.add(panel);+ }++ });- tabs.add(new AjaxActionTab(Model.of("Files")) {-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component panel = newRevDiffPanel();- getPage().replace(panel);- target.add(panel);- }-- });+ tabs.add(new AjaxActionTab(Model.of("Files")) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ Component panel = newRevDiffPanel();+ getPage().replace(panel);+ target.add(panel);+ }++ });- add(new Tabbable("tabs", tabs) {+ add(new Tabbable(TABS_ID, tabs) {- @Override- protected void onConfigure() {- super.onConfigure();+ @Override+ protected void onConfigure() {+ super.onConfigure();++ setVisible(getPullRequest().getStatus() != INTEGRATED);+ }- setVisible(getPullRequest().getStatus() != INTEGRATED);- }+ });- });-- add(newCommitsPanel());+ add(newCommitsPanel());+ } else {+ add(new WebMarkupContainer(TABS_ID).setVisible(false));+ add(new WebMarkupContainer(TAB_PANEL_ID).setVisible(false));+ }}private Component newCommitsPanel() {@@ -468,6 +476,10 @@ public class NewRequestPage extends DepotPage implements CommentSupport {return new Fragment("status", "sameBranchFrag", this);}+ private Fragment newUnrelatedHistoryFrag() {+ return new Fragment("status", "unrelatedHistoryFrag", this);+ }+private Fragment newIntegratedFrag() {Fragment fragment = new Fragment("status", "integratedFrag", this);fragment.add(new BranchLink("sourceBranch", getPullRequest().getSource()));