/*
 * Copyright 2000-2013 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.openapi.vcs.actions;

import com.intellij.openapi.actionSystem.ActionPromoter;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.diff.actions.DiffWalkerAction;
import com.intellij.openapi.vcs.ex.RollbackLineStatusAction;

import java.util.ArrayList;
import java.util.List;

/**
 * @author Konstantin Bulenkov
 */
public class VcsActionPromoter implements ActionPromoter {
  @Override
  public List<AnAction> promote(List<AnAction> actions, DataContext context) {
    List<AnAction> list = new ArrayList<>(0);

    for (AnAction action : actions) {
      if (action instanceof RollbackLineStatusAction) {
        list.add(action);
      }
      if (action instanceof ShowMessageHistoryAction) {
        list.add(action);
      }
      if (action instanceof DiffWalkerAction) {
        list.add(action);
      }
    }

    return list;
  }
}

@@ -850,32 +850,101 @@
 ffWalkerAction;%0A
+import com.intellij.openapi.vcs.changes.actions.diff.ShowDiffAction;%0A
 import com.intel
@@ -1573,24 +1573,104 @@
 n);%0A      %7D%0A
+      if (action instanceof ShowDiffAction) %7B%0A        list.add(action);%0A      %7D%0A
     %7D%0A%0A    r

fix compare files action being executed instead of show diff on ctrl+d