From f64ff8ccbbb9b585eacb110c6d748cd32b1265f6 Mon Sep 17 00:00:00 2001 From: irengrig Date: Wed, 1 Feb 2012 11:16:57 +0400 Subject: [PATCH] SVN 1.7 plugin to be updated; JavaHL only in internal mode --- plugins/svn4idea/src/META-INF/plugin.xml | 8 ++++---- .../src/org/jetbrains/idea/svn17/SvnConfigurable.java | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/svn4idea/src/META-INF/plugin.xml b/plugins/svn4idea/src/META-INF/plugin.xml index b79bdeeb4c22..64653a3b78f4 100644 --- a/plugins/svn4idea/src/META-INF/plugin.xml +++ b/plugins/svn4idea/src/META-INF/plugin.xml @@ -1,18 +1,18 @@ Subversion 1.7 Experimental Integration Subversion 1.7 - 1.0 + 1.0.1 VCS Integration + + Version 1.0.1 - Added an option for a status operation to be executed with command line client. (for performance reasons) This plugin provides only basic support for Subversion 1.7. - Many operations are not implemented. + Some operations are not implemented. Subversion 1.7 integration is not ready yet. We do NOT guarantee data safety and consistency. Also, we do NOT guarantee that plugin correctly works with Subversion 1.6 and lower working copies! com.intellij.modules.vcs - JetBrains org.jetbrains.idea.svn17.SvnBundle17 - org.jetbrains.idea.svn17.SvnFileUrlMappingImpl17 diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn17/SvnConfigurable.java b/plugins/svn4idea/src/org/jetbrains/idea/svn17/SvnConfigurable.java index 086a730d6c9c..414b4c9cff9d 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn17/SvnConfigurable.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn17/SvnConfigurable.java @@ -18,6 +18,7 @@ package org.jetbrains.idea.svn17; import com.intellij.ide.util.PropertiesComponent; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.fileChooser.FileChooser; import com.intellij.openapi.fileChooser.FileChooserDescriptor; @@ -154,6 +155,10 @@ public class SvnConfigurable implements Configurable { bg.add(myNoAcceleration); bg.add(myJavaHLAcceleration); bg.add(myWithCommandLineClient); + final boolean internal = ApplicationManager.getApplication().isInternal(); + myJavaHLAcceleration.setEnabled(internal); + myJavaHLAcceleration.setVisible(internal); + myJavaHLInfo.setVisible(internal); } private static FileChooserDescriptor createFileDescriptor() { -- 2.23.3