From 7eaf6f422ec4b41196a5d196b17bf524fd424c1e Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 30 Mar 2017 15:00:37 +0300 Subject: [PATCH] diff: remove unused flag --- .../openapi/vcs/changes/actions/migrate/MigrateDiffTool.java | 1 - .../vcs/changes/actions/migrate/MigrateToNewDiffUtil.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java index 39f91e212daf..282220c7d69f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java @@ -47,7 +47,6 @@ public class MigrateDiffTool implements DiffTool { public boolean canShow(DiffRequest request) { if (request instanceof MergeRequest) return false; if (request.getContents().length != 2) return false; - if (request.getHints().contains(MigrateToNewDiffUtil.DO_NOT_TRY_MIGRATE)) return false; if (request.getOnOkRunnable() != null) return false; if (!DiffManagerImpl.INTERNAL_DIFF.canShow(request) && !BinaryDiffTool.INSTANCE.canShow(request)) return false; for (DiffTool tool : DiffManagerImpl.getInstanceEx().getAdditionTools()) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java index b1c9e1e63f30..0bc200c1450e 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java @@ -31,8 +31,6 @@ import java.util.List; import static com.intellij.openapi.util.text.StringUtil.notNullize; public class MigrateToNewDiffUtil { - @NonNls public static final Object DO_NOT_TRY_MIGRATE = "doNotTryMigrate"; - @NotNull public static DiffRequest convertRequest(@NotNull com.intellij.openapi.diff.DiffRequest oldRequest) { DiffRequest request = convertRequestFair(oldRequest);