From 09077506d72d0bca04582cc09f722d2ff864172a Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Tue, 2 Oct 2018 22:12:42 +0300
Subject: [PATCH] [vcs-log] use case-sensitive hashing strategy when
 calculating diff preview revision titles

---
 .../impl/src/com/intellij/vcs/log/history/FileHistory.kt     | 3 ++-
 .../com/intellij/vcs/log/ui/frame/VcsLogChangesBrowser.java  | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistory.kt b/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistory.kt
index 9c1595d5757f..f5aeed333810 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistory.kt
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistory.kt
@@ -430,7 +430,8 @@ private fun <E, R> Collection<E>.firstNotNull(mapping: (E) -> R): R? {
   return null
 }
 
-internal val FILE_PATH_HASHING_STRATEGY = FilePathCaseSensitiveStrategy()
+@JvmField
+val FILE_PATH_HASHING_STRATEGY: TObjectHashingStrategy<FilePath> = FilePathCaseSensitiveStrategy()
 
 internal class FilePathCaseSensitiveStrategy : TObjectHashingStrategy<FilePath> {
   override fun equals(path1: FilePath?, path2: FilePath?): Boolean {
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogChangesBrowser.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogChangesBrowser.java
index 3eadd8d4650f..42488cb9931c 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogChangesBrowser.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogChangesBrowser.java
@@ -29,6 +29,7 @@ import com.intellij.vcs.log.VcsFullCommitDetails;
 import com.intellij.vcs.log.VcsShortCommitDetails;
 import com.intellij.vcs.log.data.LoadingDetails;
 import com.intellij.vcs.log.data.index.IndexedDetails;
+import com.intellij.vcs.log.history.FileHistoryKt;
 import com.intellij.vcs.log.impl.MainVcsLogUiProperties;
 import com.intellij.vcs.log.impl.MergedChange;
 import com.intellij.vcs.log.impl.MergedChangeDiffRequestProvider;
@@ -331,7 +332,9 @@ public class VcsLogChangesBrowser extends ChangesBrowserBase implements Disposab
                                          @Nullable FilePath file,
                                          @Nullable FilePath baseFile) {
     return getShortHash(revision) +
-           (file == null || Objects.equals(baseFile, file) ? "" : " (" + getRelativeFileName(baseFile, file) + ")");
+           (file == null || FileHistoryKt.FILE_PATH_HASHING_STRATEGY.equals(baseFile, file)
+            ? ""
+            : " (" + getRelativeFileName(baseFile, file) + ")");
   }
 
   @NotNull