Skip to content

The Unified and Autonomous Development Platform

Index compared commits if necessary in revision compare page

robin shen82ade843cbce
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.html b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.html
index ceacdfe3f7..72d8c7742d 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.html
@@ -1,5 +1,9 @@
<wicket:panel>
<div class="revision-diff">
+ <div wicket:id="revisionsIndexing" class="revisions-indexing">
+ <img wicket:id="icon"></img>
+ <span>Revisions indexing in progress... (symbol navigation in revisions will be accurate after indexed)</span>
+ </div>
<table class="head">
<tr>
<td class="view-mode">
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
index fddaa1adaa..523439a86d 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -47,6 +47,7 @@ import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
+import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import org.eclipse.jgit.diff.DiffEntry;
@@ -59,6 +60,7 @@ import com.gitplex.codeassist.InputCompletion;
import com.gitplex.codeassist.InputStatus;
import com.gitplex.codeassist.InputSuggestion;
import com.gitplex.jsymbol.Range;
+import com.gitplex.jsymbol.util.NoAntiCacheImage;
import com.gitplex.server.GitPlex;
import com.gitplex.server.git.Blob;
import com.gitplex.server.git.BlobChange;
@@ -69,6 +71,7 @@ import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.support.CommentPos;
+import com.gitplex.server.search.IndexManager;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.StringUtils;
import com.gitplex.server.util.diff.DiffUtils;
@@ -433,6 +436,50 @@ public class RevisionDiffPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
+ add(new WebMarkupContainer("revisionsIndexing") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new NoAntiCacheImage("icon",
+ new PackageResourceReference(RevisionDiffPanel.class, "indexing.gif")));
+
+ add(new WebSocketRenderBehavior() {
+
+ @Override
+ protected void onRender(WebSocketRequestHandler handler) {
+ handler.add(getComponent());
+ handler.appendJavaScript("$(window).resize();");
+ }
+
+ });
+
+ setOutputMarkupPlaceholderTag(true);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ Depot depot = depotModel.getObject();
+ IndexManager indexManager = GitPlex.getInstance(IndexManager.class);
+ RevCommit oldCommit = getOldCommit();
+ RevCommit newCommit = getNewCommit();
+ boolean oldCommitIndexed = indexManager.isIndexed(depot, oldCommit);
+ boolean newCommitIndexed = indexManager.isIndexed(depot, newCommit);
+ if (oldCommitIndexed && newCommitIndexed) {
+ setVisible(false);
+ } else {
+ if (!oldCommitIndexed)
+ indexManager.indexAsync(depot, oldCommit);
+ if (!newCommitIndexed)
+ indexManager.indexAsync(depot, newCommit);
+ setVisible(true);
+ }
+ }
+
+ });
+
WebMarkupContainer body = new WebMarkupContainer(BODY_ID) {
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/indexing.gif b/web/src/main/java/com/gitplex/server/web/component/diff/revision/indexing.gif
new file mode 100644
index 0000000000..1560b646cf
Binary files /dev/null and b/web/src/main/java/com/gitplex/server/web/component/diff/revision/indexing.gif differ
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.css b/web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.css
index 6cefe3fcaa..e6d1612d80 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.css
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.css
@@ -1,3 +1,12 @@
+.revision-diff>.revisions-indexing {
+ padding: 8px 8px 9px 8px;
+ background: #fcf8e3;
+ border: 1px solid #faebcc;
+ border-radius: 4px;
+ color: #8a6d3b;
+ font-size: 13px;
+ margin-bottom: 20px;
+}
.revision-diff>.head {
margin-bottom: 16px;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java
index 396143b9a1..ceb37145a2 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java
@@ -2,6 +2,7 @@ package com.gitplex.server.web.page.depot.commit;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -57,6 +58,8 @@ import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.blob.DepotBlobPage;
import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;
import com.gitplex.server.web.page.depot.tags.DepotTagsPage;
+import com.gitplex.server.web.websocket.CommitIndexedRegion;
+import com.gitplex.server.web.websocket.WebSocketRegion;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
@@ -530,21 +533,21 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {
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.revision, resolvedRevision);
+ if (state.compareWith != null)
objectIdCache.put(state.compareWith, resolvedCompareWith);
return objectIdCache;
}
+ @Override
+ public Collection<WebSocketRegion> getWebSocketRegions() {
+ Collection<WebSocketRegion> regions = super.getWebSocketRegions();
+ regions.add(new CommitIndexedRegion(getDepot().getId(), resolvedRevision));
+ regions.add(new CommitIndexedRegion(getDepot().getId(), getCompareWith()));
+ return regions;
+ }
+
}
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.java
index 125177d0ab..336b1c7514 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
@@ -57,6 +57,7 @@ import com.gitplex.server.web.page.depot.pullrequest.newrequest.NewRequestPage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
import com.gitplex.server.web.websocket.CodeCommentChangedRegion;
+import com.gitplex.server.web.websocket.CommitIndexedRegion;
import com.gitplex.server.web.websocket.WebSocketManager;
import com.gitplex.server.web.websocket.WebSocketRegion;
@@ -744,6 +745,9 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {
@Override
public Collection<WebSocketRegion> getWebSocketRegions() {
Collection<WebSocketRegion> regions = super.getWebSocketRegions();
+ regions.add(new CommitIndexedRegion(getDepot().getId(), state.leftSide.getCommit()));
+ regions.add(new CommitIndexedRegion(getDepot().getId(), state.rightSide.getCommit()));
+
if (state.commentId != null)
regions.add(new CodeCommentChangedRegion(state.commentId));
return regions;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
index ed97888604..905b630088 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
@@ -30,6 +30,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
import com.gitplex.server.GitPlex;
@@ -49,6 +50,7 @@ import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;
import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;
import com.gitplex.server.web.websocket.CodeCommentChangedRegion;
+import com.gitplex.server.web.websocket.CommitIndexedRegion;
import com.gitplex.server.web.websocket.PullRequestChanged;
import com.gitplex.server.web.websocket.WebSocketManager;
import com.gitplex.server.web.websocket.WebSocketRegion;
@@ -140,6 +142,10 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
return index;
}
+ private void onRegionChange() {
+ GitPlex.getInstance(WebSocketManager.class).onRegionChange(this);
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -189,6 +195,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
state.oldCommit = commitsModel.getObject().get(index).name();
}
newRevisionDiff(target);
+ onRegionChange();
}
target.add(head);
pushState(target);
@@ -235,6 +242,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
index++;
state.newCommit = commitsModel.getObject().get(index).name();
newRevisionDiff(target);
+ onRegionChange();
}
target.add(head);
pushState(target);
@@ -255,6 +263,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
state.newCommit = params.getParameterValue("newCommit").toString();
target.add(head);
newRevisionDiff(target);
+ onRegionChange();
pushState(target);
dropdown.close();
}
@@ -329,6 +338,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
state.newCommit = getPullRequest().getHeadCommitHash();
target.add(head);
newRevisionDiff(target);
+ onRegionChange();
pushState(target);
}
@@ -390,9 +400,8 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
super.onPopState(target, data);
state = (State) data;
- GitPlex.getInstance(WebSocketManager.class).onRegionChange(this);
-
newRevisionDiff(target);
+ onRegionChange();
}
@Override
@@ -525,7 +534,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
state.commentId = null;
state.mark = null;
}
- GitPlex.getInstance(WebSocketManager.class).onRegionChange(this);
+ onRegionChange();
pushState(target);
}
@@ -544,12 +553,14 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
state.commentId = null;
state.mark = mark;
pushState(target);
- GitPlex.getInstance(WebSocketManager.class).onRegionChange(this);
+ onRegionChange();
}
@Override
public Collection<WebSocketRegion> getWebSocketRegions() {
Collection<WebSocketRegion> regions = super.getWebSocketRegions();
+ regions.add(new CommitIndexedRegion(getDepot().getId(), ObjectId.fromString(state.oldCommit)));
+ regions.add(new CommitIndexedRegion(getDepot().getId(), ObjectId.fromString(state.newCommit)));
if (state.commentId != null)
regions.add(new CodeCommentChangedRegion(state.commentId));
return regions;