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] fix tracking paths through rename/modified conflict

Browse Source 
Paths tracking did not work correctly since findPathWithoutConflict returned the path from the first parent in case of a merge commit with a rename/modified conflict because of the incorrect equals implementation for MaybeDeletedFilePath.

IDEA-204764
This commit is contained in:
Julia Beliaeva
2018-12-27 19:27:20 +03:00
parent f8624ac5c5
commit 25f7cfbb74
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistory.kt
+3 -3
View File
@@ -427,8 +427,8 @@ private class Rename(val filePath1: FilePath, val filePath2: FilePath, val commi
other as Rename
if (FILE_PATH_HASHING_STRATEGY.equals(filePath1, other.filePath1)) return false
if (FILE_PATH_HASHING_STRATEGY.equals(filePath2, other.filePath2)) return false
if (!FILE_PATH_HASHING_STRATEGY.equals(filePath1, other.filePath1)) return false
if (!FILE_PATH_HASHING_STRATEGY.equals(filePath2, other.filePath2)) return false
if (commit1 != other.commit1) return false
if (commit2 != other.commit2) return false
@@ -453,7 +453,7 @@ class MaybeDeletedFilePath(val filePath: FilePath, val deleted: Boolean) {
other as MaybeDeletedFilePath
if (FILE_PATH_HASHING_STRATEGY.equals(filePath, other.filePath)) return false
if (!FILE_PATH_HASHING_STRATEGY.equals(filePath, other.filePath)) return false
if (deleted != other.deleted) return false
return true