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

IDEA-107524 (CVS: :local: connection method: TestConnection doesn't report errors for not found cvs executable)

Browse Source
This commit is contained in:
Bas Leijdekkers
2013-05-20 17:46:46 +02:00
parent 3ac7a32c14
commit 75bbbeff66
1 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsCommandOperation.java
+2 -23
View File
@@ -40,7 +40,6 @@ import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.Consumer;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.netbeans.lib.cvsclient.ClientEnvironment;
@@ -65,7 +64,6 @@ import org.netbeans.lib.cvsclient.util.IIgnoreFileFilter;
import java.io.File;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -191,9 +189,9 @@ public abstract class CvsCommandOperation extends CvsOperation implements IFileI
private static String getMessageFrom(String initialMessage, Throwable e) {
if (e == null) return initialMessage;
String result = initialMessage;
if (result != null && result.length() > 0) return result;
if (result != null && !result.isEmpty()) return result;
result = e.getLocalizedMessage();
if (result == null || result.length() == 0) result = e.getMessage();
if (result == null || result.isEmpty()) result = e.getMessage();
return getMessageFrom(result, e.getCause());
}
@@ -262,25 +260,6 @@ public abstract class CvsCommandOperation extends CvsOperation implements IFileI
command.execute(requestProcessor, eventManager, eventManager, clientEnvironment, progressViewer);
}
catch (AuthenticationException e) {
if (! root.isOffline()) {
ApplicationManager.getApplication().executeOnPooledThread(new Runnable() {
@Override
public void run() {
final LoginPerformer performer =
new LoginPerformer(executionEnvironment.getProject(), Collections.<CvsEnvironment>singletonList(root), new Consumer<VcsException>() {
@Override
public void consume(VcsException e) {
executionEnvironment.getErrorProcessor().addError(e);
LOG.info(e);
}
});
// for pserver to check password matches connection
performer.setForceCheck(true);
performer.loginAll();
}
});
return;
}
throw root.processException(new CommandException(e, "Authentication problem"));
}
cvsMessagesTranslator.operationCompleted();