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] even if file has no renames, still need to run refiner to skip trivial merges

Browse Source
This commit is contained in:
Julia Beliaeva
2017-06-04 23:57:45 +03:00
parent b026911e85
commit 176bb1b412
1 changed files with 8 additions and 4 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
+8 -4
View File
@@ -79,9 +79,8 @@ class FileHistoryFilterer extends VcsLogFilterer {
IndexDataGetter.FileNamesData namesData = ((FilteredByFileResult)filterResult).fileNamesData;
Map<Integer, FilePath> pathsMap = null;
if (namesData.hasRenames() && visibleGraph.getVisibleCommitCount() > 0) {
if (visibleGraph.getVisibleCommitCount() > 0) {
if (visibleGraph instanceof VisibleGraphImpl) {
int row = getCurrentRow(dataPack, visibleGraph, namesData);
if (row >= 0) {
FileHistoryRefiner refiner = new FileHistoryRefiner((VisibleGraphImpl)visibleGraph, namesData);
@@ -191,8 +190,13 @@ class FileHistoryFilterer extends VcsLogFilterer {
}
public boolean refine(int row, @NotNull FilePath startPath) {
myPaths.push(startPath);
DfsUtil.walk(LinearGraphUtils.asLiteLinearGraph(myVisibleGraph.getLinearGraph()), row, this);
if (myNamesData.hasRenames()) {
myPaths.push(startPath);
DfsUtil.walk(LinearGraphUtils.asLiteLinearGraph(myVisibleGraph.getLinearGraph()), row, this);
}
else {
myPathsForCommits.putAll(myNamesData.buildPathsMap());
}
for (int commit : myPathsForCommits.keySet()) {
FilePath path = myPathsForCommits.get(commit);