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] return unmodified visible graph if can not find current row

Browse Source
This commit is contained in:
Julia Beliaeva
2017-01-31 23:54:52 +03:00
parent da6e132a43
commit fa025e8718
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/history/FileHistoryFilterer.java
+8 -7
View File
@@ -80,11 +80,12 @@ class FileHistoryFilterer extends VcsLogFilterer {
if (visibleGraph instanceof VisibleGraphImpl) {
int row = getCurrentRow(dataPack, visibleGraph, namesData);
FileHistoryRefiner refiner = new FileHistoryRefiner(visibleGraph, namesData);
if (refiner.refine(((VisibleGraphImpl)visibleGraph).getLinearGraph(), row, myFilePath)) {
// creating a vg is the most expensive task, so trying to avoid that when unnecessary
visibleGraph = createVisibleGraph(dataPack, sortType, matchingHeads, refiner.getMatchingCommits());
if (row >= 0) {
FileHistoryRefiner refiner = new FileHistoryRefiner(visibleGraph, namesData);
if (refiner.refine(((VisibleGraphImpl)visibleGraph).getLinearGraph(), row, myFilePath)) {
// creating a vg is the most expensive task, so trying to avoid that when unnecessary
visibleGraph = createVisibleGraph(dataPack, sortType, matchingHeads, refiner.getMatchingCommits());
}
}
}
}
@@ -105,7 +106,7 @@ class FileHistoryFilterer extends VcsLogFilterer {
return findAncestorRowAffectingFile((PermanentGraphImpl<Integer>)permanentGraph, head.getCommitHash(), visibleGraph, fileIndexData);
}
}
return 0;
return -1;
}
private int findAncestorRowAffectingFile(@NotNull PermanentGraphImpl<Integer> permanentGraph,
@@ -131,7 +132,7 @@ class FileHistoryFilterer extends VcsLogFilterer {
return ObjectUtils.assertNotNull(rowIndex);
}
return 0;
return -1;
}
private static class FileHistoryRefiner implements DfsUtil.NodeVisitor {