Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-03-14 20:28:07 +0000
committerMichael Valenta2002-03-14 20:28:07 +0000
commit1b53d75dbe637fe3edcbd13d167e31055864c9bf (patch)
tree71697e0ce8718c991de5e457e8541d6b5072451a
parent0c34bc3c4b5141aaf016d621e8032308763390ce (diff)
downloadeclipse.platform.team-1b53d75dbe637fe3edcbd13d167e31055864c9bf.tar.gz
eclipse.platform.team-1b53d75dbe637fe3edcbd13d167e31055864c9bf.tar.xz
eclipse.platform.team-1b53d75dbe637fe3edcbd13d167e31055864c9bf.zip
11036: "Very quiet" removes ability to catch up with stream?
11331: CVS hangs during replace
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java13
1 files changed, 10 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java
index 3552ee467..4eb3b5ed4 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java
@@ -16,12 +16,15 @@ import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
-import org.eclipse.team.ccvs.core.*;
+import org.eclipse.team.ccvs.core.CVSProviderPlugin;
import org.eclipse.team.ccvs.core.CVSStatus;
import org.eclipse.team.ccvs.core.CVSTag;
+import org.eclipse.team.ccvs.core.ICVSFile;
+import org.eclipse.team.ccvs.core.ICVSFolder;
import org.eclipse.team.ccvs.core.ICVSRemoteFile;
import org.eclipse.team.ccvs.core.ICVSRemoteResource;
import org.eclipse.team.ccvs.core.ICVSRepositoryLocation;
+import org.eclipse.team.ccvs.core.ICVSResourceVisitor;
import org.eclipse.team.ccvs.core.ILogEntry;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.sync.IRemoteResource;
@@ -31,6 +34,7 @@ import org.eclipse.team.internal.ccvs.core.client.Command;
import org.eclipse.team.internal.ccvs.core.client.Session;
import org.eclipse.team.internal.ccvs.core.client.Update;
import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
+import org.eclipse.team.internal.ccvs.core.client.Command.QuietOption;
import org.eclipse.team.internal.ccvs.core.client.listeners.LogListener;
import org.eclipse.team.internal.ccvs.core.connection.CVSServerException;
import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
@@ -85,7 +89,7 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile, ICVSFi
// use the contents of the file on disk so that the server can calculate the relative
// sync state. This is a trick to allow the server to calculate sync state for us.
InputStream is = managed.getInputStream();
- OutputStream os = file.getOutputStream(ICVSFile.UPDATED);
+ OutputStream os = file.getOutputStream(ICVSFile.UPDATED, false);
try {
FileUtil.transfer(is, os);
} catch(IOException e) {
@@ -190,7 +194,9 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile, ICVSFi
IStatus status;
Session s = new Session(getRepository(), parent, false);
s.open(monitor);
+ QuietOption quietness = CVSProviderPlugin.getPlugin().getQuietness();
try {
+ CVSProviderPlugin.getPlugin().setQuietness(Command.VERBOSE);
status = Command.LOG.execute(s,
Command.NO_GLOBAL_OPTIONS,
Command.NO_LOCAL_OPTIONS,
@@ -198,6 +204,7 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile, ICVSFi
new LogListener(this, entries),
monitor);
} finally {
+ CVSProviderPlugin.getPlugin().setQuietness(quietness);
s.close();
}
if (status.getCode() == CVSStatus.SERVER_ERROR) {
@@ -310,7 +317,7 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile, ICVSFi
/*
* @see ICVSFile#getOutputStream()
*/
- public OutputStream getOutputStream(int responseType) throws CVSException {
+ public OutputStream getOutputStream(int responseType, boolean keepLocalHistory) throws CVSException {
// stores the contents of the file when the stream is closed
// could perhaps be optimized in some manner to avoid excessive array copying
return new ByteArrayOutputStream() {

Back to the top