From 6fe899c10fdc598ae01f24849062febd9ec9087f Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Mon, 30 Jan 2017 21:45:41 +0300 Subject: [PATCH] [file-history] always push path for a commit into the stack, even if it was not renamed It ensures consistency between paths stack and nodes stack. --- .../com/intellij/vcs/log/ui/history/FileHistoryFilterer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/history/FileHistoryFilterer.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/history/FileHistoryFilterer.java index 3c1a3100e3af..967e33776cff 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/history/FileHistoryFilterer.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/history/FileHistoryFilterer.java @@ -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(); } } }