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] simplify file history pack creation code, check vg on being non-empty

Browse Source
This commit is contained in:
Julia Beliaeva
2017-01-31 23:54:52 +03:00
parent c3264db9ca
commit 94938baefc
1 changed files with 12 additions and 13 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
+12 -13
View File
@@ -72,23 +72,22 @@ class FileHistoryFilterer extends VcsLogFilterer {
if (!myIndex.isIndexed(myRoot) || matchingCommits == null) {
return super.createVisiblePack(dataPack, sortType, filters, matchingHeads, matchingCommits, canRequestMore);
}
VisibleGraph<Integer> visibleGraph = createVisibleGraph(dataPack, sortType, matchingHeads, matchingCommits);
// I realize, I'm calculating this data for the second time.
// No worries! It's going to be fine later!
IndexDataGetter.FileNamesData namesData = myIndexDataGetter.buildFileNamesData(myFilePath);
if (!namesData.hasRenames()) {
VisibleGraph<Integer> visibleGraph = createVisibleGraph(dataPack, sortType, matchingHeads, matchingCommits);
return new FileHistoryVisiblePack(dataPack, visibleGraph, canRequestMore, filters, namesData);
}
if (namesData.hasRenames() && visibleGraph.getVisibleCommitCount() > 0) {
if (visibleGraph instanceof VisibleGraphImpl) {
VisibleGraph<Integer> visibleGraph = createVisibleGraph(dataPack, sortType, matchingHeads, matchingCommits);
if (visibleGraph instanceof VisibleGraphImpl) {
FileHistoryRefiner refiner = new FileHistoryRefiner(visibleGraph, namesData);
if (refiner.refine(((VisibleGraphImpl)visibleGraph).getLinearGraph(), getCurrentRow(dataPack, visibleGraph, namesData), myFilePath)) {
// creating a vg is the most expensive task, so trying to avoid that when unnecessary
return new FileHistoryVisiblePack(dataPack, createVisibleGraph(dataPack, sortType, matchingHeads, refiner.getMatchingCommits()),
canRequestMore,
filters,
namesData);
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());
}
}
}