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] always push path for a commit into the stack, even if it was not renamed

Browse Source 
It ensures consistency between paths stack and nodes stack.
This commit is contained in:
Julia Beliaeva
2017-01-31 23:54:52 +03:00
parent c195995ac7
commit 6fe899c10f
1 changed files with 2 additions and 2 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
+2 -2
View File
@@ -171,7 +171,7 @@ class FileHistoryFilterer extends VcsLogFilterer {
FilePath previousPath = myNamesData.getPreviousPath(commit, currentPath);
if (previousPath != null) {
myMatchingCommits.add(commit);
if (!currentPath.equals(previousPath)) myPaths.push(previousPath);
myPaths.push(previousPath);
myNamesData.retain(commit, currentPath, previousPath);
}
else {
@@ -184,7 +184,7 @@ class FileHistoryFilterer extends VcsLogFilterer {
public void exitNode(int node) {
Integer commit = myVisibleGraph.getRowInfo(node).getCommit();
if (myMatchingCommits.contains(commit)) {
if (myNamesData.getRenamedPath(commit, myPaths.peek()) != null) myPaths.pop();
myPaths.pop();
}
}
}