From f8ca82ba3ca663d615151c7aaaa4d630e300e318 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Fri, 15 Apr 2016 18:51:50 +0300 Subject: [PATCH] [vcs-log] remove vcs.log.bek.sort property --- platform/util/resources/misc/registry.properties | 1 - .../impl/src/com/intellij/vcs/log/util/BekUtil.java | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index a742d8604afc..2e19b87a8cf2 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -256,7 +256,6 @@ compiler.build.data.unused.threshold.description=If project is not opened for th vcs.show.colored.annotations=true vcs.annotations.preload=false vcs.showConsole=true -vcs.log.bek.sort=true vcs.log.bek.sort.disabled=false vcs.log.linear.bek.sort=false vcs.log.square.labels=false diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/util/BekUtil.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/util/BekUtil.java index 04ce48f02a74..63953c419356 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/util/BekUtil.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/util/BekUtil.java @@ -19,12 +19,7 @@ import com.intellij.openapi.util.registry.Registry; public class BekUtil { public static boolean isBekEnabled() { // todo drop later - if (Registry.is("vcs.log.bek.sort.disabled")) { - return false; - } - boolean isInternal = Boolean.valueOf(System.getProperty("idea.is.internal")); - boolean isBekEnabled = Registry.is("vcs.log.bek.sort"); - return isBekEnabled || isInternal; + return !Registry.is("vcs.log.bek.sort.disabled"); } public static boolean isLinearBekEnabled() {