/*
 * Copyright 2000-2017 JetBrains s.r.o.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.intellij.vcs.log.ui.actions.history;

import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.VcsDataKeys;
import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vcs.history.CurrentRevision;
import com.intellij.openapi.vcs.history.StandardDiffFromHistoryHandler;
import com.intellij.openapi.vcs.history.VcsFileRevision;
import com.intellij.openapi.vcs.history.VcsRevisionNumber;
import com.intellij.vcs.log.VcsFullCommitDetails;
import com.intellij.vcs.log.history.FileHistoryUi;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import static com.intellij.util.ObjectUtils.notNull;

public class ShowDiffWithLocalFromHistoryAction extends FileHistorySingleCommitAction {

  @Override
  protected boolean isEnabled(@NotNull FileHistoryUi ui, @Nullable VcsFullCommitDetails detail, @NotNull AnActionEvent e) {
    FilePath filePath = e.getData(VcsDataKeys.FILE_PATH);
    if (filePath == null || filePath.isDirectory() || filePath.getVirtualFile() == null) {
      // currently not working for directories, to be fixed later
      return false;
    }

    if (detail != null) {
      VcsFileRevision fileRevision = ui.createRevision(detail);
      if (fileRevision == null) return false;
    }

    return true;
  }

  @Override
  protected void performAction(@NotNull Project project,
                               @NotNull FileHistoryUi ui,
                               @NotNull VcsFullCommitDetails detail,
                               @NotNull AnActionEvent e) {
    if (ChangeListManager.getInstance(project).isFreezedWithNotification(null)) return;

    FilePath path = e.getRequiredData(VcsDataKeys.FILE_PATH);
    VcsFileRevision revision = ui.createRevision(detail);

    if (revision != null) {
      StandardDiffFromHistoryHandler handler = new StandardDiffFromHistoryHandler();
      handler.showDiffForTwo(project, path, revision, new CurrentRevision(notNull(path.getVirtualFile()), VcsRevisionNumber.NULL));
    }
  }
}

@@ -924,106 +924,22 @@
 pi.v
-cs.history.CurrentRevision;%0Aimport com.intellij.openapi.vcs.history.StandardDiffFromHistoryHand
+fs.VirtualFi
 le
-r
 ;%0Aim
@@ -960,102 +960,24 @@
 lij.
-openapi.vcs.history.VcsFileRevision;%0Aimport com.intellij.openapi.vcs.history.VcsRevisionNumber
+vcs.log.CommitId
 ;%0Aim
@@ -1024,16 +1024,63 @@
 etails;%0A
+import com.intellij.vcs.log.VcsLogDiffHandler;%0A
 import c
@@ -1219,52 +1219,22 @@
 ort 
-static com.intellij.util.ObjectUtils.notNull
+java.util.List
 ;%0A%0Ap
@@ -1546,34 +1546,8 @@
 l %7C%7C
- filePath.isDirectory() %7C%7C
  fil
@@ -1590,182 +1590,235 @@
     
-// currently not working for directories, to be fixed later%0A      return false;%0A    %7D%0A%0A    if (detail != null) %7B%0A      VcsFileRevision fileRevision = ui.createRevision(detail
+return false;%0A    %7D%0A%0A    List%3CCommitId%3E commits = ui.getVcsLog().getSelectedCommits();%0A    if (filePath.isDirectory()) %7B%0A      VcsLogDiffHandler handler = ui.getLogData().getLogProvider(commits.get(0).getRoot()).getDiffHandler(
 );%0A 
@@ -1830,20 +1830,15 @@
 if (
-fileRevision
+handler
  == 
@@ -2296,309 +2296,242 @@
 H);%0A
+%0A
     V
-csFileRevision revision = ui.createRevision(detail
+irtualFile root = detail.getRoot(
 );%0A
-%0A
     
-if (revision != null) %7B%0A      StandardDiffFromHistoryHandler handler = new StandardDiffFromHistoryHandler();%0A      handler.showDiffForTwo(project, path, revision, new CurrentRevision(notNull(path.getVirtualFile()), VcsRevisionNumber.NULL)
+VcsLogDiffHandler handler = ui.getLogData().getLogProvider(root).getDiffHandler();%0A    if (handler != null) %7B%0A      handler.showDiffWithLocal(root, ui.getPath(detail), detail.getId(), path
 );%0A 

use VcsLogDiffHandler for diff with local in file history