From 0c8b87bceab439a898794bd8ea304bb4ab77b4d6 Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Fri, 1 Dec 2017 19:04:38 +0300
Subject: [PATCH] [file-history] fix regression: sort old history by author or
 message

Broken in 6c160fd2239ac12eee198344b5dcc544ac8d6e04, where VcsColumnInfo was dropped.
IDEA-183047
---
 .../openapi/vcs/history/FileHistoryPanelImpl.java | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
index 6e20148de8a1..6775f6144725 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
@@ -648,7 +648,8 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
     @Override
     public TableCellRenderer getCustomizedRenderer(TreeNodeOnVcsRevision revision, @Nullable TableCellRenderer renderer) {
       if (renderer instanceof BaseHistoryCellRenderer) {
-        ((BaseHistoryCellRenderer)renderer).setCurrentRevision(myHistorySession.isCurrentRevision(revision.getRevision().getRevisionNumber()));
+        ((BaseHistoryCellRenderer)renderer)
+          .setCurrentRevision(myHistorySession.isCurrentRevision(revision.getRevision().getRevisionNumber()));
       }
       return renderer;
     }
@@ -821,6 +822,12 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
     public String getPreferredStringValue() {
       return StringUtil.repeatSymbol('m', 14);
     }
+
+    @Nullable
+    @Override
+    public Comparator<VcsFileRevision> getComparator() {
+      return comparing(revision -> valueOf(revision));
+    }
   }
 
   public static class MessageColumnInfo extends ColumnInfo<VcsFileRevision, String> {
@@ -867,6 +874,12 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
     public TableCellRenderer getRenderer(VcsFileRevision revision) {
       return myRenderer;
     }
+
+    @Nullable
+    @Override
+    public Comparator<VcsFileRevision> getComparator() {
+      return comparing(revision -> valueOf(revision));
+    }
   }
 
   private static class LoadedContentRevision implements ByteBackedContentRevision {