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

diff: do not show 'Compare with...' dialog for new folders in SVN

Browse Source 
* consume shortcut even if change can't be shown
This commit is contained in:
Aleksey Pivovarov
2015-02-19 14:59:18 +03:00
parent d2e64e7dc3
commit 9107d0cd26
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ShowDiffAction.java
+8 -3
View File
@@ -21,6 +21,7 @@ import com.intellij.diff.chains.DiffRequestChain;
import com.intellij.diff.util.DiffUserDataKeys;
import com.intellij.icons.AllIcons;
import com.intellij.idea.ActionsBundle;
import com.intellij.openapi.actionSystem.ActionPlaces;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -53,6 +54,11 @@ public class ShowDiffAction extends AnAction implements DumbAware {
}
public void update(@NotNull AnActionEvent e) {
if (ActionPlaces.MAIN_MENU.equals(e.getPlace())) {
e.getPresentation().setEnabled(true);
return;
}
Change[] changes = e.getData(VcsDataKeys.CHANGES);
Project project = e.getData(CommonDataKeys.PROJECT);
e.getPresentation().setEnabled(project != null && canShowDiff(project, changes));
@@ -68,10 +74,9 @@ public class ShowDiffAction extends AnAction implements DumbAware {
public void actionPerformed(@NotNull final AnActionEvent e) {
final Project project = e.getData(CommonDataKeys.PROJECT);
if (project == null) return;
if (ChangeListManager.getInstance(project).isFreezedWithNotification(null)) return;
final Change[] changes = e.getData(VcsDataKeys.CHANGES);
if (changes == null) return;
if (project == null || !canShowDiff(project, changes)) return;
if (ChangeListManager.getInstance(project).isFreezedWithNotification(null)) return;
final boolean needsConversion = checkIfThereAreFakeRevisions(project, changes);
final List<Change> changesInList = e.getData(VcsDataKeys.CHANGES_IN_LIST_KEY);