From 3b894ac36e0ea524d8333c443dd2cd9be7129736 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 24 Apr 2017 12:47:27 +0300 Subject: [PATCH] EA-100545 - assert: DiffRequestFactoryImpl.getTitle this commit partially reverts f7618fd096d8837e93edf998a8a62d85c98da107 --- .../com/intellij/openapi/vcs/history/VcsHistoryUtil.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsHistoryUtil.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsHistoryUtil.java index e5fb8b2f6b09..ba9cab56309d 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsHistoryUtil.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsHistoryUtil.java @@ -96,7 +96,13 @@ public class VcsHistoryUtil { FilePath path1 = getRevisionPath(revision1); FilePath path2 = getRevisionPath(revision2); - String title = DiffRequestFactoryImpl.getTitle(path1, path2, " -> "); + String title; + if (path1 != null && path2 != null) { + title = DiffRequestFactoryImpl.getTitle(path1, path2, " -> "); + } + else { + title = DiffRequestFactoryImpl.getContentTitle(path); + } DiffContent diffContent1 = createContent(project, content1, revision1, path); DiffContent diffContent2 = createContent(project, content2, revision2, path);