10456: Replace with Tag no progress and should use checkout

2 files changed, 23 insertions, 1 deletions

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
index 88a743057..058c6b3ee 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
@@ -65,6 +65,7 @@ public class CVSProviderPlugin extends Plugin {
 	private boolean promptOnFileDelete = true;
 	private boolean promptOnFolderDelete = true;
 	private boolean showTasksOnAddAndDelete = false;
+	private boolean replaceUnmanaged = true;
 	private String cvsRshCommand = DEFAULT_CVS_RSH;
 	private String cvsServer = DEFAULT_CVS_SERVER;
 	private IConsoleListener consoleListener;
@@ -382,5 +383,21 @@ public class CVSProviderPlugin extends Plugin {
 	public void setShowTasksOnAddAndDelete(boolean showTasksOnAddAndDelete) {
 		this.showTasksOnAddAndDelete = showTasksOnAddAndDelete;
 	}
+	/**
+	 * Gets the replaceUnmanaged.
+	 * @return Returns a boolean
+	 */
+	public boolean isReplaceUnmanaged() {
+		return replaceUnmanaged;
+	}
+
+	/**
+	 * Sets the replaceUnmanaged.
+	 * @param replaceUnmanaged The replaceUnmanaged to set
+	 */
+	public void setReplaceUnmanaged(boolean replaceUnmanaged) {
+		this.replaceUnmanaged = replaceUnmanaged;
+	}
+
 }
 
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
index 1d1358457..e6eab601a 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
@@ -13,6 +13,7 @@ package org.eclipse.team.internal.ccvs.core.util;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.team.ccvs.core.CVSProviderPlugin;
 import org.eclipse.team.ccvs.core.ICVSFile;
 import org.eclipse.team.ccvs.core.ICVSFolder;
 import org.eclipse.team.ccvs.core.ICVSResourceVisitor;
@@ -40,9 +41,13 @@ public class PrepareForReplaceVisitor implements ICVSResourceVisitor {
 	public void visitFile(ICVSFile file) throws CVSException {
 		ResourceSyncInfo info = file.getSyncInfo();
 		if (info == null) {
+			// Delete unmanaged files if the user wants them deleted
+			if (CVSProviderPlugin.getPlugin().isReplaceUnmanaged()) {
+				file.delete();
+			}
 			// If the file is unmanaged, just leave it as is
 		} else if (info.isAdded()) {
-			// For added files, delete and unmanage
+			file.delete();
 			file.unmanage(null);
 		} else if (info.isDeleted()) {
 			// If deleted, null the sync info so the file will be refetched