diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/TerminalExecutor.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/TerminalExecutor.java index 742cbd2584bc..0f55d091b2e4 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/TerminalExecutor.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/TerminalExecutor.java @@ -41,6 +41,11 @@ public class TerminalExecutor extends CommandExecutor { myInteractiveListeners.add(listener); } + @Override + public Boolean wasError() { + return Boolean.FALSE; + } + @Override protected void startHandlingStreams() { for (InteractiveCommandListener listener : myInteractiveListeners) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/TerminalProcessHandler.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/TerminalProcessHandler.java index c6f8dd7cc081..1bd8a2e44fad 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/TerminalProcessHandler.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/TerminalProcessHandler.java @@ -104,7 +104,8 @@ public class TerminalProcessHandler extends SvnProcessHandler { } } - private static Key resolveOutputType(@NotNull String line, @NotNull Key outputType) { + @NotNull + protected Key resolveOutputType(@NotNull String line, @NotNull Key outputType) { Key result = outputType; if (!ProcessOutputTypes.SYSTEM.equals(outputType)) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/WinTerminalProcessHandler.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/WinTerminalProcessHandler.java index 3856b336d07f..9ecea0e2969f 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/WinTerminalProcessHandler.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/WinTerminalProcessHandler.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.svn.commandLine; +import com.intellij.openapi.util.Key; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; @@ -57,6 +58,12 @@ public class WinTerminalProcessHandler extends TerminalProcessHandler { return text; } + @NotNull + @Override + protected Key resolveOutputType(@NotNull String line, @NotNull Key outputType) { + return outputType; + } + @NotNull private static String removeAllBeforeCaretReturn(@NotNull String line) { int caretReturn = line.lastIndexOf("\r");