MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[file-history] avoid calling bfs when previous file name is the same in all parents

Browse Source
This commit is contained in:
Julia Beliaeva
2017-06-05 00:02:06 +03:00
parent 9a4acf4b73
commit c1a0302b1b
1 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryFilterer.java
+31 -5
View File
@@ -19,6 +19,7 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.Function;
import com.intellij.util.ObjectUtils;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.Stack;
@@ -228,13 +229,24 @@ class FileHistoryFilterer extends VcsLogFilterer {
int previousCommit = myPermanentCommitsInfo.getCommitId(previousNodeId);
if (down) {
int parentIndex = BfsUtil.getCorrespondingParent(myPermanentLinearGraph, previousNodeId, currentNodeId, myVisibilityBuffer);
currentPath = myNamesData.getPathInParentRevision(previousCommit, myPermanentCommitsInfo.getCommitId(parentIndex), previousPath);
Function<Integer, FilePath> pathGetter = parentIndex -> myNamesData
.getPathInParentRevision(previousCommit, myPermanentCommitsInfo.getCommitId(parentIndex), previousPath);
currentPath = findPathWithoutConflict(previousNodeId, pathGetter);
if (currentPath == null) {
int parentIndex = BfsUtil.getCorrespondingParent(myPermanentLinearGraph, previousNodeId, currentNodeId, myVisibilityBuffer);
currentPath = pathGetter.fun(parentIndex);
}
}
else {
// since in reality there is no edge between the nodes, but the whole path, we need to know, which parent is affected by this path
int parentIndex = BfsUtil.getCorrespondingParent(myPermanentLinearGraph, currentNodeId, previousNodeId, myVisibilityBuffer);
currentPath = myNamesData.getPathInChildRevision(currentCommit, myPermanentCommitsInfo.getCommitId(parentIndex), previousPath);
Function<Integer, FilePath> pathGetter =
parentIndex -> myNamesData.getPathInChildRevision(currentCommit, myPermanentCommitsInfo.getCommitId(parentIndex), previousPath);
currentPath = findPathWithoutConflict(currentNodeId, pathGetter);
if (currentPath == null) {
// since in reality there is no edge between the nodes, but the whole path, we need to know, which parent is affected by this path
int parentIndex =
BfsUtil.getCorrespondingParent(myPermanentLinearGraph, currentNodeId, previousNodeId, myVisibilityBuffer);
currentPath = pathGetter.fun(parentIndex);
}
}
}
@@ -242,6 +254,20 @@ class FileHistoryFilterer extends VcsLogFilterer {
myPaths.push(currentPath);
}
@Nullable
private FilePath findPathWithoutConflict(int nodeId, @NotNull Function<Integer, FilePath> pathGetter) {
List<Integer> parents = myPermanentLinearGraph.getNodes(nodeId, LiteLinearGraph.NodeFilter.DOWN);
FilePath path = pathGetter.fun(parents.get(0));
if (parents.size() == 1) return path;
for (Integer parent : ContainerUtil.subList(parents, 1)) {
if (!Objects.equals(pathGetter.fun(parent), path)) {
return null;
}
}
return path;
}
@Override
public void exitNode(int node) {
myPaths.pop();