Attachment #207795 for bug #41929

Lines 166-171 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/CVSMessages.java (+2 lines)
166	public static String CVSRepositoryLocation_hostRequired;	166	public static String CVSRepositoryLocation_hostRequired;
167	public static String CVSRepositoryLocation_rootRequired;	167	public static String CVSRepositoryLocation_rootRequired;
168	public static String CVSRepositoryLocation_noAuthenticator;	168	public static String CVSRepositoryLocation_noAuthenticator;
		169	public static String CVSRepositoryLocation_mixedRepository;
169		170
170	public static String Util_timeout;	171	public static String Util_timeout;
171	public static String Util_processTimeout;	172	public static String Util_processTimeout;
Lines 189-194 Link Here
189	public static String CVSProvider_Scrubbing_projects_1;	190	public static String CVSProvider_Scrubbing_projects_1;
190	public static String CVSProvider_Creating_projects_2;	191	public static String CVSProvider_Creating_projects_2;
191		192
		193	public static String Resource_not_in_CVS;
192	public static String EclipseFile_Problem_deleting_resource;	194	public static String EclipseFile_Problem_deleting_resource;
193	public static String EclipseFile_Problem_accessing_resource;	195	public static String EclipseFile_Problem_accessing_resource;
194	public static String EclipseFile_Problem_writing_resource;	196	public static String EclipseFile_Problem_writing_resource;

Lines 11-16 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/CVSStatus.java (+10 lines)
11	package org.eclipse.team.internal.ccvs.core;	11	package org.eclipse.team.internal.ccvs.core;
12		12
13	import org.eclipse.core.resources.IResource;	13	import org.eclipse.core.resources.IResource;
		14	import org.eclipse.core.runtime.IPath;
14	import org.eclipse.core.runtime.IStatus;	15	import org.eclipse.core.runtime.IStatus;
15	import org.eclipse.osgi.util.NLS;	16	import org.eclipse.osgi.util.NLS;
16	import org.eclipse.team.core.TeamStatus;	17	import org.eclipse.team.core.TeamStatus;
Lines 45-50 Link Here
45		46
46	// Path for resource related status	47	// Path for resource related status
47	private ICVSFolder commandRoot;	48	private ICVSFolder commandRoot;
		49	private IPath commandPath;
48	// Server information	50	// Server information
49	private ICVSRepositoryLocation cvsLocation;	51	private ICVSRepositoryLocation cvsLocation;
50		52
Lines 65-70 Link Here
65	this(severity, code, message, null, resource);	67	this(severity, code, message, null, resource);
66	}	68	}
67		69
		70	public CVSStatus(int severity, int code, String message, IPath path) {
		71	this(severity, code, message, null, (IResource) null);
		72	commandPath = path;
		73	}
		74
68	public CVSStatus(int severity, int code, String message, Throwable t, ICVSFolder commandRoot) {	75	public CVSStatus(int severity, int code, String message, Throwable t, ICVSFolder commandRoot) {
69	super(severity, CVSProviderPlugin.ID, code, message, t, null);	76	super(severity, CVSProviderPlugin.ID, code, message, t, null);
70	this.commandRoot = commandRoot;	77	this.commandRoot = commandRoot;
Lines 94-99 Link Here
94	if (commandRoot != null) {	101	if (commandRoot != null) {
95	message = NLS.bind(CVSMessages.CVSStatus_messageWithRoot, new String[] { commandRoot.getName(), message });	102	message = NLS.bind(CVSMessages.CVSStatus_messageWithRoot, new String[] { commandRoot.getName(), message });
96	}	103	}
		104	if (commandPath != null) {
		105	message = NLS.bind(CVSMessages.CVSStatus_messageWithRoot, new String[] { commandPath.toString(), message });
		106	}
97	return message;	107	return message;
98	}	108	}
99		109

Lines 685-690 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java (-1 / +3 lines)
685	}	685	}
686		686
687	private IStatus internalValidateCreateLink(IResource resource) {	687	private IStatus internalValidateCreateLink(IResource resource) {
		688	/* Allow creating linked resources of files already included in source repository.
688	ICVSFolder cvsFolder = CVSWorkspaceRoot.getCVSFolderFor(resource.getParent().getFolder(new Path(resource.getName())));	689	ICVSFolder cvsFolder = CVSWorkspaceRoot.getCVSFolderFor(resource.getParent().getFolder(new Path(resource.getName())));
689	try {	690	try {
690	if (cvsFolder.isCVSFolder()) {	691	if (cvsFolder.isCVSFolder()) {
Lines 700-706 Link Here
700	} catch (CVSException e) {	701	} catch (CVSException e) {
701	CVSProviderPlugin.log(e);	702	CVSProviderPlugin.log(e);
702	return e.getStatus();	703	return e.getStatus();
703	}	704	}*/
		705
704	return Status.OK_STATUS;	706	return Status.OK_STATUS;
705	}	707	}
706		708

Lines 12-18 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/ICVSResource.java (+16 lines)
12		12
13		13
14	import org.eclipse.core.resources.IResource;	14	import org.eclipse.core.resources.IResource;
		15	import org.eclipse.core.runtime.IPath;
15	import org.eclipse.core.runtime.IProgressMonitor;	16	import org.eclipse.core.runtime.IProgressMonitor;
		17	import org.eclipse.team.core.RepositoryProvider;
16	import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;	18	import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
17		19
18	/**	20	/**
Lines 40-45 Link Here
40	public String getName();	42	public String getName();
41		43
42	/**	44	/**
		45	* Returns the location of a resource in the file system, if it exists.
		46	*
		47	* @return the location of the resource this handle represents. It can
		48	* be <code>null</code>.
		49	*/
		50	public IPath getLocation();
		51
		52	/**
43	* Answers if this resource has CVS synchronization information associated	53	* Answers if this resource has CVS synchronization information associated
44	* with it.	54	* with it.
45	*	55	*
Lines 170-173 Link Here
170	* @return boolean	180	* @return boolean
171	*/	181	*/
172	public boolean isModified(IProgressMonitor monitor) throws CVSException;	182	public boolean isModified(IProgressMonitor monitor) throws CVSException;
		183
		184	/**
		185	* Method isModified.
		186	* @return boolean
		187	*/
		188	public RepositoryProvider getProvider();
173	}	189	}

Lines 163-169 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/messages.properties (-1 / +2 lines)
163	CVSRepositoryLocation_hostRequired=A host name is required to make a connection	163	CVSRepositoryLocation_hostRequired=A host name is required to make a connection
164	CVSRepositoryLocation_rootRequired=A root path is required to make a connection	164	CVSRepositoryLocation_rootRequired=A root path is required to make a connection
165	CVSRepositoryLocation_noAuthenticator=No CVS authenticator is registered	165	CVSRepositoryLocation_noAuthenticator=No CVS authenticator is registered
166		166	CVSRepositoryLocation_mixedRepository=Projects resources belong to different cvs repositories
167		167
168	Util_timeout=A timeout occurred connecting to host {0}	168	Util_timeout=A timeout occurred connecting to host {0}
169	Util_processTimeout=A timeout occurred executing command ''{0}''	169	Util_processTimeout=A timeout occurred executing command ''{0}''
Lines 190-195 Link Here
190	CVSProvider_Scrubbing_projects_1=Scrubbing projects	190	CVSProvider_Scrubbing_projects_1=Scrubbing projects
191	CVSProvider_Creating_projects_2=Creating projects	191	CVSProvider_Creating_projects_2=Creating projects
192		192
		193	Resource_not_in_CVS=Not CVS File: {0} ({1})
193	EclipseFile_Problem_deleting_resource=Problem deleting resource: {0}. {1}	194	EclipseFile_Problem_deleting_resource=Problem deleting resource: {0}. {1}
194	EclipseFile_Problem_accessing_resource=Problem accessing resource: {0}. {1} Perform a Refresh.	195	EclipseFile_Problem_accessing_resource=Problem accessing resource: {0}. {1} Perform a Refresh.
195	EclipseFile_Problem_writing_resource=Problem writing resource ''{0}''. {1}	196	EclipseFile_Problem_writing_resource=Problem writing resource ''{0}''. {1}





import java.util.*;

import org.eclipse.core.filesystem.URIUtil;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
import org.eclipse.osgi.util.NLS;
import org.eclipse.team.internal.ccvs.core.*;

				// print the invocation string to the console
				if (session.isOutputToConsole() || Policy.isDebugProtocol()) {
					IPath commandRootPath;
					commandRootPath = session.getLocalRoot().getLocation();
					if (commandRootPath == null)
						commandRootPath = Path.EMPTY; 
					else {
						IContainer[] containers = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocationURI(URIUtil.toURI(commandRootPath));
						if (containers.length > 0)
							commandRootPath = containers[0].getFullPath();
					}
					String line = constructCommandInvocationString(commandRootPath, gOptions, lOptions, arguments);
					ConsoleListeners.getInstance().commandInvoked(session, line);




package org.eclipse.team.internal.ccvs.core.client;

import java.io.*;
import java.util.*;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;

import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.*;
import org.eclipse.osgi.util.NLS;
import org.eclipse.team.core.RepositoryProvider;

		}
		// If there is a provider, use the providers setting for watch/edit
		try {
			RepositoryProvider provider = getLocalRoot().getProvider();
			if (resource != null && resource.getType() != IResource.ROOT) {
				RepositoryProvider provider = RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId());
				if (provider != null) {
					return ((CVSTeamProvider) provider).isWatchEditEnabled();
				}
			}
		} catch (CVSException e) {
			CVSProviderPlugin.log(e);
		}




package org.eclipse.team.internal.ccvs.core.client;


import java.util.*;
import java.util.Arrays;
import java.util.List;

import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.osgi.util.NLS;

	 */
	protected boolean shouldRetrieveAbsentDirectories(Session session) {
		// Look for absent directories if enabled and the option is not already included
		IResource resource = null;
		RepositoryProvider provider = null;
		// If there is a provider, use the providers setting
		try {
			provider = session.getLocalRoot().getProvider();
			if (resource != null) {
				provider = RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId());
				if (provider != null) {
					if (((CVSTeamProvider)provider).getFetchAbsentDirectories()) {
						return true;
					}
				}
			}
		} catch (CVSException e) {
			CVSProviderPlugin.log(e);
		}




/*******************************************************************************
 * Copyright (c) 2000, 2007 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.team.internal.ccvs.core.resources;

import org.eclipse.core.runtime.IPath;
import org.eclipse.team.core.RepositoryProvider;
import org.eclipse.team.internal.ccvs.core.*;

/**
 * This class provides static methods for checking out projects from a repository
 * into the local file system (not necessarily mappable to a workspace resource)
 * and for converting IPaths into CVSRespources and sync trees.
 * Instances of this class represent a local workspace root (i.e. a project).
 */
public class CVSFileSystemRoot {

	public CVSFileSystemRoot(){
	}
				
	public static ICVSFolder getCVSFolderFor(IPath resource, RepositoryProvider repositoryProvider) {
		return new FileSystemFolder(resource, repositoryProvider);
	}

	public static ICVSFile getCVSFileFor(IPath resource, RepositoryProvider repositoryProvider) {
		return new FileSystemFile(resource, repositoryProvider);
	}

	public static ICVSResource getCVSResourceFor(IPath resource, RepositoryProvider repositoryProvider) {
		if (resource.toFile().isFile())
			return getCVSFileFor(resource, repositoryProvider);
		else
			return getCVSFolderFor(resource, repositoryProvider);
	}
}

Lines 236-242 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java (-1 lines)
236	*/	236	*/
237	public static boolean isSharedWithCVS(IResource resource) throws CVSException {	237	public static boolean isSharedWithCVS(IResource resource) throws CVSException {
238	if (!resource.isAccessible()) return false;	238	if (!resource.isAccessible()) return false;
239	if(isLinkedResource(resource)) return false;
240		239
241	if(RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId()) == null) {	240	if(RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId()) == null) {
242	return false;	241	return false;




 *******************************************************************************/
package org.eclipse.team.internal.ccvs.core.resources;

import java.io.*;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

					break;
				case MERGED: // merging contents into a file that exists locally
					// Ensure we don't leave the file in a partially written state
					if (file.isLinked()) {
						IPath fileLocation = file.getLocation();
						IPath tempFile = file.getLocation().removeLastSegments(1).append(file.getName() + TEMP_FILE_EXTENSION);
						File javaTempFile = tempFile.toFile();
						if (javaTempFile.exists())
							javaTempFile.delete();
						ByteArrayOutputStream os = new ByteArrayOutputStream();
						int nextByte;
						while ((nextByte = stream.read() ) != -1) {
							os.write((byte) nextByte);
						}
						RandomAccessFile raFile = new RandomAccessFile(javaTempFile, "rw"); //$NON-NLS-1$
						raFile.write(os.toByteArray());
						raFile.setLength(os.toByteArray().length);
						raFile.close();
						fileLocation.toFile().delete();
						javaTempFile.renameTo(fileLocation.toFile());
						file.refreshLocal(IResource.DEPTH_ZERO, Policy.subMonitorFor(monitor, 100));
					}
					else {
					IFile tempFile = file.getParent().getFile(new Path(null, file.getName() + TEMP_FILE_EXTENSION));
					monitor.beginTask(null, 100);
					if (tempFile.exists()) 

					tempFile.create(stream, true /*force*/, Policy.subMonitorFor(monitor, 25));
					file.delete(false /* force */, true /* keep history */, Policy.subMonitorFor(monitor, 25));
					tempFile.move(new Path(null, file.getName()), false /*force*/, true /*history*/, Policy.subMonitorFor(monitor, 25));
					}
					monitor.done();
					break;
				case UPDATE_EXISTING: // creating a new file so it should exist locally
					file.setContents(stream, false /*force*/, true /*keep history*/, monitor);
					break;
			}
		} catch(IOException e) {
			throw CVSException.wrapException(e);
		} catch(CoreException e) {
			String message = null;
			if (e.getStatus().getCode() == IResourceStatus.FAILED_READ_LOCAL) {

Lines 350-357 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java (+2 lines)
350	boolean modified;	350	boolean modified;
351	if (state == ICVSFile.UNKNOWN) {	351	if (state == ICVSFile.UNKNOWN) {
352		352
		353	if (getLocation() != null) {
353	if (!isCVSFolder() && container.getType() == IResource.FOLDER) {	354	if (!isCVSFolder() && container.getType() == IResource.FOLDER) {
354	return container.exists();	355	return container.exists();
		356	}
355	}	357	}
356		358
357	// We have no cached info for the folder. We'll need to check directly,	359	// We have no cached info for the folder. We'll need to check directly,

Lines 13-18 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java (-7 / +30 lines)
13		13
14	import org.eclipse.core.resources.*;	14	import org.eclipse.core.resources.*;
15	import org.eclipse.core.runtime.*;	15	import org.eclipse.core.runtime.*;
		16	import org.eclipse.team.core.RepositoryProvider;
16	import org.eclipse.team.core.Team;	17	import org.eclipse.team.core.Team;
17	import org.eclipse.team.internal.ccvs.core.*;	18	import org.eclipse.team.internal.ccvs.core.*;
18	import org.eclipse.team.internal.ccvs.core.client.Session;	19	import org.eclipse.team.internal.ccvs.core.client.Session;
Lines 55-64 Link Here
55	*/	56	*/
56	public String getRelativePath(ICVSFolder root) throws CVSException {	57	public String getRelativePath(ICVSFolder root) throws CVSException {
57	try {	58	try {
58	EclipseResource rootFolder;
59	String result;	59	String result;
60	rootFolder = (EclipseResource)root;	60	if (root instanceof EclipseResource) {
		61	EclipseResource rootFolder = (EclipseResource)root;
61	result = Util.getRelativePath(rootFolder.getPath(), getPath());	62	result = Util.getRelativePath(rootFolder.getPath(), getPath());
		63	} else
		64	result = Util.getRelativePath(root.getLocation(), getLocation());
		65
62	if (result.length() == 0) return CURRENT_LOCAL_FOLDER;	66	if (result.length() == 0) return CURRENT_LOCAL_FOLDER;
63	return result;	67	return result;
64	} catch (ClassCastException e) {	68	} catch (ClassCastException e) {
Lines 85-90 Link Here
85	if (parent==null) {	89	if (parent==null) {
86	return null;	90	return null;
87	}	91	}
		92	if (getLocation() != null) {
		93	IPath fileSystemParent = getLocation().removeLastSegments(1);
		94	if (!fileSystemParent.equals(parent.getLocation()))
		95	return CVSFileSystemRoot.getCVSFolderFor(fileSystemParent, getProvider());
		96	}
88	return new EclipseFolder(parent);	97	return new EclipseFolder(parent);
89	}	98	}
90		99
Lines 104-111 Link Here
104	return false;	113	return false;
105	}	114	}
106		115
107	// If the resource is a derived or linked resource, it is ignored	116	// If the resource is a derived resource, it is ignored
108	if (resource.isDerived() \|\| resource.isLinked()) {	117	if (resource.isDerived()) {
109	return true;	118	return true;
110	}	119	}
111		120
Lines 165-171 Link Here
165	if (!(obj instanceof EclipseResource)) {	174	if (!(obj instanceof EclipseResource)) {
166	return false;	175	return false;
167	} else {	176	} else {
168	return getPath().equals(((EclipseResource) obj).getPath());	177	return getLocation().equals(((EclipseResource) obj).getLocation());
169	}	178	}
170	}	179	}
171		180
Lines 176-181 Link Here
176	return resource.getFullPath().toString();	185	return resource.getFullPath().toString();
177	}	186	}
178		187
		188	public IPath getLocation() {
		189	return resource.getLocation();
		190	}
		191
179	/*	192	/*
180	* @see ICVSResource#isFolder()	193	* @see ICVSResource#isFolder()
181	*/	194	*/
Lines 187-192 Link Here
187	* @see org.eclipse.team.internal.ccvs.core.ICVSFile#getSyncBytes()	200	* @see org.eclipse.team.internal.ccvs.core.ICVSFile#getSyncBytes()
188	*/	201	*/
189	public byte[] getSyncBytes() throws CVSException {	202	public byte[] getSyncBytes() throws CVSException {
		203	if (getLocation() == null)
		204	return null;
190	return EclipseSynchronizer.getInstance().getSyncBytes(getIResource());	205	return EclipseSynchronizer.getInstance().getSyncBytes(getIResource());
191	}	206	}
192		207
Lines 194-199 Link Here
194	* @see org.eclipse.team.internal.ccvs.core.ICVSFile#setSyncBytes(byte[])	209	* @see org.eclipse.team.internal.ccvs.core.ICVSFile#setSyncBytes(byte[])
195	*/	210	*/
196	public void setSyncBytes(byte[] syncBytes) throws CVSException {	211	public void setSyncBytes(byte[] syncBytes) throws CVSException {
		212	if (resource.getType() == IResource.ROOT \|\| resource.getType() == IResource.PROJECT)
		213	return;
197	if (getParent().isCVSFolder()) {	214	if (getParent().isCVSFolder()) {
198	EclipseSynchronizer.getInstance().setSyncBytes(getIResource(), syncBytes);	215	EclipseSynchronizer.getInstance().setSyncBytes(getIResource(), syncBytes);
199	}	216	}
Lines 231-238 Link Here
231	* @see Comparable#compareTo(Object)	248	* @see Comparable#compareTo(Object)
232	*/	249	*/
233	public int compareTo(Object arg0) {	250	public int compareTo(Object arg0) {
234	EclipseResource other = (EclipseResource)arg0;	251	ICVSResource other = (ICVSResource)arg0;
235	return resource.getFullPath().toString().compareTo(other.resource.getFullPath().toString());	252	return getLocation().toString().compareTo(other.getLocation().toString());
236	}	253	}
237		254
238	/**	255	/**
Lines 272-275 Link Here
272	throw error[0];	289	throw error[0];
273	}	290	}
274	}	291	}
		292
		293	public RepositoryProvider getProvider() {
		294	if (resource != null && resource.getType() != IResource.ROOT)
		295	return RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId());
		296	return null;
		297	}
275	}	298	}




	}
	
	/**
	 * Sets the folder sync info for the specified folder.
	 * The folder must exist and must not be the workspace root.
	 * 
	 * @param folder the folder
	 * @param info the folder sync info, must not be null
	 * @see #getFolderSync, #deleteFolderSync
	 */
	public void setFolderSync(IPath folder, FolderSyncInfo info) throws CVSException {
		Assert.isNotNull(info); // enforce the use of deleteFolderSync
		// ignore folder sync on the root (i.e. CVSROOT/config/TopLevelAdmin=yes but we just ignore it)
		if (folder.isRoot()) return;
		if (!folder.toFile().exists()) {
			// This means that the folder doesn't exist and is not a phantom
			// Allow the set if the parent is a CVS folder since
			// this can occur when creating phantom folders
			if (getFolderSync(folder.removeLastSegments(1)) == null) {
				IStatus status = new CVSStatus(IStatus.ERROR, TeamException.UNABLE,
						NLS.bind(CVSMessages.EclipseSynchronizer_ErrorSettingFolderSync, new String[] { folder.toOSString() }),folder);
				throw new CVSException(status); 
			}
		}
		SyncFileWriter.writeFolderSync(folder, info);
	}
	/**
	 * Gets the folder sync info for the specified folder.
	 * 
	 * @param folder the folder

	}	

	/**
	 * Gets the folder sync info for the specified folder.
	 * 
	 * @param folder the folder
	 * @return the folder sync info associated with the folder, or null if none.
	 * @see #setFolderSync, #deleteFolderSync
	 */
	public FolderSyncInfo getFolderSync(IPath folder) throws CVSException {
		if (folder.isRoot() || !folder.toFile().exists()) return null;
        // Do a check outside the lock for any folder sync info
		FolderSyncInfo info;
		info = SyncFileWriter.readFolderSync(folder);
		return info;
	}	

	/**
	 * Deletes the folder sync for the specified folder and the resource sync
	 * for all of its children.  Does not recurse.
	 * 

	 * @return the resource sync info associated with the resource, or null if none.
	 * @see #setResourceSync, #deleteResourceSync
	 */
	public ResourceSyncInfo getResourceSync(IPath resource) throws CVSException {
		byte[] info = getSyncBytes(resource);
		if (info == null) return null;
		return new ResourceSyncInfo(info);
	}

	/**
	 * Gets the resource sync info for the specified folder.
	 * 
	 * @param resource the resource
	 * @return the resource sync info associated with the resource, or null if none.
	 * @see #setResourceSync, #deleteResourceSync
	 */
	public byte[] getSyncBytes(IResource resource) throws CVSException {
		if (resource.getLocation() == null)
			return null;
		IContainer parent = resource.getParent();
		if (shouldBeManagedOutsideOfTheWorkspace(resource, parent)) {
			// this means the resource is linked, and the parent should be checked in the file system directly.
			return getSyncBytes(resource.getLocation());
		}
		if (parent == null || parent.getType() == IResource.ROOT || !isValid(parent)) return null;
        // Do a quick check outside the lock to see if there are sync butes for the resource.
        byte[] info = getSyncInfoCacheFor(resource).getCachedSyncBytes(resource, false /* not thread safe */);

	}

	/**
	 * Gets the resource sync info for the specified folder that exist outside the workspace.
	 * 
	 * @param path the resource
	 * @return the resource sync info associated with the resource, or null if none.
	 * @see #setResourceSync, #deleteResourceSync
	 */
	public byte[] getSyncBytes(IPath resource) throws CVSException {
		IPath parent = resource.removeLastSegments(1);
		if (parent == null || parent.isRoot() || !parent.toFile().exists()) return null;
        // Do a quick check outside the lock to see if there are sync butes for the resource.
		byte[] bytes =  getSyncBytesFromDisk(resource);
		if (!resource.toFile().exists() && bytes != null && !ResourceSyncInfo.isDeletion(bytes)) {
			bytes = ResourceSyncInfo.convertToDeletion(bytes);
		}
		return bytes;
	}

	/**
	 * Sets the resource sync info for the specified resource.
	 * The parent folder must exist and must not be the workspace root.
	 * 

	public void setSyncBytes(IResource resource, byte[] syncBytes) throws CVSException {
		Assert.isNotNull(syncBytes); // enforce the use of deleteResourceSync
		IContainer parent = resource.getParent();
		if (shouldBeManagedOutsideOfTheWorkspace(resource, parent)) {
			// this means the resource is linked, and the parent should be checked in the file system directly.
			setSyncBytes(resource.getLocation(), syncBytes);
			resourceChanged(resource);
			return;
		}
		if (parent == null || parent.getType() == IResource.ROOT || !isValid(parent)) {
			IStatus status = new CVSStatus(IStatus.ERROR, TeamException.UNABLE,
				NLS.bind(CVSMessages.EclipseSynchronizer_ErrorSettingResourceSync, new String[] { resource.getFullPath().toString() }),resource);

	}
		
	/**
	 * Sets the resource sync info for the specified resource.
	 * The parent folder must exist and must not be the workspace root.
	 * 
	 * @param resource the resource
	 * @param info the resource sync info, must not be null
	 * @see #getResourceSync, #deleteResourceSync
	 */
	public void setSyncBytes(IPath resource, byte[] syncBytes) throws CVSException {
		Assert.isNotNull(syncBytes); // enforce the use of deleteResourceSync
		IPath parent = resource.removeLastSegments(1);
		if (parent == null || parent.isRoot() || !parent.toFile().exists()) {
			IStatus status = new CVSStatus(IStatus.ERROR, 
					NLS.bind(CVSMessages.EclipseSynchronizer_ErrorSettingResourceSync, new String[] { resource.toOSString() }));
			throw new CVSException(status); 
		}
		byte[][] infos = SyncFileWriter.readAllResourceSync(parent);
		if (infos == null) return;
		boolean added = false;
		for (int i = 0; i < infos.length; i++) {
			byte[] bytes = infos[i];
			if (resource.lastSegment().equals(getName(bytes))) {
				infos[i] = syncBytes;
				added = true;
			}
		}
		if (!added) {
			ArrayList list = new ArrayList(Arrays.asList(infos));
			list.add(syncBytes);
			infos = (byte[][]) list.toArray(new byte[0][]);
		}
		SyncFileWriter.writeAllResourceSync(parent, infos);
	}

	/**
	 * Deletes the resource sync info for the specified resource, if it exists.
	 * 
	 * @param resource the resource

	 */
	public void deleteResourceSync(IResource resource) throws CVSException {
		IContainer parent = resource.getParent();
		if (shouldBeManagedOutsideOfTheWorkspace(resource, parent)) {
			// this means the resource is linked, and the parent should be checked in the file system directly.
			deleteResourceSync(resource.getLocation());
			return;
		}
		if (parent == null || parent.getType() == IResource.ROOT || !isValid(parent)) return;
		ISchedulingRule rule = null;
		try {

		}
	}

	private boolean shouldBeManagedOutsideOfTheWorkspace(IResource resource,
			IContainer parent) {
		// parent.getLocation() can be null
		return (parent != null) &&  (resource.getType() != IResource.PROJECT) && !resource.getLocation().removeLastSegments(1).equals(parent.getLocation());
	}

	/**
	 * Deletes the resource sync info for the specified resource, if it exists.
	 * 
	 * @param resource the resource
	 * @see #getResourceSync, #setResourceSync
	 */
	public void deleteResourceSync(IPath resource) throws CVSException {
		IPath parent = resource.removeLastSegments(1);
		if (parent == null || parent.isRoot() || !parent.toFile().exists()) return;
		ArrayList newInfos = new ArrayList();
		byte[][] infos = SyncFileWriter.readAllResourceSync(parent);
		if (infos == null) return;
		for (int i = 0; i < infos.length; i++) {
			byte[] bytes = infos[i];
			if (!resource.lastSegment().equals(getName(bytes))) {
				newInfos.add(infos[i]);
			}
		}
		SyncFileWriter.writeAllResourceSync(parent, (byte[][]) newInfos.toArray(new byte[0][]));
	}

	/**
	 * @param resource
	 */

		if (! getSyncInfoCacheFor(container).isResourceSyncInfoCached(container)) {
			// load the sync info from disk
			byte[][] infos;
			// do not load the sync info for resources that are linked
			if (isLinkedResource(container)) {
				infos = null;
			} else {
				infos = SyncFileWriter.readAllResourceSync(container);
			}
			try {
				if (infos != null) {
					for (int i = 0; i < infos.length; i++) {

		if (! getSyncInfoCacheFor(container).isFolderSyncInfoCached(container)) {
			// load the sync info from disk
			FolderSyncInfo info;
			// do not load the sync info for resources that are linked
			if (isLinkedResource(container)) {
				info = null;
			} else {
				info = SyncFileWriter.readFolderSync(container);
			
			getSyncInfoCacheFor(container).setCachedFolderSync(container, info, false);
		}
	}
	
/*	private boolean isLinkedResource(IResource resource) {
		return CVSWorkspaceRoot.isLinkedResource(resource);
	}
*/
	/**
	 * Load the sync info for the given resource from disk
	 * @param resource

	}
	
	/**
	 * Load the sync info for the given resource from disk
	 * @param resource
	 * @return byte[]
	 */
	private byte[] getSyncBytesFromDisk(IPath resource) throws CVSException {
		byte[][] infos = SyncFileWriter.readAllResourceSync(resource.removeLastSegments(1));
		if (infos == null) return null;
		for (int i = 0; i < infos.length; i++) {
			byte[] syncBytes = infos[i];
			if (resource.lastSegment().equals(getName(syncBytes))) {
				return syncBytes;
			}
		}
		return null;
	}

	/**
	 * Commits the cache after a series of operations.
	 * 
	 * Will return STATUS_OK unless there were problems writting sync 

			for (int i = 0; i < changedResources.length; i++) {
				IResource resource = changedResources[i];
				IContainer folder = resource.getParent();
				if (!shouldBeManagedOutsideOfTheWorkspace(resource, folder)) {
				dirtyParents.add(folder);
			}
			}
			
			monitor = Policy.monitorFor(monitor);
			int numDirty = dirtyParents.size();

						if (info == null) {
							// deleted folder sync info since we loaded it
							// (but don't overwrite the sync info for linked folders
							if (!isLinkedResource(folder))
								SyncFileWriter.deleteFolderSync(folder);
							dirtyParents.remove(folder);
						} else {

								infos.add(syncBytes);
							}
						}
						if (infos.size() > 0)
						if (infos.size() > 0 || !isLinkedResource(folder))
							SyncFileWriter.writeAllResourceSync(folder,
								(byte[][]) infos.toArray(new byte[infos.size()][]));
					} catch(CVSException e) {

	 */
	public void setNotifyInfo(IResource resource, NotifyInfo info) throws CVSException {
		NotifyInfo[] infos = SyncFileWriter.readAllNotifyInfo(resource.getParent());
		infos = setNotifyInfo(resource.getName(), info, infos);
		if (infos != null)
			SyncFileWriter.writeAllNotifyInfo(resource.getParent(), infos);
	}

	/**
	 * Add the entry to the CVS/Notify file. We are not initially concerned with efficiency
	 * since edit/unedit are typically issued on a small set of files.
	 * 
	 * XXX If there was a previous notify entry for the resource, it is replaced. This is
	 * probably not the proper behavior (see EclipseFile).
	 * 
	 * A value of null for info indicates that any entry for the given
	 * resource is to be removed from the Notify file.
	 * 
	 * @param resource
	 * @param info
	 */
	public void setNotifyInfo(IPath resource, NotifyInfo info) throws CVSException {
		NotifyInfo[] infos = SyncFileWriter.readAllNotifyInfo(resource.removeLastSegments(1));
		infos = setNotifyInfo(resource.lastSegment(), info, infos);
		if (infos != null)
			SyncFileWriter.writeAllNotifyInfo(resource.removeLastSegments(1), infos);
	}

	private NotifyInfo[] setNotifyInfo(String name, NotifyInfo info,
			NotifyInfo[] infos) {
		if (infos == null) {
			// if the file is empty and we are removing an entry, just return;
			if (info == null) return null;
			infos = new NotifyInfo[] { info };
		} else {
			Map infoMap = new HashMap();

			}
			if (info == null) {
				// if the info is null, remove the entry
				infoMap.remove(name);
			} else {
				// add the new entry to the list
				infoMap.put(info.getName(), info);

			}
			infos = newInfos;
		}
		return infos;
	}

	/**

	}

	/**
	 * Method getNotifyInfo.
	 * @param resource
	 * @return NotifyInfo
	 */
	public NotifyInfo getNotifyInfo(IPath resource) throws CVSException {
		NotifyInfo[] infos = SyncFileWriter.readAllNotifyInfo(resource.removeLastSegments(1));
		if (infos == null) return null;
		for (int i = 0; i < infos.length; i++) {
			NotifyInfo notifyInfo = infos[i];
			if (notifyInfo.getName().equals(resource.lastSegment())) {
				return notifyInfo;
			}
		}
		return null;
	}

	/**
	 * Method deleteNotifyInfo.
	 * @param resource
	 */

	}
	
	/**
	 * Method deleteNotifyInfo.
	 * @param resource
	 */
	public void deleteNotifyInfo(IPath resource) throws CVSException {
		NotifyInfo[] infos = SyncFileWriter.readAllNotifyInfo(resource.removeLastSegments(1));
		if (infos == null) return;
		Map infoMap = new HashMap();
		for (int i = 0; i < infos.length; i++) {
			NotifyInfo notifyInfo = infos[i];
			infoMap.put(notifyInfo.getName(), notifyInfo);
		}
		infoMap.remove(resource.lastSegment());
		NotifyInfo[] newInfos = new NotifyInfo[infoMap.size()];
		int i = 0;
		for (Iterator iter = infoMap.values().iterator(); iter.hasNext();) {
			newInfos[i++] = (NotifyInfo) iter.next();
		}
		SyncFileWriter.writeAllNotifyInfo(resource.removeLastSegments(1), newInfos);
	}

	/**
	 * Add the entry to the CVS/Baserev file. We are not initially concerned
	 * with efficiency since edit/unedit are typically issued on a small set of
	 * files.

	 */
	public void setBaserevInfo(IResource resource, BaserevInfo info) throws CVSException {
		BaserevInfo[] infos = SyncFileWriter.readAllBaserevInfo(resource.getParent());
		infos = setBaserevInfo(info, infos);
		SyncFileWriter.writeAllBaserevInfo(resource.getParent(), infos);
	}

	/**
	 * Add the entry to the CVS/Baserev file. We are not initially concerned
	 * with efficiency since edit/unedit are typically issued on a small set of
	 * files.
	 *
	 * XXX If there was a previous notify entry for the resource, it is replaced. This is
	 * probably not the proper behavior (see EclipseFile).
	 *
	 * @param resource
	 * @param info
	 */
	public void setBaserevInfo(IPath resource, BaserevInfo info) throws CVSException {
		BaserevInfo[] infos = SyncFileWriter.readAllBaserevInfo(resource.removeLastSegments(1));
		infos = setBaserevInfo(info, infos);
		SyncFileWriter.writeAllBaserevInfo(resource.removeLastSegments(1), infos);
	}

	private BaserevInfo[] setBaserevInfo(BaserevInfo info, BaserevInfo[] infos) {
		if (infos == null) {
			infos = new BaserevInfo[] { info };
		} else {

			}
			infos = newInfos;
		}
		return infos;
	}

	/**

	public BaserevInfo getBaserevInfo(IResource resource) throws CVSException {
		BaserevInfo[] infos = SyncFileWriter.readAllBaserevInfo(resource.getParent());
		if (infos == null) return null;
		return getBaserevInfo(resource.getName(), infos);
	}

	/**
	 * Method getBaserevInfo.
	 * @param resource
	 * @return BaserevInfo
	 */
	public BaserevInfo getBaserevInfo(IPath resource) throws CVSException {
		BaserevInfo[] infos = SyncFileWriter.readAllBaserevInfo(resource.removeLastSegments(1));
		if (infos == null) return null;
		return getBaserevInfo(resource.lastSegment(), infos);
	}

	private BaserevInfo getBaserevInfo(String name, BaserevInfo[] infos) {
		for (int i = 0; i < infos.length; i++) {
			BaserevInfo info = infos[i];
			if (info.getName().equals(name)) {
				return info;
			}
		}

	public void deleteBaserevInfo(IResource resource) throws CVSException {
		BaserevInfo[] infos = SyncFileWriter.readAllBaserevInfo(resource.getParent());
		if (infos == null) return;
		BaserevInfo[] newInfos = deleteBaserevInfo(resource.getName(), infos);
		SyncFileWriter.writeAllBaserevInfo(resource.getParent(), newInfos);
	}

	/**
	 * Method deleteNotifyInfo.
	 * @param resource
	 */
	public void deleteBaserevInfo(IPath resource) throws CVSException {
		BaserevInfo[] infos = SyncFileWriter.readAllBaserevInfo(resource.removeLastSegments(1));
		if (infos == null) return;
		BaserevInfo[] newInfos = deleteBaserevInfo(resource.lastSegment(), infos);
		SyncFileWriter.writeAllBaserevInfo(resource.removeLastSegments(1), newInfos);
	}

	private BaserevInfo[] deleteBaserevInfo(String name,
			BaserevInfo[] infos) {
		Map infoMap = new HashMap();
		for (int i = 0; i < infos.length; i++) {
			infoMap.put(infos[i].getName(), infos[i]);
		}
		infoMap.remove(name);
		BaserevInfo[] newInfos = new BaserevInfo[infoMap.size()];
		int i = 0;
		for (Iterator iter = infoMap.values().iterator(); iter.hasNext();) {
			newInfos[i++] = (BaserevInfo) iter.next();
		}
		return newInfos;
	}

	public void copyFileToBaseDirectory(final IFile file, IProgressMonitor monitor) throws CVSException {

		}
	}
	
	public void copyFileToBaseDirectory(final IPath file, IProgressMonitor monitor) throws CVSException {
		monitor = Policy.monitorFor(monitor);
		monitor.beginTask(null, 100);
		try {
			ResourceSyncInfo info = getResourceSync(file);
			// The file must exist remotely and locally
			if (info == null || info.isAdded() || info.isDeleted())
				return;
			SyncFileWriter.writeFileToBaseDirectory(file, Policy.subMonitorFor(monitor, 80));
		} finally {
			monitor.done();
		}
	}

	public void restoreFileFromBaseDirectory(final IFile file, IProgressMonitor monitor) throws CVSException {
		monitor = Policy.monitorFor(monitor);
		monitor.beginTask(null, 100);

		}
	}
	
	public void restoreFileFromBaseDirectory(final IPath file, IProgressMonitor monitor) throws CVSException {
		monitor = Policy.monitorFor(monitor);
		monitor.beginTask(null, 100);
		try {
			ResourceSyncInfo info = getResourceSync(file);
			// The file must exist remotely
			if (info == null || info.isAdded())
				return;
			SyncFileWriter.restoreFileFromBaseDirectory(file, Policy.subMonitorFor(monitor, 80));
		} finally {
			monitor.done();
		}
	}

	public void deleteFileFromBaseDirectory(final IFile file, IProgressMonitor monitor) throws CVSException {
		ResourceSyncInfo info = getResourceSync(file);
		// The file must exist remotely

		SyncFileWriter.deleteFileFromBaseDirectory(file, monitor);
	}
	
	public void deleteFileFromBaseDirectory(final IPath file, IProgressMonitor monitor) throws CVSException {
		ResourceSyncInfo info = getResourceSync(file);
		// The file must exist remotely
		if (info == null || info.isAdded())
			return;
		SyncFileWriter.deleteFileFromBaseDirectory(file, monitor);
	}

	/**
	 * Method isSyncInfoLoaded returns true if all the sync info for the
	 * provided resources is loaded into the internal cache.

		return SyncFileWriter.isEdited(resource);
	}
	
	/**
	 * Method isEdited returns true if a "cvs edit" was performed on the given
	 * file and no commit or unedit has yet been performed.
	 * @param iResource
	 * @return boolean
	 */
	public boolean isEdited(IPath resource) {
		return SyncFileWriter.isEdited(resource);
	}

	/* package */ void adjustDirtyStateRecursively(IResource resource, String indicator) throws CVSException {
		if (resource.getType() == IResource.ROOT) return;
		try {




/*******************************************************************************
 * Copyright (c) 2000, 2007 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Red Hat Incorporated - is/setExecutable() code
 *******************************************************************************/
package org.eclipse.team.internal.ccvs.core.resources;

import java.io.*;
import java.util.*;

import org.eclipse.core.filesystem.*;
import org.eclipse.core.filesystem.URIUtil;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.*;
import org.eclipse.team.core.RepositoryProvider;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.ccvs.core.*;
import org.eclipse.team.internal.ccvs.core.client.Session;
import org.eclipse.team.internal.ccvs.core.syncinfo.*;

/**
 * Represents handles to CVS resource on the local file system. Synchronization
 * information is taken from the CVS sub directories. 
 */
public class FileSystemFile extends FileSystemResource implements ICVSFile {

	private static final IPath PROJECT_META_DATA_PATH = new Path(".project");//$NON-NLS-1$
	
	/**
	 * Create a handle based on the given local resource.
	 */
	protected FileSystemFile(IPath resource,
			RepositoryProvider repositoryProvider) {
		super(resource, repositoryProvider);
	}

	/*
	 * @see ICVSResource#delete()
	 */
	public void delete() throws CVSException {
		resource.toFile().delete();
	}
	
	public long getSize() {
		return getIOFile().length();	
	}

	public InputStream getContents() throws CVSException {
 		try {
 			return new FileInputStream(resource.toFile());
		} catch (IOException e) {
 			throw CVSException.wrapException(e); // 
 		}
 	}
	
	/*
	 * @see ICVSFile#getTimeStamp()
	 */
	public Date getTimeStamp() {
		long timestamp = getFileInfo().getLastModified();
		if( timestamp == IResource.NULL_STAMP) {
			// If there is no file, return the same timestamp as ioFile.lastModified() would
			return new Date(0L);
		}			
		return new Date((timestamp/1000)*1000);
	}

	private IFileInfo getFileInfo() {
		try {
			return EFS.getStore(URIUtil.toURI(resource)).fetchInfo();
		} catch (CoreException e) {
			return EFS.createFileInfo();
		}
	}
 
	/*
	 * @see ICVSFile#setTimeStamp(Date)
	 */
	public void setTimeStamp(Date date) throws CVSException {
		long time;
		if (date == null) {
			time = System.currentTimeMillis();
		} else {
			time = date.getTime();
		}
		getFileInfo().setLastModified(time);
	}

	/*
	 * @see ICVSFile#isModified()
	 */
	public boolean isModified(IProgressMonitor monitor) throws CVSException {
		
		// ignore the monitor, there is no valuable progress to be shown when
		// calculating the dirty state for files. It is relatively fast.
		
		if (!exists()) {
			return getSyncBytes() != null;
		}
		return true;
	}
	
	/*
	 * @see ICVSResource#accept(ICVSResourceVisitor)
	 */
	public void accept(ICVSResourceVisitor visitor) throws CVSException {
		visitor.visitFile(this);
	}

	/*
	 * @see ICVSResource#accept(ICVSResourceVisitor, boolean)
	 */
	public void accept(ICVSResourceVisitor visitor, boolean recurse) throws CVSException {
		visitor.visitFile(this);
	}
	
	/*
	 * This is to be used by the Copy handler. The filename of the form .#filename
	 */
	public void copyTo(String filename) throws CVSException {
		try {
	        InputStream in = new FileInputStream(resource.toFile());
	        File targetFile = resource.removeLastSegments(1).append(filename).toFile();
	        if (targetFile.exists())
	        	targetFile.delete();
	        OutputStream out = new FileOutputStream(targetFile);
	    
	        // Transfer bytes from in to out
	        byte[] buf = new byte[1024];
	        int len;
	        while ((len = in.read(buf)) > 0) {
	            out.write(buf, 0, len);
	        }
	        in.close();
	        out.close();
		} catch(IOException e) {
			throw CVSException.wrapException(e);
		}
	}

	/*
	 * @see ICVSResource#getRemoteLocation()
	 */
	public String getRemoteLocation(ICVSFolder stopSearching) throws CVSException {
		return getParent().getRemoteLocation(stopSearching) + SEPARATOR + getName();
	}
		
	/*
	 * @see ICVSFile#setReadOnly()
	 */
	public void setContents(InputStream stream, int responseType, boolean keepLocalHistory, IProgressMonitor monitor) throws CVSException {
		try {
			if (PROJECT_META_DATA_PATH.equals(resource.lastSegment())) {
				responseType = UPDATED;
			}
			ByteArrayOutputStream os = new ByteArrayOutputStream();
			int nextByte;
			while ((nextByte = stream.read() ) != -1) {
				os.write((byte) nextByte);
			}
			switch (responseType) {
				case UPDATED:
					if (exists()) {
						writefile(os);
						break;
					}
				case CREATED: // creating a new file so it should not exist locally
				case MERGED: // merging contents into a file that exists locally
				case UPDATE_EXISTING: // creating a new file so it should exist locally
					writefile(os);
					break;
			}
		} catch(IOException e) {
			throw CVSException.wrapException(e);
		}
	}

	private void writefile(ByteArrayOutputStream os)
			throws FileNotFoundException, IOException {
		RandomAccessFile raFile = new RandomAccessFile(getIOFile(), "rw"); //$NON-NLS-1$
		raFile.write(os.toByteArray());
		raFile.setLength(os.toByteArray().length);
		raFile.close();
	}
			
	/*
	 * @see ICVSFile#setReadOnly()
	 */
	public void setReadOnly(boolean readOnly) throws CVSException {
		try {
			IFileStore fileStore = EFS.getStore(URIUtil.toURI(resource));
			if (fileStore != null) {
				IFileInfo fileInfo = fileStore.fetchInfo();
				if (fileInfo != null)
					fileInfo.setAttribute(EFS.ATTRIBUTE_READ_ONLY, readOnly);
			}
		} catch (CoreException e) {
			CVSException.wrapException(e);
			}
	}

	/*
	 * @see ICVSFile#isReadOnly()
	 */
	public boolean isReadOnly() throws CVSException {
		return !getIOFile().canWrite();
	}
	
	/*
	 * @see ICVSFile#setExecutable()
	 */
	public void setExecutable(boolean executable) throws CVSException {
		try {
			IFileStore fileStore = EFS.getStore(URIUtil.toURI(resource));
			if (fileStore != null) {
				IFileInfo fileInfo = fileStore.fetchInfo();
				if (fileInfo != null)
					fileInfo.setAttribute(EFS.ATTRIBUTE_EXECUTABLE, executable);
			}
		} catch (CoreException e) {
			CVSException.wrapException(e);
		}
	}

	/*
	 * @see ICVSFile#isExectuable()
	 */
	public boolean isExecutable() throws CVSException {
		try {
			IFileStore fileStore = EFS.getStore(URIUtil.toURI(resource));
			if (fileStore != null) {
				IFileInfo fileInfo = fileStore.fetchInfo();
				if (fileInfo != null)
					return fileInfo.getAttribute(EFS.ATTRIBUTE_EXECUTABLE);
			}
		} catch (CoreException e) {
			CVSException.wrapException(e);
		}
		return false;
	}
	
	/*
	 * To allow accessing size and timestamp for the underlying java.io.File
	 */
	private File getIOFile() {
		return resource.toFile();
	}
	/**
	 * @see ICVSFile#getLogEntries(IProgressMonitor)
	 */
	public ILogEntry[] getLogEntries(IProgressMonitor monitor)	throws TeamException {
		byte[] syncBytes = getSyncBytes();
		if(syncBytes != null && !ResourceSyncInfo.isAddition(syncBytes)) {
			ICVSRemoteResource remoteFile = CVSWorkspaceRoot.getRemoteResourceFor(this);
			if (remoteFile != null)
				return ((ICVSRemoteFile)remoteFile).getLogEntries(monitor);
		}
		return new ILogEntry[0];
	}
	/**
	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#setNotifyInfo(NotifyInfo)
	 */
	public void setNotifyInfo(NotifyInfo info) throws CVSException {
		if (isManaged()) {
			EclipseSynchronizer.getInstance().setNotifyInfo(resource, info);
			// On an edit, the base should be cached
			// On an unedit, the base should be restored (and cleared?)
			// On a commit, the base should be cleared
		}
	}

	/**
	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#getNotifyInfo()
	 */
	public NotifyInfo getNotifyInfo() throws CVSException {
		if (isManaged()) {
			return EclipseSynchronizer.getInstance().getNotifyInfo(resource);		
		}
		return null;
	}

	/**
	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#setNotifyInfo(NotifyInfo)
	 */
	public void setBaserevInfo(BaserevInfo info) throws CVSException {
		if (isManaged()) {
			if (info == null) {
				EclipseSynchronizer.getInstance().deleteBaserevInfo(resource);
				EclipseSynchronizer.getInstance().deleteFileFromBaseDirectory(resource, null);
			} else
				EclipseSynchronizer.getInstance().setBaserevInfo(resource, info);
		}
	}
	/**
	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#getNotifyInfo()
	 */
	public BaserevInfo getBaserevInfo() throws CVSException {
		if (isManaged()) {
			return EclipseSynchronizer.getInstance().getBaserevInfo(resource);
		}
		return null;
	}
	
	/**
	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#checkout(int)
	 */
	public void edit(final int notifications, boolean notifyForWritable, IProgressMonitor monitor) throws CVSException {
		if (!notifyForWritable && !isReadOnly()) return;
		run(new ICVSRunnable() {
			public void run(IProgressMonitor monitor) throws CVSException {
				byte[] syncBytes = getSyncBytes();
				if (syncBytes == null || ResourceSyncInfo.isAddition(syncBytes)) return;
				
				// convert the notifications to internal form
				char[] internalFormat;
				if (notifications == NO_NOTIFICATION) {
					internalFormat = null;
				} else if (notifications == NOTIFY_ON_ALL) {
					internalFormat = NotifyInfo.ALL;
				} else {
					List notificationCharacters = new ArrayList();
					if ((notifications & NOTIFY_ON_EDIT) >0) 
						notificationCharacters.add(new Character(NotifyInfo.EDIT));
					if ((notifications & NOTIFY_ON_UNEDIT) >0) 
						notificationCharacters.add(new Character(NotifyInfo.UNEDIT));
					if ((notifications & NOTIFY_ON_COMMIT) >0) 
						notificationCharacters.add(new Character(NotifyInfo.COMMIT));
					internalFormat = new char[notificationCharacters.size()];
					for (int i = 0; i < internalFormat.length; i++) {
						internalFormat[i] = ((Character)notificationCharacters.get(i)).charValue();
					}
				}
				
				// record the notification
				NotifyInfo notifyInfo = new NotifyInfo(getName(), NotifyInfo.EDIT, new Date(), internalFormat);
				setNotifyInfo(notifyInfo);
				
				// Only record the base if the file is not modified
				if (!isModified(null)) {
					EclipseSynchronizer.getInstance().copyFileToBaseDirectory(resource, monitor);
					setBaserevInfo(new BaserevInfo(getName(), ResourceSyncInfo.getRevision(syncBytes)));
				}
				
				try {
                    // allow editing
                    setReadOnly(false);
                } catch (CVSException e) {
                    // Just log and keep going
                    CVSProviderPlugin.log(e);
                }
			}
		}, monitor);
		
	}

	/**
	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#uncheckout()
	 */
	public void unedit(IProgressMonitor monitor) throws CVSException {
		if (isReadOnly()) return;
		run(new ICVSRunnable() {
			public void run(IProgressMonitor monitor) throws CVSException {
				// record the notification
				NotifyInfo info = getNotifyInfo();
				if (info != null && info.getNotificationType() == NotifyInfo.EDIT) {
					info = null;
				} else {
					info = new NotifyInfo(getName(), NotifyInfo.UNEDIT, new Date(), null);
				}
				setNotifyInfo(info);
					
				if (isModified(null)) {
					ResourceSyncInfo syncInfo = getSyncInfo();
					BaserevInfo baserevInfo = getBaserevInfo();
					EclipseSynchronizer.getInstance().restoreFileFromBaseDirectory(resource, monitor);
					// reset any changes that may have been merged from the server
					if (!syncInfo.getRevision().equals(baserevInfo.getRevision())) {
						MutableResourceSyncInfo newInfo = syncInfo.cloneMutable();
						newInfo.setRevision(baserevInfo.getRevision());
						newInfo.setTimeStamp(getTimeStamp());
						newInfo.setDeleted(false);
						setSyncInfo(newInfo, ICVSFile.CLEAN);
					} else {
						// an unedited file is no longer modified
						// external files have no modified states
						//EclipseSynchronizer.getInstance().setModified(resource, CLEAN);
					}
				} else {
					// We still need to report a state change
					setSyncBytes(getSyncBytes(), ICVSFile.CLEAN);
				}
				setBaserevInfo(null);
					
				try {
                    // prevent editing
                    setReadOnly(true);
                } catch (CVSException e) {
                    // Just log and keep going
                    CVSProviderPlugin.log(e);
                }
			}
		}, monitor);
	}

	/**
	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#notificationCompleted()
	 */
	public void notificationCompleted() throws CVSException {
		EclipseSynchronizer.getInstance().deleteNotifyInfo(resource);
	}

	/**
	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#getPendingNotification()
	 */
	public NotifyInfo getPendingNotification() throws CVSException {
		return getNotifyInfo();
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#checkedIn(java.lang.String)
	 */
	public void checkedIn(String entryLine, boolean commit) throws CVSException {
		ResourceSyncInfo oldInfo = getSyncInfo();
		ResourceSyncInfo newInfo = null;
		int modificationState = ICVSFile.CLEAN;
		if (entryLine == null) {
			// cvs commit: the file contents matched the server contents so no entry line was sent
			if (oldInfo == null) return;
			// We should never make the timestamp go backwards so we'll set
			// the entry line timestamp to match that of the file
			if(! oldInfo.isAdded()) {
				MutableResourceSyncInfo mutable = oldInfo.cloneMutable();
				mutable.setTimeStamp(getTimeStamp(), true /* clear merged */);
				newInfo = mutable;
			}
			// (modified = false) the file will be no longer modified
		} else if (oldInfo == null) {
			// cvs add: addition of a file
			newInfo = new ResourceSyncInfo(entryLine, null);
			// an added file should show up as modified
			modificationState = ICVSFile.DIRTY;
		} else {
			// cvs commit: commit of a changed file
		    // cvs update: update of a file whose contents match the server contents
		    Date timeStamp;
		    if (commit) {
		        // This is a commit. Put the file timestamp in the entry
		        timeStamp = getTimeStamp();
		    } else {
		        // This is an update. We need to change the tiemstamp in the
                // entry file to match the file timestamp returned by Java
		        timeStamp = oldInfo.getTimeStamp();
		        if (timeStamp == null) {
		            timeStamp = getTimeStamp();
		        } else {
                    // First, set the timestamp of the file to the timestamp from the entry
                    // There is a chance this will do nothing as the call to Java on some
                    // file systems munges the timestamps
		            setTimeStamp(timeStamp);
                    // To compensate for the above, reset the timestamp in the entry
                    // to match the timestamp in the file
                    timeStamp = getTimeStamp();
		        }
		    }
	        newInfo = new ResourceSyncInfo(entryLine, timeStamp);
			
		}
		//see bug 106876
		if (newInfo != null){
			CVSTag tag = newInfo.getTag();
			if(tag != null && CVSEntryLineTag.BASE.getName().equals(tag.getName())){
				newInfo = newInfo.cloneMutable();
				((MutableResourceSyncInfo)newInfo).setTag(oldInfo.getTag());
			}
			setSyncInfo(newInfo, modificationState);
		}
		clearCachedBase();
	}
	
	private void clearCachedBase() throws CVSException {
		BaserevInfo base = getBaserevInfo();
		if (base != null) {
			setBaserevInfo(null);
			try {
                setReadOnly(true);
            } catch (CVSException e) {
                // Just log and keep going
                CVSProviderPlugin.log(e);
            }
		} else {
            // Check to see if watch-edit is enabled for the project
            if (repositoryProvider != null && ((CVSTeamProvider) repositoryProvider).isWatchEditEnabled()) {
                try {
                    setReadOnly(true);
                } catch (CVSException e) {
                    // Just log and keep going
                    CVSProviderPlugin.log(e);
                }
            }
        }
	}

	/**
	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#unmanage(org.eclipse.core.runtime.IProgressMonitor)
	 */
	public void unmanage(IProgressMonitor monitor) throws CVSException {
		run(new ICVSRunnable() {
			public void run(IProgressMonitor monitor) throws CVSException {
				FileSystemFile.super.unmanage(monitor);
				clearCachedBase();
			}
		}, monitor);
	}
	
	/**
	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#isEdited()
	 */
	public boolean isEdited() throws CVSException {
		return EclipseSynchronizer.getInstance().isEdited(resource);
	}

	/**
	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#setSyncInfo(org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo)
	 */
	public void setSyncInfo(ResourceSyncInfo info, int modificationState) throws CVSException {
		setSyncBytes(info.getBytes(), info, modificationState);
	}
	
	/**
	 * @see ICVSResource#isFolder()
	 */
	public boolean isFolder() {
		return false;
	}

	/**
	 * @see org.eclipse.team.internal.ccvs.core.resources.EclipseResource#setSyncBytes(byte[], int)
	 */
	public void setSyncBytes(byte[] syncBytes, int modificationState) throws CVSException {
		setSyncBytes(syncBytes, null, modificationState);
	}
	
	/*
	 * @see org.eclipse.team.internal.ccvs.core.resources.EclipseResource#setSyncBytes(byte[], int)
	 */
	private void setSyncBytes(byte[] syncBytes, ResourceSyncInfo info, int modificationState) throws CVSException {
		Assert.isNotNull(syncBytes);
		setSyncBytes(syncBytes);
		// external files have no modified states
		//EclipseSynchronizer.getInstance().setModified(this, modificationState);
	}
	
	public void handleModification(boolean forAddition) throws CVSException {
		// external files have no modified states
	}

	/* (non-Javadoc)
	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#getRepositoryRelativePath()
	 */
	public String getRepositoryRelativePath() throws CVSException {
		if (!isManaged()) return null;
		String parentPath = getParent().getRepositoryRelativePath();
		if (parentPath == null) return null;
		return parentPath + Session.SERVER_SEPARATOR + getName();
	}
	
	protected boolean isDirty() throws CVSException {
		boolean dirty;
		byte[] syncBytes = getSyncBytes();
		if (syncBytes == null) {
			dirty = exists();
		} else {
			// isMerged() must be called because when a file is updated and merged by the cvs server the timestamps
			// are equal. Merged files should however be reported as dirty because the user should take action and commit
			// or review the merged contents.
			if(ResourceSyncInfo.isAddition(syncBytes) || ResourceSyncInfo.isMerge(syncBytes) || !exists()) {
				dirty = true;
			} else {
				// TODO: non-optimal as ResourceSyncInfo is created each time
				ResourceSyncInfo info = new ResourceSyncInfo(syncBytes);
				dirty = !getTimeStamp().equals(info.getTimeStamp());
			}
		}
		return dirty;
	}

}






/*******************************************************************************
 * Copyright (c) 2000, 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.team.internal.ccvs.core.resources;

import java.io.File;
import java.util.ArrayList;
import java.util.List;

import org.eclipse.core.filesystem.*;
import org.eclipse.core.filesystem.URIUtil;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
import org.eclipse.osgi.util.NLS;
import org.eclipse.team.core.RepositoryProvider;
import org.eclipse.team.internal.ccvs.core.*;
import org.eclipse.team.internal.ccvs.core.client.Session;
import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;
import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
import org.eclipse.team.internal.ccvs.core.util.Util;

/**
 * Implements the ICVSFolder interface on top of an 
 * instance of the ICVSFolder interface
 * 
 * @see ICVSFolder
 */
class FileSystemFolder extends FileSystemResource implements ICVSFolder {

	protected FileSystemFolder(IPath resource, RepositoryProvider repositoryProvider) {
		super(resource, repositoryProvider);		
	}
	
	/**
	 * @see ICVSFolder#members(int)
	 */
	public ICVSResource[] members(int flags) throws CVSException {		
		final List result = new ArrayList();
		File resources[] = resource.toFile().listFiles();
		boolean includeFiles = (((flags & FILE_MEMBERS) != 0) || ((flags & (FILE_MEMBERS | FOLDER_MEMBERS)) == 0));
		boolean includeFolders = (((flags & FOLDER_MEMBERS) != 0) || ((flags & (FILE_MEMBERS | FOLDER_MEMBERS)) == 0));
		boolean includeManaged = (((flags & MANAGED_MEMBERS) != 0) || ((flags & (MANAGED_MEMBERS | UNMANAGED_MEMBERS | IGNORED_MEMBERS)) == 0));
		boolean includeUnmanaged = (((flags & UNMANAGED_MEMBERS) != 0) || ((flags & (MANAGED_MEMBERS | UNMANAGED_MEMBERS | IGNORED_MEMBERS)) == 0));
		boolean includeIgnored = ((flags & IGNORED_MEMBERS) != 0);
		boolean includeExisting = (((flags & EXISTING_MEMBERS) != 0) || ((flags & (EXISTING_MEMBERS | PHANTOM_MEMBERS)) == 0));
		boolean includePhantoms = (((flags & PHANTOM_MEMBERS) != 0) || ((flags & (EXISTING_MEMBERS | PHANTOM_MEMBERS)) == 0));
		for (int i = 0; i < resources.length; i++) {
			File resource = resources[i];
            if ((includeFiles && resource.isFile()) 
					|| (includeFolders && resource.isDirectory())) {
                boolean exists = resource.exists();
                if ((includeExisting && exists) || (includePhantoms && !exists)) {
                    ICVSResource cvsResource = CVSFileSystemRoot.getCVSResourceFor(new Path(resource.getAbsolutePath()), repositoryProvider);
                    boolean includeResource = false;
                    if ((includeManaged && includeUnmanaged && includeIgnored)) {
                        includeResource = true;
                    } else {
        				boolean isManaged = cvsResource.isManaged();
                        if (isManaged && includeManaged) {
                            includeResource = true;
                        } else if (exists) {
            				boolean isIgnored = cvsResource.isIgnored();
                            if (isIgnored && includeIgnored) {
                                includeResource = true;
                            } else if (! isManaged && ! isIgnored && includeUnmanaged) {
                                includeResource = true;
            				}
                        }
                    }
                    if (includeResource) {
                        result.add(cvsResource);
                    }
                }
			}		
		}	
		return (ICVSResource[]) result.toArray(new ICVSResource[result.size()]);
	}

	public boolean isManaged() throws CVSException {
		boolean result = super.isManaged();
		if (!result) {
			FolderSyncInfo info = getFolderSyncInfo();
			if (info != null) // returns true is this is the root of the file system CVS repository
				result = info.getRepository().equals(resource.lastSegment());  
		}
		return result;
	}

	/**
	 * @see ICVSFolder#createFolder(String)
	 */
	public ICVSFolder getFolder(String name) throws CVSException {
		if ((CURRENT_LOCAL_FOLDER.equals(name)) || ((CURRENT_LOCAL_FOLDER + SEPARATOR).equals(name)))
			return this;
		IPath folderLocation = resource.append(name);
		IProject project = repositoryProvider.getProject();
		if (project != null) {
			IContainer[]folders = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocationURI(URIUtil.toURI(folderLocation));
			if (folders.length > 0) {
				for (int i = 0; i < folders.length; i++) {
					if (folders[i].getProject().equals(project))
						return new EclipseFolder(folders[i]);
				}
			}
		}
		return new FileSystemFolder(folderLocation, repositoryProvider);
	}

	/**
	 * @see ICVSFolder#createFile(String)
	 */
	public ICVSFile getFile(String name) throws CVSException {
		IPath fileLocation = resource.append(name);
		IProject project = repositoryProvider.getProject();
		if (project != null) {
			IFile[]files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(URIUtil.toURI(fileLocation));
			if (files.length > 0) {
				for (int i = 0; i < files.length; i++) {
					if (files[i].exists() && files[i].getProject().equals(project))
						return new EclipseFile(files[i]);
				}
			}
		}
		return new FileSystemFile(fileLocation, repositoryProvider);
	}

	/**
	 * @see ICVSFolder#mkdir()
	 */
	public void mkdir() throws CVSException {
		resource.toFile().mkdir();
		// EclipseSynchronizer.getInstance().created(resource);;
	}
		
	/**
	 * @see ICVSResource#isFolder()
	 */
	public boolean isFolder() {
		return true;
	}
		
	/**
	 * @see ICVSFolder#acceptChildren(ICVSResourceVisitor)
	 */
	public void acceptChildren(ICVSResourceVisitor visitor) throws CVSException {
		
		// Visit files and then folders
		ICVSResource[] subFiles = members(FILE_MEMBERS);
		for (int i=0; i<subFiles.length; i++) {
			subFiles[i].accept(visitor);
		}
		ICVSResource[] subFolders = members(FOLDER_MEMBERS);
		for (int i=0; i<subFolders.length; i++) {
			subFolders[i].accept(visitor);
		}
	}

	/**
	 * @see ICVSResource#accept(ICVSResourceVisitor)
	 */
	public void accept(ICVSResourceVisitor visitor) throws CVSException {
		visitor.visitFolder(this);
	}
	
	/**
	 * @see ICVSResource#accept(ICVSResourceVisitor, boolean)
	 */
	public void accept(ICVSResourceVisitor visitor, boolean recurse) throws CVSException {
		visitor.visitFolder(this);
		ICVSResource[] resources;
		if (recurse) {
			resources = members(ICVSFolder.ALL_MEMBERS);
		} else {
			resources = members(ICVSFolder.FILE_MEMBERS);
		}
		for (int i = 0; i < resources.length; i++) {
			resources[i].accept(visitor, recurse);
		}
	}

	/**
	 * @see ICVSResource#getRemoteLocation(ICVSFolder)
	 */
	public String getRemoteLocation(ICVSFolder stopSearching) throws CVSException {
				
		if (getFolderSyncInfo() != null) {
			return getFolderSyncInfo().getRemoteLocation();
		}			

		ICVSFolder parent = getParent();
		if(parent!=null && !equals(stopSearching)) {
			String parentLocation;
			parentLocation = parent.getRemoteLocation(stopSearching);
			if (parentLocation!=null) {
				return parentLocation + SEPARATOR + getName();
			}		
		}
		return null;
	}

	/*
	 * @see ICVSFolder#getFolderInfo()
	 */
	public FolderSyncInfo getFolderSyncInfo() throws CVSException {
		return EclipseSynchronizer.getInstance().getFolderSync(resource);
	}

	/*
	 * @see ICVSFolder#setFolderInfo(FolderSyncInfo)
	 */
	public void setFolderSyncInfo(final FolderSyncInfo folderInfo) throws CVSException {
		// ignore folder sync on the root (i.e. CVSROOT/config/TopLevelAdmin=yes but we just ignore it)
		if (resource.isRoot()) return;
		run(new ICVSRunnable() {
			public void run(IProgressMonitor monitor) throws CVSException {
				EclipseSynchronizer synchronizer = EclipseSynchronizer.getInstance();
				IResource workspaceResource = getIResource();
				if (workspaceResource != null)
					synchronizer.setFolderSync((IContainer)workspaceResource, folderInfo);
				else
					synchronizer.setFolderSync(resource, folderInfo);
				// the server won't add directories as sync info, therefore it must be done when
				// a directory is shared with the repository.
				byte[] newSyncBytes = new ResourceSyncInfo(getName()).getBytes();
				byte[] oldSyncBytes = getSyncBytes();
				// only set the bytes if the new differs from the old.
				// this avoids unnecessary saving of sync files
				if (oldSyncBytes == null || ! Util.equals(newSyncBytes, oldSyncBytes))
					setSyncBytes(newSyncBytes);
			}
		}, null);

	}

	/*
	 * @see ICVSFolder#isCVSFolder()
	 */
	public boolean isCVSFolder() throws CVSException {
		return EclipseSynchronizer.getInstance().getFolderSync(resource) != null;
	}

	/*
	 * @see ICVSResource#unmanage()
	 */
	public void unmanage(IProgressMonitor monitor) throws CVSException {
		run(new ICVSRunnable() {
			public void run(IProgressMonitor monitor) throws CVSException {
				monitor = Policy.monitorFor(monitor);
				monitor.beginTask(null, 100);
				recursiveUnmanage(resource.toFile(), Policy.subMonitorFor(monitor, 99));
				FileSystemFolder.super.unmanage(Policy.subMonitorFor(monitor, 1));
				monitor.done();	
			}
		}, Policy.subMonitorFor(monitor, 99));
	}
	
	/* private */ static void recursiveUnmanage(File container, IProgressMonitor monitor) {
		try {
			monitor.beginTask(null, 10);
			monitor.subTask(NLS.bind(CVSMessages.EclipseFolder_0, new String[] {container.getAbsolutePath()}));
	
			File[] members = container.listFiles();
			for (int i = 0; i < members.length; i++) {
				monitor.worked(1);
				File resource = members[i];
				if (resource.isFile()) {
					if (!resource.canWrite()) {
						try {
							IFileStore fileStore = EFS.getStore(resource.toURI());
							if (fileStore != null) {
								IFileInfo fileInfo = fileStore.fetchInfo();
								if (fileInfo != null)
									fileInfo.setAttribute(EFS.ATTRIBUTE_READ_ONLY, false);
							}
						} catch (CoreException e) {
							CVSException.wrapException(e);
						}
					}
                } else {
					recursiveUnmanage(resource, monitor);
				}
			}
		} finally {
			monitor.done();
		}
	}
	
	/*
	 * @see ICVSResource#isIgnored()
	 */
	public boolean isIgnored() throws CVSException {
		if(isCVSFolder()) {
			return false;
		}		
		return super.isIgnored();
	}
	
	/*
	 * @see ICVSFolder#getChild(String)
	 */
	public ICVSResource getChild(String namedPath) throws CVSException {
	    if (namedPath.equals(Session.CURRENT_LOCAL_FOLDER)) {
	        return this;
	    }
	    IPath newPath = resource.append(namedPath);
		if(newPath.toFile().isFile())
			return getFile(namedPath);
		else
			return new FileSystemFolder(newPath, repositoryProvider);
	}
	
	/**
	 * @see ICVSFolder#fetchChildren(IProgressMonitor)
	 */
	public ICVSResource[] fetchChildren(IProgressMonitor monitor) throws CVSException {
		return members(FILE_MEMBERS | FOLDER_MEMBERS);
	}
	/**
	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#delete()
	 */
	public void delete() throws CVSException {
		if (!exists()) return;
		resource.toFile().delete();
	}
	
	/**
	 * Assumption this is only called from decorator and isIgnored() is purposely
	 * omitted here for performance reasons. 
	 */
	public boolean isModified(IProgressMonitor monitor) throws CVSException {
		return false;
	}
	
	public void handleModification(boolean forAddition) throws CVSException {
		// For non-additions, we are only interested in sync info changes
		if (isIgnored() || !forAddition) return;

		// the folder is an addition.
		FolderSyncInfo info = getFolderSyncInfo();
		// if the folder has sync info, it was handled is setFolderInfo
		// otherwise, flush the ancestors to recalculate
		if (info == null) {
			EclipseSynchronizer.getInstance().setDirtyIndicator(getIResource(), true);
		}
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#getRepositoryRelativePath()
	 */
	public String getRepositoryRelativePath() throws CVSException {
		FolderSyncInfo info = getFolderSyncInfo();
		if (info == null) return null;
		// The REPOSITORY property of the folder info is the repository relative path
		return info.getRepository();
	}
}




/*******************************************************************************
 * Copyright (c) 2000, 2007 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.team.internal.ccvs.core.resources;


import java.net.URI;

import org.eclipse.core.filesystem.URIUtil;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
import org.eclipse.team.core.RepositoryProvider;
import org.eclipse.team.internal.ccvs.core.*;
import org.eclipse.team.internal.ccvs.core.client.Session;
import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;
import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
import org.eclipse.team.internal.ccvs.core.util.Util;


/**
 * Represents handles to CVS resource on the local file system. Synchronization
 * information is taken from the CVS sub directories. 
 * 
 * @see LocalFolder
 * @see LocalFile
 */
abstract class FileSystemResource implements ICVSResource, Comparable {

	// The separator that must be used when creating CVS resource paths. Never use
	 // the platform default separator since it is not compatible with CVS resources.
	protected static final String SEPARATOR = Session.SERVER_SEPARATOR;
	protected static final String CURRENT_LOCAL_FOLDER = Session.CURRENT_LOCAL_FOLDER;
		
	/*
	 * The local resource represented by this handle
	 */
	IPath resource;
	IResource cachedResource = null;
	boolean cachedResourceInitialized = false;
	RepositoryProvider repositoryProvider;
	
	public FileSystemResource(IPath resource,
			RepositoryProvider repositoryProvider) {
		this.resource = resource;
		this.repositoryProvider = repositoryProvider;
	}

	/*
	 * Get the extention of the path of resource relative to the path of root
	 * 
	 * @throws CVSException if root is not a root-folder of resource
	 */
	public String getRelativePath(ICVSFolder root) throws CVSException {
		try {
			String result;
			result = Util.getRelativePath(root.getLocation(), getLocation());
			if (result.length() == 0) return CURRENT_LOCAL_FOLDER;
			return result;	
		} catch (ClassCastException e) {
			IStatus status = new CVSStatus(IStatus.ERROR, CVSStatus.ERROR, CVSMessages.EclipseResource_invalidResourceClass, e, root);
			throw new CVSException(status); 
		}
	}

	/*
	 * @see ICVSResource#exists()
	 */
	public boolean exists() {
		return resource.toFile().exists();
	}

	/*
	 * Returns the parent folder of this resource of <code>null</code> if resource
	 * the resource.
	 * 
	 * @see ICVSResource#getParent()
	 */
	public ICVSFolder getParent() {
		if (resource.isRoot())
			return null;
		IPath newResource = resource.removeLastSegments(1);
		return new FileSystemFolder(newResource, repositoryProvider);
	}

	/*
	 * @see ICVSResource#getName()
	 */
	public String getName() {
		return resource.lastSegment();
	}

	/*
	 * @see ICVSResource#isIgnored()
	 */
	public boolean isIgnored() throws CVSException {
		// a managed resource is never ignored
		if(isManaged() || resource.isRoot()) {
			return false;
		}

		// always ignore CVS
		String name = getName();
		if (name.equals("CVS")) return true; //$NON-NLS-1$

		/* do something with the ignore files
		// check ignore patterns from the .cvsignore file.
		if(EclipseSynchronizer.getInstance().isIgnored(resource)) {
			return true;
		}
		*/

		// check the parent, if the parent is ignored or mapped to CVSROOT/Emptydir
		// then this resource is ignored also
		ICVSFolder parent = getParent();
		if(parent==null) return false;
		if (parent.isIgnored()) return true;
		FolderSyncInfo info = parent.getFolderSyncInfo();
		if (info == null) return false;
		return info.isVirtualDirectory();
	}
	
	/*
	 * @see ICVSResource#setIgnoredAs(String)
	 */
	public void setIgnoredAs(final String pattern) throws CVSException {
		Assert.isTrue(false);
	}

	/*
	 * @see ICVSResource#isManaged()
	 */
	public boolean isManaged() throws CVSException {
		return isManaged(getSyncBytes());
	}
	
	/*
	 * Helper method that captures the sematics of isManaged given a ResourceSyncInfo
	 */
	public boolean isManaged(byte[] syncBytes) {
		return syncBytes != null;
	}
	
	/**
	 * Two ManagedResources are equal, if there cvsResources are
	 * equal (and that is, if the point to the same file)
	 */
	public boolean equals(Object obj) {
		
		if (!(obj instanceof ICVSResource)) {
			return false;
		} else {
			return getLocation().equals(((ICVSResource) obj).getLocation());
		}
	}
			
	/*
	 * @see ICVSResource#getPath()
	 */
	public String getPath() {
		return resource.toString();
	}	
	
	public IPath getLocation() {
		return resource;
	}	
	
	/*
	 * @see ICVSResource#isFolder()
	 */
	public boolean isFolder() {
		return resource.toFile().isDirectory();
	}
	
	/*
	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#getSyncBytes()
	 */
	public byte[] getSyncBytes() throws CVSException {
		return EclipseSynchronizer.getInstance().getSyncBytes(resource);
	}
	
	/*
	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#setSyncBytes(byte[])
	 */
	public void setSyncBytes(byte[] syncBytes) throws CVSException {
		if (getParent().isCVSFolder()) {
			IResource workspaceResource = getIResource();
			if (workspaceResource != null)
				EclipseSynchronizer.getInstance().setSyncBytes(workspaceResource, syncBytes);
			else
				EclipseSynchronizer.getInstance().setSyncBytes(resource, syncBytes);
		}
	}
	
	/*
	 * @see ICVSResource#getSyncInfo()
	 */
	public ResourceSyncInfo getSyncInfo() throws CVSException {
		return EclipseSynchronizer.getInstance().getResourceSync(resource);
	}
	
	/*
	 * Implement the hashcode on the underlying strings, like it is done in the equals.
	 */
	public int hashCode() {
		return getPath().hashCode();
	}	
	
	/*
	 * Give the pathname back
	 */
	public String toString() {
		return getPath();
	}
	
	/*
	 * @see ICVSResource#unmanage()
	 */
	public void unmanage(IProgressMonitor monitor) throws CVSException {
		EclipseSynchronizer.getInstance().deleteResourceSync(resource);
	}
	
	/*
	 * @see Comparable#compareTo(Object)
	 */
	public int compareTo(Object arg0) {
		ICVSResource other = (ICVSResource)arg0;
		return getLocation().toString().compareTo(other.getLocation().toString());
	}

	/**
	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#getIResource()
	 */
	public IResource getIResource() {
		if (!cachedResourceInitialized) {
			cachedResourceInitialized = true;
			URI uri = URIUtil.toURI(resource);
			IFile files[] = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(uri);
			if (files.length > 0 && files[0].exists())
				cachedResource = files[0];
			else {
				IContainer containers[] = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocationURI(uri);
				if (containers.length > 0 && containers[0].exists())
					cachedResource = containers[0];
			}
		}
		return cachedResource;
	}

	/**
	 * Called by a resource change listener when a resource is changed or added. This allows
	 * CVS resources to adjust any internal state based on the change.
	 * 
	 * @param forAddition modification is an addition
	 * @throws CVSException
	 */
	public abstract void handleModification(boolean forAddition) throws CVSException;
	
	public void run(final ICVSRunnable job, IProgressMonitor monitor) throws CVSException {
		final IProject project = repositoryProvider.getProject();
		if (project != null) {
			final CVSException[] error = new CVSException[1];
			try {
				// Do not use a scheduling rule in the workspace run since one
				// will be obtained by the EclipseSynchronizer
				ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
					public void run(IProgressMonitor monitor) throws CoreException {
						try {
							EclipseSynchronizer.getInstance().run(project, job, monitor);
						} catch(CVSException e) {
							error[0] = e; 
						}
					}
				}, null /* no rule */, 0, monitor);
			} catch(CoreException e) {
				throw CVSException.wrapException(e);
			}
			if(error[0]!=null) {
				throw error[0];
			}
		}
		else {
			final CVSException[] error = new CVSException[1];
			try {
				job.run(monitor);
			} catch(CVSException e) {
				error[0] = e; 
			}
			if(error[0]!=null) {
				throw error[0];
			}
		}
	}

	public RepositoryProvider getProvider() {
		return repositoryProvider;
	}
}

Lines 18-23 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java (+5 lines)
18	import org.eclipse.core.resources.IFile;	18	import org.eclipse.core.resources.IFile;
19	import org.eclipse.core.resources.IResource;	19	import org.eclipse.core.resources.IResource;
20	import org.eclipse.core.runtime.*;	20	import org.eclipse.core.runtime.*;
		21	import org.eclipse.team.core.RepositoryProvider;
21	import org.eclipse.team.core.TeamException;	22	import org.eclipse.team.core.TeamException;
22	import org.eclipse.team.core.history.IFileRevision;	23	import org.eclipse.team.core.history.IFileRevision;
23	import org.eclipse.team.core.variants.CachedResourceVariant;	24	import org.eclipse.team.core.variants.CachedResourceVariant;
Lines 687-690 Link Here
687	ResourceSyncInfo info = getSyncInfo();	688	ResourceSyncInfo info = getSyncInfo();
688	return new CVSURI(getRepository(), new Path(getRepositoryRelativePath()), info.getTag(), info.getRevision());	689	return new CVSURI(getRepository(), new Path(getRepositoryRelativePath()), info.getTag(), info.getRevision());
689	}	690	}
		691
		692	public RepositoryProvider getProvider() {
		693	return null;
		694	}
690	}	695	}

Lines 17-22 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java (+9 lines)
17	import org.eclipse.core.resources.IResource;	17	import org.eclipse.core.resources.IResource;
18	import org.eclipse.core.runtime.*;	18	import org.eclipse.core.runtime.*;
19	import org.eclipse.osgi.util.NLS;	19	import org.eclipse.osgi.util.NLS;
		20	import org.eclipse.team.core.RepositoryProvider;
20	import org.eclipse.team.core.TeamException;	21	import org.eclipse.team.core.TeamException;
21	import org.eclipse.team.internal.ccvs.core.*;	22	import org.eclipse.team.internal.ccvs.core.*;
22	import org.eclipse.team.internal.ccvs.core.client.*;	23	import org.eclipse.team.internal.ccvs.core.client.*;
Lines 594-598 Link Here
594	protected void fetchContents(IProgressMonitor monitor) throws TeamException {	595	protected void fetchContents(IProgressMonitor monitor) throws TeamException {
595	// This should not get called for folders	596	// This should not get called for folders
596	}	597	}
		598
		599	public RepositoryProvider getProvider() {
		600	return null;
		601	}
		602
		603	public IPath getLocation() {
		604	return null;
		605	}
597		606
598	}	607	}

Lines 226-229 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java (+4 lines)
226	public byte[] asBytes() {	226	public byte[] asBytes() {
227	return getSyncBytes();	227	return getSyncBytes();
228	}	228	}
		229
		230	public IPath getLocation() {
		231	return null;
		232	}
229	}	233	}

Lines 155-166 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSResourceVariantTree.java (+22 lines)
155		155
156	private byte[] getParentBytes(IResource resource) throws TeamException {	156	private byte[] getParentBytes(IResource resource) throws TeamException {
157	IContainer parent = resource.getParent();	157	IContainer parent = resource.getParent();
		158	IPath parentLocation = resource.getLocation().removeLastSegments(1);
		159	if (parentLocation.equals(parent.getLocation())) {
158	byte[] bytes = getByteStore().getBytes(parent);	160	byte[] bytes = getByteStore().getBytes(parent);
159	if (bytes == null ) {	161	if (bytes == null ) {
160	bytes = getBaseBytes(parent, getTag(resource));	162	bytes = getBaseBytes(parent, getTag(resource));
161	}	163	}
162	return bytes;	164	return bytes;
163	}	165	}
		166	else
		167	return getBaseBytes(parentLocation, getTag(resource), RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId()));
		168	}
164		169
165	private byte[] getBaseBytes(IContainer parent, CVSTag tag) throws CVSException {	170	private byte[] getBaseBytes(IContainer parent, CVSTag tag) throws CVSException {
166	byte[] bytes;	171	byte[] bytes;
Lines 179-184 Link Here
179	return bytes;	184	return bytes;
180	}	185	}
181		186
		187	private byte[] getBaseBytes(IPath parent, CVSTag tag, RepositoryProvider repositoryProvider) throws CVSException {
		188	byte[] bytes;
		189	// Look locally for the folder bytes
		190	ICVSFolder local = CVSFileSystemRoot.getCVSFolderFor(parent, repositoryProvider);
		191	FolderSyncInfo info = local.getFolderSyncInfo();
		192	if (info == null) {
		193	bytes = null;
		194	} else {
		195	// Use the folder sync from the workspace and the tag from the store
		196	MutableFolderSyncInfo newInfo = info.cloneMutable();
		197	newInfo.setTag(tag);
		198	newInfo.setStatic(false);
		199	bytes = newInfo.getBytes();
		200	}
		201	return bytes;
		202	}
		203
182	private boolean hasLocalSyncInfo(IContainer folder) {	204	private boolean hasLocalSyncInfo(IContainer folder) {
183	ICVSFolder local = CVSWorkspaceRoot.getCVSFolderFor(folder);	205	ICVSFolder local = CVSWorkspaceRoot.getCVSFolderFor(folder);
184	try {	206	try {

Lines 15-21 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/syncinfo/NotifyInfo.java (-2 / +2 lines)
15	import java.text.ParseException;	15	import java.text.ParseException;
16	import java.util.Date;	16	import java.util.Date;
17		17
18	import org.eclipse.core.resources.IContainer;	18	import org.eclipse.core.runtime.IPath;
19	import org.eclipse.core.runtime.IStatus;	19	import org.eclipse.core.runtime.IStatus;
20	import org.eclipse.osgi.util.NLS;	20	import org.eclipse.osgi.util.NLS;
21	import org.eclipse.team.internal.ccvs.core.*;	21	import org.eclipse.team.internal.ccvs.core.*;
Lines 55-61 Link Here
55	* Constructor for a line from the CVS/Notify file	55	* Constructor for a line from the CVS/Notify file
56	* @param line	56	* @param line
57	*/	57	*/
58	public NotifyInfo(IContainer parent, String line) throws CVSException {	58	public NotifyInfo(IPath parent, String line) throws CVSException {
59	String[] strings = Util.parseIntoSubstrings(line, ResourceSyncInfo.SEPARATOR);	59	String[] strings = Util.parseIntoSubstrings(line, ResourceSyncInfo.SEPARATOR);
60	if(strings.length != 4) {	60	if(strings.length != 4) {
61	IStatus status = new CVSStatus(IStatus.ERROR, CVSStatus.ERROR_LINE, NLS.bind(CVSMessages.NotifyInfo_MalformedLine, new String[] { line }), parent);	61	IStatus status = new CVSStatus(IStatus.ERROR, CVSStatus.ERROR_LINE, NLS.bind(CVSMessages.NotifyInfo_MalformedLine, new String[] { line }), parent);




import java.net.URI;
import java.util.*;

import org.eclipse.core.filesystem.*;
import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
import org.eclipse.osgi.util.NLS;

        	return null;
        }
        
		// process Entries file contents
		String[] entries = readLines(cvsSubDir.getFile(ENTRIES));
		String[] entriesLog = readLines(cvsSubDir.getFile(ENTRIES_LOG));
		return readAllResourceSync(parent.getFullPath().toOSString(), entries, entriesLog);
	}
	
	/**
	 * Reads the CVS/Entries, CVS/Entries.log and CVS/Permissions files from the
	 * specified folder and returns ResourceSyncInfo instances for the data stored therein.
	 * If the folder does not have a CVS subdirectory then <code>null</code> is returned.
	 */
	private static byte[][] readAllResourceSync(String userPath, String[] entries, String[] entriesLog) throws CVSException {
		if (Policy.DEBUG_METAFILE_CHANGES) {
			System.out.println("Reading Entries file for " + userPath); //$NON-NLS-1$
		}

		// process Entries file contents
		String[] entries = readLines(cvsSubDir.getFile(ENTRIES));
		if (entries == null) return null;
		Map infos = new TreeMap();
		for (int i = 0; i < entries.length; i++) {

				} catch (CVSException e) {
					// There was a problem parsing the entry line.
					// Log the problem and skip the entry
					CVSProviderPlugin.log(new CVSStatus(IStatus.ERROR, NLS.bind(CVSMessages.SyncFileWriter_0, new String[] { userPath }), e)); 
				}			
			}
		}
		
		// process Entries.log file contents
		String[] entriesLog = readLines(cvsSubDir.getFile(ENTRIES_LOG));
		if (entriesLog != null) {
			for (int i = 0; i < entriesLog.length; i++) {
				String line = entriesLog[i];

		return result;
	}
	
	public static byte[][] readAllResourceSync(IPath parent) throws CVSException {
        IPath cvsSubDir = getCVSSubdirectory(parent);
        
        if (!cvsSubDir.toFile().exists()){
        	return null;
        }
        
		// process Entries file contents
		String[] entries = readLines(cvsSubDir.append(ENTRIES));
		// process Entries.log file contents
		String[] entriesLog = readLines(cvsSubDir.append(ENTRIES_LOG));
		return readAllResourceSync(parent.toOSString(), entries, entriesLog);
	}

	private static boolean folderExists(IFolder cvsSubDir) throws CVSException {
	    try {
	    	URI uri = cvsSubDir.getLocationURI();

		return false;
	}

	private static boolean folderExists(IPath cvsSubDir) throws CVSException {
		return cvsSubDir.toFile().exists();
	}

	public static void writeAllResourceSync(IContainer parent, byte[][] infos) throws CVSException {
		try {
			if (Policy.DEBUG_METAFILE_CHANGES) {

			throw CVSException.wrapException(e);
		}
	}

	public static void writeAllResourceSync(IPath parent, byte[][] infos) throws CVSException {
		try {
			if (Policy.DEBUG_METAFILE_CHANGES) {
				System.out.println("Writing Entries file for folder " + parent.toOSString()); //$NON-NLS-1$
			}
			IPath cvsSubDir = getCVSSubdirectory(parent);
			if (!cvsSubDir.toFile().exists()) {
				cvsSubDir.toFile().mkdir();
			}

			// format file contents
			String[] entries = new String[infos.length];
			for (int i = 0; i < infos.length; i++) {
				byte[] info = infos[i];
				entries[i] = new String(info);
			}

			// write Entries
			writeLines(cvsSubDir.append(ENTRIES), entries);

			// delete Entries.log
			cvsSubDir.append(ENTRIES_LOG).toFile().delete();
		} catch(IOException e) {
			throw CVSException.wrapException(e);
		}
	}

	/**
	 * Reads the CVS/Root, CVS/Repository, CVS/Tag, and CVS/Entries.static files from
	 * the specified folder and returns a FolderSyncInfo instance for the data stored therein.

	}
	
	/**
	 * Reads the CVS/Root, CVS/Repository, CVS/Tag, and CVS/Entries.static files from
	 * the specified folder and returns a FolderSyncInfo instance for the data stored therein.
	 * If the folder does not have a CVS subdirectory then <code>null</code> is returned.
	 */
	public static FolderSyncInfo readFolderSync(IPath folder) throws CVSException {
		IPath cvsSubDir = getCVSSubdirectory(folder);
		
        if (!folderExists(cvsSubDir)){
        	return null;
        }

        if (Policy.DEBUG_METAFILE_CHANGES) {
			System.out.println("Reading Root/Repository files for " + folder.toOSString()); //$NON-NLS-1$
		}
		
		// read CVS/Root
		String root = readFirstLine(cvsSubDir.append(ROOT));
		if (root == null) return null;
		
		// read CVS/Repository
		String repository = readFirstLine(cvsSubDir.append(REPOSITORY));
		if (repository == null) return null;
		
		// read CVS/Tag
		String tag = readFirstLine(cvsSubDir.append(TAG));
		if (Policy.DEBUG_METAFILE_CHANGES && tag != null) {
			System.out.println("Reading Tag file for " + folder.toOSString()); //$NON-NLS-1$
		}
		CVSTag cvsTag = (tag != null) ? new CVSEntryLineTag(tag) : null;

		// read Entries.Static
		String staticDir = readFirstLine(cvsSubDir.append(STATIC));
		if (Policy.DEBUG_METAFILE_CHANGES && staticDir != null) {
			System.out.println("Reading Static file for " + folder.toOSString()); //$NON-NLS-1$
		}
		boolean isStatic = (staticDir != null);
		
		// return folder sync
		return new FolderSyncInfo(repository, root, cvsTag, isStatic);		
	}

	/**
	 * Writes the CVS/Root, CVS/Repository, CVS/Tag, and CVS/Entries.static files to the
	 * specified folder using the data contained in the specified FolderSyncInfo instance.
	 */

	}

	/**
	 * Writes the CVS/Root, CVS/Repository, CVS/Tag, and CVS/Entries.static files to the
	 * specified folder using the data contained in the specified FolderSyncInfo instance.
	 */
	public static void writeFolderSync(IPath folder, FolderSyncInfo info) throws CVSException {
		try {
			if (Policy.DEBUG_METAFILE_CHANGES) {
				System.out.println("Writing Root/Respository files for " + folder.toOSString()); //$NON-NLS-1$
			}
			IPath cvsSubDir = createCVSSubdirectory(folder);
	
			// write CVS/Root
			writeLines(cvsSubDir.append(ROOT), new String[] {info.getRoot()});
			
			// write CVS/Repository
			writeLines(cvsSubDir.append(REPOSITORY), new String[] {info.getRepository()});
			
			// write CVS/Tag
			IPath tagFile = cvsSubDir.append(TAG);
			if (info.getTag() != null) {
				if (Policy.DEBUG_METAFILE_CHANGES) {
					System.out.println("Writing Tag file for " + folder.toOSString()); //$NON-NLS-1$
				}
				writeLines(tagFile, new String[] {info.getTag().toEntryLineFormat(false)});
			} else {
				if(tagFile.toFile().exists()) {
					if (Policy.DEBUG_METAFILE_CHANGES) {
						System.out.println("Deleting Tag file for " + folder.toOSString()); //$NON-NLS-1$
					}
					tagFile.toFile().delete();
				}
			}
			
			// write CVS/Entries.Static
			IPath staticFile = cvsSubDir.append(STATIC);
			if(info.getIsStatic()) {
				// the existance of the file is all that matters
				if (Policy.DEBUG_METAFILE_CHANGES) {
					System.out.println("Writing Static file for " + folder.toOSString()); //$NON-NLS-1$
				}
				writeLines(staticFile, new String[] {""}); //$NON-NLS-1$
			} else {
				if(staticFile.toFile().exists()) {
					if (Policy.DEBUG_METAFILE_CHANGES) {
						System.out.println("Deleting Static file for " + folder.toOSString()); //$NON-NLS-1$
					}
					staticFile.toFile().delete();
				}
			}
		} catch(CoreException e) {
			throw CVSException.wrapException(e);
		} catch (IOException e) {
			throw CVSException.wrapException(e);
		}
	}

	/**
	 * Returns all .cvsignore entries for the specified folder.
	 */
	public static String[] readCVSIgnoreEntries(IContainer folder) throws CVSException {

        	return null;
        }
        
		// process Notify file contents
		String[] entries = readLines(cvsSubDir.getFile(NOTIFY));
		return readAllNotifyInfo(parent.getFullPath(), entries);
	}

	/**
	 * Reads the CVS/Notify file from the specified folder and returns NotifyInfo instances 
	 * for the data stored therein. If the folder does not have a CVS subdirectory then <code>null</code> is returned.
	 */
	public static NotifyInfo[] readAllNotifyInfo(IPath parent) throws CVSException {
		IPath cvsSubDir = getCVSSubdirectory(parent);

        if (!folderExists(cvsSubDir)){
        	return null;
        }
        
		String[] entries = readLines(cvsSubDir.append(NOTIFY));
		return readAllNotifyInfo(parent, entries);
	}

	private static NotifyInfo[] readAllNotifyInfo(IPath path, String[] entries) throws CVSException {
		// process Notify file contents
		if (entries == null) return null;
		Map infos = new TreeMap();
		for (int i = 0; i < entries.length; i++) {
			String line = entries[i];
			if(!"".equals(line)) { //$NON-NLS-1$
				try {
                    NotifyInfo info = new NotifyInfo(path, line);
                    infos.put(info.getName(), info);
                } catch (CVSException e) {
                    // We couldn't parse the notify info

	}

	/**
	 * Writes the CVS/Notify file to the specified folder using the data contained in the 
	 * specified NotifyInfo instances. A CVS subdirectory must already exist (an exception 
	 * is thrown if it doesn't).
	 */
	public static void writeAllNotifyInfo(IPath parent, NotifyInfo[] infos) throws CVSException {
		// get the CVS directory
		IPath cvsSubDir = getCVSSubdirectory(parent);
		// write lines will throw an exception if the CVS directory does not exist
		
		if (infos.length == 0) {
			IPath notifyFile = cvsSubDir.append(NOTIFY);
			if(notifyFile.toFile().exists()) {
				notifyFile.toFile().delete();
			}
		} else {
			// format file contents
			String[] entries = new String[infos.length];
			for (int i = 0; i < infos.length; i++) {
				NotifyInfo info = infos[i];
				entries[i] = info.getNotifyLine();
			}
	
			// write Notify entries
			try {
				writeLines(cvsSubDir.append(NOTIFY), entries);
			} catch (IOException e) {
				throw CVSException.wrapException(e);
			}
		}
	}

	/**
	 * Reads the CVS/Baserev file from the specified folder and returns
	 * BaserevInfo instances for the data stored therein. If the folder does not
	 * have a CVS subdirectory then <code>null</code> is returned.

        
		// process Notify file contents
		String[] entries = readLines(cvsSubDir.getFile(BASEREV));
		return readAllBaserevInfo(entries);
	}

	/**
	 * Reads the CVS/Baserev file from the specified folder and returns
	 * BaserevInfo instances for the data stored therein. If the folder does not
	 * have a CVS subdirectory then <code>null</code> is returned.
	 */
	public static BaserevInfo[] readAllBaserevInfo(IPath parent) throws CVSException {
		IPath cvsSubDir = getCVSSubdirectory(parent);
        
        if (!folderExists(cvsSubDir)){
        	return null;
        }
        
		// process Notify file contents
		String[] entries = readLines(cvsSubDir.append(BASEREV));
		return readAllBaserevInfo(entries);
	}

	private static BaserevInfo[] readAllBaserevInfo(String[] entries)
			throws CVSException {
		if (entries == null) return null;
		Map infos = new TreeMap();
		for (int i = 0; i < entries.length; i++) {

		IFolder cvsSubDir = getCVSSubdirectory(parent);
		// write lines will throw an exception if the CVS directory does not exist

		String[] entries = formatBaserevInfo(infos);

		// write Notify entries
		writeLines(cvsSubDir.getFile(BASEREV), entries);
	}
				
	/**
	 * Writes the CVS/Baserev file to the specified folder using the data
	 * contained in the specified BaserevInfo instances. A CVS subdirectory must
	 * already exist (an exception is thrown if it doesn't).
	 */
	public static void writeAllBaserevInfo(IPath parent, BaserevInfo[] infos) throws CVSException {
		// get the CVS directory
		IPath cvsSubDir = getCVSSubdirectory(parent);
		// write lines will throw an exception if the CVS directory does not exist

		String[] entries = formatBaserevInfo(infos);

		// write Notify entries
		try {
			writeLines(cvsSubDir.append(BASEREV), entries);
		} catch (IOException e) {
			CVSException.wrapException(e);
		}
	}

	private static String[] formatBaserevInfo(BaserevInfo[] infos) {
		// format file contents
		String[] entries = new String[infos.length];
		for (int i = 0; i < infos.length; i++) {
			BaserevInfo info = infos[i];
			entries[i] = info.getEntryLine();
		}
		return entries;
		// write Notify entries
		writeLines(cvsSubDir.getFile(BASEREV), entries);
	}
				
	/**

	}
	
	/**
	 * Returns the CVS subdirectory for this folder.
	 */
	private static IPath getCVSSubdirectory(IPath folder) {
		return folder.append(CVS_DIRNAME);
	}

	/**
	 * Creates and makes team-private and returns a CVS subdirectory in this folder.
	 */
	private static IFolder createCVSSubdirectory(IContainer folder) throws CVSException {

		}
	}

	/**
	 * Creates and makes team-private and returns a CVS subdirectory in this folder.
	 */
	private static IPath createCVSSubdirectory(IPath folder) throws CVSException {
		final IPath cvsSubDir = getCVSSubdirectory(folder);
		if (! cvsSubDir.toFile().exists())
			cvsSubDir.toFile().mkdir();
		return cvsSubDir;
	}

	protected static boolean existsInFileSystem(IFolder cvsSubDir) {
		URI uri = cvsSubDir.getLocationURI();
		if (uri != null) {

	private static String readFirstLine(IFile file) throws CVSException {
		try {
			InputStream in = getInputStream(file);
			return readFirstLine(in);
		} catch (IOException e) {
			throw CVSException.wrapException(e);
		} catch (CoreException e) {
			// If the IFile doesn't exist or the underlying File doesn't exist,
			// just return null to indicate the absence of the file
			if (e.getStatus().getCode() == IResourceStatus.RESOURCE_NOT_FOUND
					|| e.getStatus().getCode() == IResourceStatus.FAILED_READ_LOCAL)
				return null;
			throw CVSException.wrapException(e);
		}
	}

	/*
	 * Reads the first line of the specified file.
	 * Returns null if the file does not exist, or the empty string if it is blank.
	 */
	private static String readFirstLine(IPath file) throws CVSException {
		try {
			if (!file.toFile().exists())
				return null;
			InputStream in = new FileInputStream(file.toFile());
			return readFirstLine(in);
		} catch (IOException e) {
			throw CVSException.wrapException(e);
		}
	}

	private static String readFirstLine(InputStream in) throws IOException {
			if (in != null) {
				BufferedReader reader = new BufferedReader(new InputStreamReader(in), 512);
				try {

				}
            }
            return null;
		} catch (IOException e) {
			throw CVSException.wrapException(e);
		} catch (CoreException e) {
			// If the IFile doesn't exist or the underlying File doesn't exist,
			// just return null to indicate the absence of the file
			if (e.getStatus().getCode() == IResourceStatus.RESOURCE_NOT_FOUND
					|| e.getStatus().getCode() == IResourceStatus.FAILED_READ_LOCAL)
				return null;
			throw CVSException.wrapException(e);
		}
	}

	private static InputStream getInputStream(IFile file) throws CoreException, FileNotFoundException {

	private static String[] readLines(IFile file) throws CVSException {
		try {
			InputStream in = getInputStream(file);
			return readLines(in);
		} catch (IOException e) {
			throw CVSException.wrapException(e);
		} catch (CoreException e) {
			// If the IFile doesn't exist or the underlying File doesn't exist,
			// just return null to indicate the absence of the file
			if (e.getStatus().getCode() == IResourceStatus.RESOURCE_NOT_FOUND
					|| e.getStatus().getCode() == IResourceStatus.FAILED_READ_LOCAL)
				return null;
			throw CVSException.wrapException(e);
		}
	}

	private static String[] readLines(InputStream in) throws IOException {
			if (in != null) {
				BufferedReader reader = new BufferedReader(new InputStreamReader(in), 512);
				List fileContentStore = new ArrayList();

				}
			}
			return null;
	}
	
	/*
	 * Reads all lines of the specified file.
	 * Returns null if the file does not exist.
	 */
	private static String[] readLines(IPath file) throws CVSException {
		try {
			if (!file.toFile().exists())
				return null;
			InputStream in = new FileInputStream(file.toFile());
			return readLines(in);
		} catch (IOException e) {
			throw CVSException.wrapException(e);
		}
	}

		}
	}
	
	/*
	 * Writes all lines to the specified file, using linefeed terminators for
	 * compatibility with other CVS clients.
	 */
	private static void writeLines(IPath file, final String[] contents) throws IOException, CVSException {
		ByteArrayOutputStream os = new ByteArrayOutputStream();
		writeLinesToStreamAndClose(os, contents);
		File javaFile = file.toFile();
		RandomAccessFile raFile = new RandomAccessFile(javaFile, "rw"); //$NON-NLS-1$
		raFile.write(os.toByteArray());
		raFile.setLength(os.toByteArray().length);
		raFile.close();
	}

	private static void writeLinesToStreamAndClose(OutputStream os, String[] contents) throws CVSException {
		byte[] lineEnd = getLineDelimiter();
		try {

		}
	}
	/**
	 * Method writeFileToBaseDirectory.
	 * 
	 * @param file
	 * @param info
	 */
	public static void writeFileToBaseDirectory(IPath file, IProgressMonitor monitor) throws CVSException {
		monitor = Policy.monitorFor(monitor);
		monitor.beginTask(null, 100);
		try {
			IPath baseFolder = getBaseDirectory(file);
			if (!baseFolder.toFile().exists()) {
				baseFolder.toFile().createNewFile();
			}
			IPath target = baseFolder.append(file.lastSegment());
			if (target.toFile().exists()) {
				// XXX Should ensure that we haven't already copied it
				// XXX write the revision to the CVS/Baserev file
				setReadOnly(target, false);
				target.toFile().delete();
			}
	        InputStream in = new FileInputStream(file.toFile());
	        OutputStream out = new FileOutputStream(target.toFile());
	    
	        // Transfer bytes from in to out
	        byte[] buf = new byte[1024];
	        int len;
	        while ((len = in.read(buf)) > 0) {
	            out.write(buf, 0, len);
	        }
	        in.close();
	        out.close();
	        target.toFile().setLastModified(file.toFile().lastModified());
		} catch (IOException e) {
			throw CVSException.wrapException(e);
		} finally {
			monitor.done();
		}
	}
	/**
	 * Method restoreFileFromBaseDirectory.
	 * @param file
	 * @param info

			monitor.done();
		}
	}
	/**
	 * Method restoreFileFromBaseDirectory.
	 * @param file
	 * @param info
	 * @param monitor
	 */
	public static void restoreFileFromBaseDirectory(IPath file, IProgressMonitor monitor) throws CVSException {
		monitor = Policy.monitorFor(monitor);
		monitor.beginTask(null, 100);
		try {
			IPath baseFolder = getBaseDirectory(file);
			IPath source = baseFolder.append(file.lastSegment());
			if (!source.toFile().exists()) {
				IStatus status = new CVSStatus(IStatus.ERROR, CVSStatus.ERROR, NLS.bind(CVSMessages.SyncFileWriter_baseNotAvailable, new String[] { file.toOSString() }), file);
				throw new CVSException(status); 
			}
			if (file.toFile().exists()) {
				file.toFile().delete();
			}
			// Make the source writable to avoid problems on some file systems (bug 109308)
			setReadOnly(source, false);
			// Copy the file so the timestamp is maintained
			source.toFile().renameTo(file.toFile());
		} catch (CoreException e) {
			throw CVSException.wrapException(e);
		} finally {
			monitor.done();
		}
	}

	private static void setReadOnly(IFile source, boolean readOnly) {
		ResourceAttributes attrs = source.getResourceAttributes();

		}
	}
	
	private static void setReadOnly(IPath source, boolean readOnly) {
		try {
			IFileStore fileStore = EFS.getStore(source.toFile().toURI());
			if (fileStore != null) {
				IFileInfo fileInfo = fileStore.fetchInfo();
				if (fileInfo != null)
					fileInfo.setAttribute(EFS.ATTRIBUTE_READ_ONLY, readOnly);
			}
		} catch (CoreException e) {
			CVSException.wrapException(e);
		}
	}

	/**
	 * Method deleteFileFromBaseDirectory.
	 * @param file

		}
	}

	/**
	 * Method deleteFileFromBaseDirectory.
	 * @param file
	 * @param monitor
	 */
	public static void deleteFileFromBaseDirectory(IPath file, IProgressMonitor monitor) throws CVSException {
		monitor = Policy.monitorFor(monitor);
		monitor.beginTask(null, 100);
		try {
			IPath baseFolder = getBaseDirectory(file);
			IPath source = baseFolder.append(file.lastSegment());
			if (source.toFile().exists()) {
				setReadOnly(source, false);
				source.toFile().delete();
			}
		} finally {
			monitor.done();
		}
	}

	private static IFolder getBaseDirectory(IFile file) {
		IContainer cvsFolder = getCVSSubdirectory(file.getParent());
		IFolder baseFolder = cvsFolder.getFolder(new Path(BASE_DIRNAME));
		return baseFolder;
	}
	
	private static IPath getBaseDirectory(IPath file) {
		IPath cvsFolder = getCVSSubdirectory(file.removeLastSegments(1));
		IPath baseFolder = cvsFolder.append(new Path(BASE_DIRNAME));
		return baseFolder;
	}

	/**
	 * Return a handle to the CVS/Template file for the given folder
	 * @param folder

		return baseFile.exists();
	}
	
	/**
	 * Method isEdited.
	 * @param resource
	 * @return boolean
	 */
	public static boolean isEdited(IPath file) {
		IPath baseFolder = getBaseDirectory(file);
		IPath baseFile = baseFolder.append(file.lastSegment());
		return baseFile.toFile().exists();
	}

	private static byte[] getLineDelimiter() {
		if (CVSProviderPlugin.getPlugin().isUsePlatformLineend()) {
			String property = System.getProperty("line.separator"); //$NON-NLS-1$




		return result;
	}
	
	/*
	 * *
	 * Get the extention of the path of resource
	 * relative to the path of root
	 * 
	 * @throws CVSException if root is not a root-folder of resource
	 */
	public static String getRelativePath(IPath rootName, IPath resourceName) 
		throws CVSException {

		if (!rootName.isPrefixOf(resourceName)) {
			int count = rootName.matchingFirstSegments(resourceName);
			if (count == 0)
				throw new CVSException(CVSMessages.Util_Internal_error__resource_does_not_start_with_root_3); 
			resourceName = resourceName.removeFirstSegments(count);
			for (int i = 0; i < rootName.segmentCount() - count; i++)
				resourceName = new Path("..").append(resourceName); //$NON-NLS-1$
			return resourceName.toPortableString();
		}
		
		// Otherwise we would get an ArrayOutOfBoundException
		// in case of two equal Resources
		if (rootName.segmentCount() == resourceName.segmentCount()) {
			return ""; //$NON-NLS-1$
		}
		
		// Remove leading slash if there is one
		String result = resourceName.toString().substring(rootName.toString().length());
		if (result.startsWith("/")) { //$NON-NLS-1$
			result = result.substring(1);
		}
		return result;
	}

	/**
	 * Append the prefix and suffix to form a valid CVS path.
	 */

Lines 276-281 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java (-1 / +2 lines)
276	ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource);	276	ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource);
277	cvsDecoration.setResourceType(resource.getType());	277	cvsDecoration.setResourceType(resource.getType());
278		278
		279	boolean locationIsNull = resource.getLocation() == null;
279	cvsDecoration.setHasRemote(hasRemote(cvsResource));	280	cvsDecoration.setHasRemote(hasRemote(cvsResource));
280	if (cvsResource.isIgnored()) {	281	if (cvsResource.isIgnored()) {
281	cvsDecoration.setIgnored(true);	282	cvsDecoration.setIgnored(true);
Lines 304-310 Link Here
304	if (store.getBoolean(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION)) {	305	if (store.getBoolean(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION)) {
305	if (cvsResource.exists()) {	306	if (cvsResource.exists()) {
306	if (cvsResource.isFolder()) {	307	if (cvsResource.isFolder()) {
307	if (!((ICVSFolder) cvsResource).isCVSFolder()) {	308	if (!((ICVSFolder) cvsResource).isCVSFolder() && !locationIsNull) {
308	cvsDecoration.setNewResource(true);	309	cvsDecoration.setNewResource(true);
309	}	310	}
310	} else if (!cvsResource.isManaged()) {	311	} else if (!cvsResource.isManaged()) {

Lines 97-105 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java (-3 lines)
97	* @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource)	97	* @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource)
98	*/	98	*/
99	protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException {	99	protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException {
100	// Add to version control should never be enabled for linked resources
101	IResource resource = cvsResource.getIResource();
102	if (resource.isLinked()) return false;
103	return super.isEnabledForCVSResource(cvsResource);	100	return super.isEnabledForCVSResource(cvsResource);
104	}	101	}
105		102

Lines 109-114 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java (+2 lines)
109	* Recursively check for and handle orphaned CVS folders	109	* Recursively check for and handle orphaned CVS folders
110	*/	110	*/
111	private void handleOrphanedSubtree(final ICVSFolder folder) throws CVSException {	111	private void handleOrphanedSubtree(final ICVSFolder folder) throws CVSException {
		112	if (folder.getIResource() != null) {
112	if (folder.getIResource().getType() == IResource.PROJECT) return;	113	if (folder.getIResource().getType() == IResource.PROJECT) return;
113	if (CVSWorkspaceRoot.isOrphanedSubtree((IContainer)folder.getIResource())) {	114	if (CVSWorkspaceRoot.isOrphanedSubtree((IContainer)folder.getIResource())) {
114	try {	115	try {
Lines 129-134 Link Here
129	}	130	}
130	handleOrphanedSubtree(folder.getParent());	131	handleOrphanedSubtree(folder.getParent());
131	}	132	}
		133	}
132		134
133	/**	135	/**
134	* Return true if the sync info is loaded for all selected resources.	136	* Return true if the sync info is loaded for all selected resources.

Lines 103-109 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/operations/AddOperation.java (-7 / +22 lines)
103	* must be included in the resources array.	103	* must be included in the resources array.
104	* </p>	104	* </p>
105	*/	105	*/
106	private void add(CVSTeamProvider provider, IResource[] resources, int depth, IProgressMonitor progress) throws CVSException {	106	private void add(final CVSTeamProvider provider, IResource[] resources, int depth, final IProgressMonitor progress) throws CVSException {
107		107
108	// Visit the children of the resources using the depth in order to	108	// Visit the children of the resources using the depth in order to
109	// determine which folders, text files and binary files need to be added	109	// determine which folders, text files and binary files need to be added
Lines 121-127 Link Here
121	// Auto-add parents if they are not already managed	121	// Auto-add parents if they are not already managed
122	IContainer parent = currentResource.getParent();	122	IContainer parent = currentResource.getParent();
123	ICVSResource cvsParentResource = CVSWorkspaceRoot.getCVSResourceFor(parent);	123	ICVSResource cvsParentResource = CVSWorkspaceRoot.getCVSResourceFor(parent);
124	while (parent.getType() != IResource.ROOT && parent.getType() != IResource.PROJECT && ! isManaged(cvsParentResource)) {	124	while (parent.getType() != IResource.ROOT
		125	&& parent.getType() != IResource.PROJECT
		126	&& ! isManaged(cvsParentResource)
		127	&& cvsParentResource.getLocation() != null) {
125	folders.add(cvsParentResource);	128	folders.add(cvsParentResource);
126	parent = parent.getParent();	129	parent = parent.getParent();
127	cvsParentResource = cvsParentResource.getParent();	130	cvsParentResource = cvsParentResource.getParent();
Lines 135-141 Link Here
135	ICVSResource mResource = CVSWorkspaceRoot.getCVSResourceFor(resource);	138	ICVSResource mResource = CVSWorkspaceRoot.getCVSResourceFor(resource);
136	// Add the resource is its not already managed and it was either	139	// Add the resource is its not already managed and it was either
137	// added explicitly (is equal currentResource) or is not ignored	140	// added explicitly (is equal currentResource) or is not ignored
138	if (! isManaged(mResource) && (currentResource.equals(resource) \|\| ! mResource.isIgnored())) {	141	if ((mResource.getLocation() != null) && !isManaged(mResource) && (currentResource.equals(resource) \|\| ! mResource.isIgnored())) {
139	if (resource.getType() == IResource.FILE) {	142	if (resource.getType() == IResource.FILE) {
140	KSubstOption ksubst= getKSubstOption((IFile)resource);	143	KSubstOption ksubst= getKSubstOption((IFile)resource);
141	Set set = (Set) files.get(ksubst);	144	Set set = (Set) files.get(ksubst);
Lines 172-185 Link Here
172	progress.beginTask(null, files.size() * 10 + (folders.isEmpty() ? 0 : 10));	175	progress.beginTask(null, files.size() * 10 + (folders.isEmpty() ? 0 : 10));
173	try {	176	try {
174	if (!folders.isEmpty()) {	177	if (!folders.isEmpty()) {
175	Session session = new Session(getRemoteLocation(provider), getLocalRoot(provider), true /* output to console */);	178	LocalRootRunnable runnable = new LocalRootRunnable(provider) {
		179	public void executeSession(ICVSFolder localRoot, ICVSResource resources[], boolean recurse) throws CVSException, InterruptedException {
		180	Session session = new Session(getRemoteLocation(provider), localRoot, true /* output to console */);
176	session.open(Policy.subMonitorFor(progress, 2), true /* open for modification */);	181	session.open(Policy.subMonitorFor(progress, 2), true /* open for modification */);
177	try {	182	try {
178	IStatus status = Command.ADD.execute(	183	IStatus status = Command.ADD.execute(
179	session,	184	session,
180	Command.NO_GLOBAL_OPTIONS,	185	Command.NO_GLOBAL_OPTIONS,
181	Command.NO_LOCAL_OPTIONS,	186	Command.NO_LOCAL_OPTIONS,
182	(ICVSResource[])folders.toArray(new ICVSResource[folders.size()]),	187	resources,
183	null,	188	null,
184	Policy.subMonitorFor(progress, 8));	189	Policy.subMonitorFor(progress, 8));
185	if (status.getCode() == CVSStatus.SERVER_ERROR) {	190	if (status.getCode() == CVSStatus.SERVER_ERROR) {
Lines 189-206 Link Here
189	session.close();	194	session.close();
190	}	195	}
191	}	196	}
		197	};
		198	runnable.run(getLocalRoot(provider), (ICVSResource[]) folders.toArray(new ICVSResource[0]), false);
		199	}
192	for (Iterator it = files.entrySet().iterator(); it.hasNext();) {	200	for (Iterator it = files.entrySet().iterator(); it.hasNext();) {
193	Map.Entry entry = (Map.Entry) it.next();	201	Map.Entry entry = (Map.Entry) it.next();
194	final KSubstOption ksubst = (KSubstOption) entry.getKey();	202	final KSubstOption ksubst = (KSubstOption) entry.getKey();
195	final Set set = (Set) entry.getValue();	203	final Set set = (Set) entry.getValue();
196	Session session = new Session(getRemoteLocation(provider), getLocalRoot(provider), true /* output to console */);	204	LocalRootRunnable runnable = new LocalRootRunnable(provider) {
		205	public void executeSession(ICVSFolder localRoot, ICVSResource resources[], boolean recurse) throws CVSException, InterruptedException {
		206	Session session = new Session(getRemoteLocation(provider), localRoot, true /* output to console */);
197	session.open(Policy.subMonitorFor(progress, 2), true /* open for modification */);	207	session.open(Policy.subMonitorFor(progress, 2), true /* open for modification */);
198	try {	208	try {
199	IStatus status = Command.ADD.execute(	209	IStatus status = Command.ADD.execute(
200	session,	210	session,
201	Command.NO_GLOBAL_OPTIONS,	211	Command.NO_GLOBAL_OPTIONS,
202	new LocalOption[] { ksubst },	212	new LocalOption[] { ksubst },
203	(ICVSResource[])set.toArray(new ICVSResource[set.size()]),	213	resources,
204	null,	214	null,
205	Policy.subMonitorFor(progress, 8));	215	Policy.subMonitorFor(progress, 8));
206	if (status.getCode() == CVSStatus.SERVER_ERROR) {	216	if (status.getCode() == CVSStatus.SERVER_ERROR) {
Lines 210-215 Link Here
210	session.close();	220	session.close();
211	}	221	}
212	}	222	}
		223	};
		224	runnable.run(getLocalRoot(provider), (ICVSResource[]) set.toArray(new ICVSResource[0]), false);
		225	}
		226	} catch (InterruptedException e) {
		227	CVSException.wrapException(e);
213	} finally {	228	} finally {
214	progress.done();	229	progress.done();
215	}	230	}




		}
	}

	private void makeBranch(final CVSTeamProvider provider, IResource[] resources, final CVSTag versionTag, final CVSTag branchTag, boolean moveToBranch, boolean recurse, final IProgressMonitor monitor) throws TeamException {
		
		// Determine the total amount of work
		int totalWork = (versionTag!= null ? 60 : 40) + (moveToBranch ? 20 : 0);
		monitor.beginTask(CVSUIMessages.CVSTeamProvider_makeBranch, totalWork);  
		try {
			// Build the arguments list
			LocalRootRunnable runnable = new LocalRootRunnable() {
				public void executeSession(ICVSFolder localRoot, IResource resources[], boolean recurse) throws CVSException, InterruptedException, CVSServerException {
			ICVSResource[] arguments = getCVSArguments(resources);
            LocalOption[] localOptions = getLocalOptions(recurse);
			
			// Tag the remote resources
			IStatus status = null;
			if (versionTag != null) {
				// Version using a custom tag command that skips added but not commited reesources
						Session session = new Session(getRemoteLocation(provider),localRoot, true /* output to console */);
				session.open(Policy.subMonitorFor(monitor, 5), true /* open for modification */);
				try {
					status = Command.CUSTOM_TAG.execute(

				}
				if (status.isOK()) {
					// Branch using the tag
							session = new Session(getRemoteLocation(provider), localRoot, true /* output to console */);
					session.open(Policy.subMonitorFor(monitor, 5), true /* open for modification */);
					try {
						status = Command.CUSTOM_TAG.execute(

				}
			} else {
				// Just branch using tag
						Session session = new Session(getRemoteLocation(provider), localRoot, true /* output to console */);
				session.open(Policy.subMonitorFor(monitor, 5), true /* open for modification */);
				try {
                    status = Command.CUSTOM_TAG.execute(

				} finally {
					session.close();
				}

			}
			if ( ! status.isOK()) {
				throw new CVSServerException(status);
			}
				}
			};
			runnable.run(getLocalRoot(provider), resources, recurse);
			// Set the tag of the local resources to the branch tag (The update command will not
			// properly update "cvs added" and "cvs removed" resources so a custom visitor is used
			if (moveToBranch) {
				setTag(provider, resources, branchTag, recurse, Policy.subMonitorFor(monitor, 20));
			}
		} catch (InterruptedException e) {
			CVSException.wrapException(e);
		} finally {
			monitor.done();
		}




/*******************************************************************************
 * Copyright (c) 2009 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 * IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.operations;

import java.util.*;

import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
import org.eclipse.team.internal.ccvs.core.*;
import org.eclipse.team.internal.ccvs.core.client.*;
import org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener;
import org.eclipse.team.internal.ccvs.core.connection.CVSServerException;
import org.eclipse.team.internal.ccvs.core.resources.CVSFileSystemRoot;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.ui.Policy;

public class LocalRootRunnable {

	private CVSTeamProvider provider;
	
	public LocalRootRunnable() {
		super();
	}
	
	public LocalRootRunnable(CVSTeamProvider provider) {
		super();
		this.provider = provider;
	}

	protected void executeSession(ICVSFolder localRoot, IResource resources[], boolean recurse) throws CVSException, InterruptedException, CVSServerException {}

	protected void executeSession(ICVSFolder localRoot, ICVSResource resources[], boolean recurse) throws CVSException, InterruptedException, CVSServerException {}

	protected IStatus executeSessionWithStatus(ICVSFolder localRoot, IResource resources[], boolean recurse) throws CVSException, InterruptedException, CVSServerException {return Status.OK_STATUS;}

	protected IStatus executeSessionWithStatus(ICVSFolder localRoot, ICVSResource resources[], boolean recurse) throws CVSException, InterruptedException, CVSServerException {return Status.OK_STATUS;}

	private static class Root
	{
		public Root(ICVSFolder localRoot, List resources, boolean recurse) {
			super();
			this.localRoot = localRoot;
			this.resources = resources;
			this.recurse = recurse;
		}
		ICVSFolder localRoot;
		List resources;  // either IResource or ICVSResource
		boolean recurse;
		
		public boolean contains(Root newRoot) {
			if (localRoot.getClass().equals(newRoot.localRoot.getClass()) && (recurse == newRoot.recurse))
				return localRoot.getLocation().isPrefixOf(newRoot.localRoot.getLocation());
			return false;
		}

		public void merge(Root root) {
			ArrayList newList = new ArrayList(resources);
			resources = newList;
			resources.addAll(root.resources);
		}
	}
	
	/*
	 * Represents either a IResource or ICVSResource
	 */
	private static class CommonResource {
		IResource workspaceResource = null;
		ICVSResource cvsResource = null;

		public CommonResource(ICVSResource resource) {
			cvsResource = resource;
		}

		public CommonResource(IResource resource) {
			workspaceResource = resource;
		}

		public String toString() {
			if (cvsResource != null)
				return cvsResource.toString();
			return workspaceResource.toString();
		}
		
		public boolean isFolder() {
			if (cvsResource != null)
				return cvsResource.isFolder();
			return workspaceResource instanceof IContainer;
		}
		
		public IPath getLocation() {
			if (cvsResource != null)
				return cvsResource.getLocation();
			return workspaceResource.getLocation();
		}

		public CommonResource[] members() throws CoreException {
			if (cvsResource != null) {
				ICVSResource[] resources = ((ICVSFolder) cvsResource).members(ICVSFolder.FILE_MEMBERS | ICVSFolder.FOLDER_MEMBERS);
				CommonResource[] result = new CommonResource[resources.length];
				for (int i = 0; i < result.length; i++)
					result[i] = new CommonResource(resources[i]);
				return result;
			}
			IResource[] resources = ((IContainer) workspaceResource).members();
			CommonResource[] result = new CommonResource[resources.length];
			for (int i = 0; i < result.length; i++)
				result[i] = new CommonResource(resources[i]);
			return result;
		}

		public ICVSResource getCVSResource() {
			if (cvsResource != null)
				return cvsResource;
			return CVSWorkspaceRoot.getCVSResourceFor(workspaceResource);
		}
	}
	
	/*
	 * Returns the root that is sufficient to accommodate all resources to be committed.
	 * For example, if the local root's location is c:\foo\bar\, but the resource's location
	 * is c:\foo\other\res.txt, the common root will be 'c:\foo'
	 */
	private Root[] getCommonRoots(ICVSFolder localRoot,
			IResource[] resources, boolean recurse) throws CVSException {
		ArrayList/*<Root>*/ list = new ArrayList();
		getCommonRoots(list, localRoot, toCommonRootArray(resources), recurse);
		return (Root[]) list.toArray(new Root[0]);
	}

	private CommonResource[] toCommonRootArray(IResource[] resources) {
		CommonResource[] result = new CommonResource[resources.length];
		for (int i = 0;i < resources.length; i++)
			result[i] = new CommonResource(resources[i]);
		return result;
	}

	private Root[] getCommonRoots(ICVSFolder localRoot,
			ICVSResource[] resources, boolean recurse) throws CVSException {
		ArrayList/*<Root>*/ list = new ArrayList();
		getCommonRoots(list, localRoot, toCommonRootArray(resources), recurse);
		return (Root[]) list.toArray(new Root[0]);
	}

	private CommonResource[] toCommonRootArray(ICVSResource[] resources) {
		CommonResource[] result = new CommonResource[resources.length];
		for (int i = 0;i < resources.length; i++)
			result[i] = new CommonResource(resources[i]);
		return result;
	}

	private ICVSFolder selectAppropriateRoot(ICVSResource cvsResource)
			throws CVSException {
		ICVSFolder newRoot = null;
		IPath location = cvsResource.getLocation();
		if (!cvsResource.isFolder())
			newRoot = cvsResource.getParent();
		else
			newRoot = (ICVSFolder) cvsResource;
		while (newRoot != null && !newRoot.isCVSFolder() && newRoot.getLocation().isPrefixOf(location)) {
			newRoot = newRoot.getParent();
		}
		if ( newRoot != null && (!newRoot.isCVSFolder() || !newRoot.getLocation().isPrefixOf(location)))
			newRoot = null;
		return newRoot;
	}
	
	private boolean isCVSResource(ICVSResource cvsResource) throws CVSException {
		ICVSFolder root = null;
		if (!cvsResource.isFolder())
			root = cvsResource.getParent();
		else
			root = (ICVSFolder) cvsResource;

		while (root != null && !root.isCVSFolder() && root.getLocation().isPrefixOf(cvsResource.getLocation())) {
			root = root.getParent();
		}
		
		return !(root == null);
	}

	/*
	 * Returns true if the root was changed
	 */
	private boolean getCommonRoots(ArrayList list, ICVSFolder localRoot,
			CommonResource[] resources, boolean recurse) throws CVSException {
		boolean wasChanged = false;
		IPath rootLocation = localRoot.getLocation();
		if (rootLocation != null) {
			ArrayList/*<CommonResource>*/ notAdded = new ArrayList();
			Vector notCVS = new Vector();
			for (int i = 0; i < resources.length; i++) {
				boolean added = false;
				boolean isCVS = true;
				IPath location = resources[i].getLocation();
				if (location != null) {
					if (!rootLocation.isPrefixOf(location)) {
						// first, try to get the root as the resource itself, and its immediate workspace parents.
						CommonResource cvsResource = resources[i];
						if (isCVSResource(cvsResource.getCVSResource())) {
							ICVSFolder newRoot = null;
							newRoot = selectAppropriateRoot(cvsResource.getCVSResource());
							
							if (newRoot == null) {
								// create FileSystem Parent Resources.
								cvsResource = new CommonResource(CVSFileSystemRoot.getCVSResourceFor(cvsResource.getLocation(), localRoot.getProvider()));
								newRoot = selectAppropriateRoot(cvsResource.getCVSResource());
							}
							if (newRoot == null)
								throw new CVSException(new CVSStatus(IStatus.ERROR,
										CVSMessages.CVSRepositoryLocation_mixedRepository)); 
							added = true;
							wasChanged = true;
							getCommonChildrenRoots(list, new CommonResource[] {resources[i]}, recurse, newRoot);
						} else {
							notCVS.add(resources[i]); 
							isCVS = false;
						}
					}
				}
				if (!added && isCVS)
					notAdded.add(resources[i]);
			}
			if (!notAdded.isEmpty())
				wasChanged |= getCommonChildrenRoots(list, (CommonResource[]) notAdded.toArray(new CommonResource[0]), recurse, localRoot);

			// write to log the files that are located somewhere not under cvs root
			if (!notCVS.isEmpty()) {
				if (provider != null) {
					Session session = new Session(provider.getCVSWorkspaceRoot().getRemoteLocation(), localRoot, true);
					session.open(Policy.subMonitorFor(null, 2), true /* open for modification */);
					try {
						ICommandOutputListener listener = new CommandOutputListener(); 
						for (int i = 0; i < notCVS.size(); i++){
							CommonResource cvsResource = (CommonResource) notCVS.get(i);
							String argument = NLS.bind(CVSMessages.Resource_not_in_CVS, 
									new String[] {cvsResource.getCVSResource().getRelativePath(localRoot), 
									cvsResource.getLocation().toString()});
							IStatus status = listener.messageLine(argument, session.getCVSRepositoryLocation(), session.getLocalRoot(), null);
							session.addError(status); // The session ignores OK status
							ConsoleListeners.getInstance().messageLineReceived(session, argument, status);
						}
					} finally {
						session.close();
					}
				}
			}
		}
		else
			wasChanged = getCommonChildrenRoots(list, resources, recurse, localRoot);
		return wasChanged;
	}

	private boolean getCommonChildrenRoots(ArrayList list,
			CommonResource[] resources, boolean recurse, ICVSFolder newRoot)
			throws CVSException {
		boolean wasChanged = false;
		if (recurse) {
			boolean hadFolderChildren = false;
			ArrayList/*<CommonResource>*/ notAdded = new ArrayList();
			for (int i = 0; i < resources.length; i++) {
				CommonResource resource = resources[i];
				 if (resource.isFolder()) {
					hadFolderChildren = true;
					try {
						CommonResource[] resChildren = null;
						try {
							resChildren = resource.members();
						} catch (CoreException e) {
							addToList(list, new Root(newRoot, Arrays.asList(new CommonResource[] {resource}), true));
						}
						if (resChildren != null) {
							ArrayList childrenList = new ArrayList();
							boolean changed = getCommonRoots(childrenList, newRoot, resChildren, true);
							if (changed) {
								list.addAll(childrenList);
								recurse = false;
								wasChanged = true;
							}
							else {
								if (!newRoot.getLocation().isPrefixOf(resource.getLocation())) {
									ICVSFolder localRoot = selectAppropriateRoot(newRoot);
									addToList(list, new Root(localRoot, Arrays.asList(new CommonResource[] {resource}), true));
								}
								else
									notAdded.add(resource);
							}
						}
					} catch (CoreException e) {
						throw CVSException.wrapException(e);
					}
				}
				 else
					 notAdded.add(resource);
			}
			if (!notAdded.isEmpty())
				addToList(list, new Root(newRoot, notAdded, recurse && hadFolderChildren));
		}
		else
			addToList(list, new Root(newRoot, Arrays.asList(resources), recurse));
		return wasChanged;
	}

	private void addToList(ArrayList list, Root newRoot) {
		Iterator it = list.iterator();
		while (it.hasNext()) {
			Root root = (Root) it.next();
			if (root.contains(newRoot)) {
				root.merge(newRoot);
				return;
			}
			if (newRoot.contains(root)) {
				newRoot.merge(root);
				list.remove(root);
				list.add(newRoot);
				return;
			}
		}
		list.add(newRoot);
	}

	public void run(ICVSFolder localRoot, IResource[] resources,
			boolean recurse) throws CVSException, InterruptedException, CVSServerException {
		Root commonRoots[] = getCommonRoots(localRoot, resources, recurse);
		for (int i = 0; i < commonRoots.length; i++) {
			IResource [] array = toIResourceArray(commonRoots[i].resources);
			executeSession(commonRoots[i].localRoot, array, commonRoots[i].recurse);
		}
	}

	public IStatus runWithStatus(ICVSFolder localRoot, IResource[] resources,
			boolean recurse) throws CVSException, InterruptedException, CVSServerException {
		Root commonRoots[] = getCommonRoots(localRoot, resources, recurse);
		for (int i = 0; i < commonRoots.length; i++) {
			IResource [] array = toIResourceArray(commonRoots[i].resources);
			IStatus status = executeSessionWithStatus(commonRoots[i].localRoot, array, commonRoots[i].recurse);
			if (!status.isOK()) 
				return status;
		}
		return Status.OK_STATUS;
	}

	private IResource[] toIResourceArray(List resources) {
		IResource[] result = new IResource[resources.size()];
		Iterator it = resources.iterator();
		int i = 0;
		while (it.hasNext()) {
			CommonResource commonRes = (CommonResource) it.next();
			result[i++] = commonRes.workspaceResource;
		}
		return result;
	}

	public void run(ICVSFolder localRoot, ICVSResource[] resources,
			boolean recurse) throws CVSException, InterruptedException, CVSServerException {
		Root commonRoots[] = getCommonRoots(localRoot, resources, recurse);
		for (int i = 0; i < commonRoots.length; i++) {
			ICVSResource [] array = toICVSResourceArray(commonRoots[i].resources);
			executeSession(commonRoots[i].localRoot, array, commonRoots[i].recurse);
		}
	}

	public IStatus runWithStatus(ICVSFolder localRoot, ICVSResource[] resources,
			boolean recurse) throws CVSException, InterruptedException, CVSServerException {
		Root commonRoots[] = getCommonRoots(localRoot, resources, recurse);
		for (int i = 0; i < commonRoots.length; i++) {
			ICVSResource [] array = toICVSResourceArray(commonRoots[i].resources);
			IStatus status = executeSessionWithStatus(commonRoots[i].localRoot, array, commonRoots[i].recurse);
			if (!status.isOK()) 
				return status;
		}
		return Status.OK_STATUS;
	}

	private ICVSResource[] toICVSResourceArray(List resources) {
		ICVSResource[] result = new ICVSResource[resources.size()];
		Iterator it = resources.iterator();
		int i = 0;
		while (it.hasNext()) {
			CommonResource commonRes = (CommonResource) it.next();
			result[i++] = commonRes.cvsResource;
		}
		return result;
	}
}




import org.eclipse.team.core.mapping.provider.SynchronizationScopeManager;
import org.eclipse.team.internal.ccvs.core.*;
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.Command.LocalOption;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;

	/*
	 * Get the arguments to be passed to a commit or update
	 */
	protected String[] getStringArguments(ICVSFolder localRoot, IResource[] resources) throws CVSException {
		List arguments = new ArrayList(resources.length);
		for (int i=0;i<resources.length;i++) {
			ICVSResource res = CVSWorkspaceRoot.getCVSResourceFor(resources[i]);
			String path = res.getRelativePath(localRoot);
			arguments.add(path);
			} else {
				arguments.add(cvsPath.toString());
			}
		}
		return (String[])arguments.toArray(new String[arguments.size()]);
	}

Lines 17-22 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java (-2 / +8 lines)
17	import org.eclipse.team.internal.ccvs.core.client.Command;	17	import org.eclipse.team.internal.ccvs.core.client.Command;
18	import org.eclipse.team.internal.ccvs.core.client.Session;	18	import org.eclipse.team.internal.ccvs.core.client.Session;
19	import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;	19	import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
		20	import org.eclipse.team.internal.ccvs.core.connection.CVSServerException;
20	import org.eclipse.team.internal.ccvs.ui.Policy;	21	import org.eclipse.team.internal.ccvs.ui.Policy;
21	import org.eclipse.ui.IWorkbenchPart;	22	import org.eclipse.ui.IWorkbenchPart;
22		23
Lines 34-42 Link Here
34	/* (non-Javadoc)	35	/* (non-Javadoc)
35	* @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#execute(org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor)	36	* @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#execute(org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor)
36	*/	37	*/
37	protected void execute(CVSTeamProvider provider, IResource[] resources, boolean recurse, IProgressMonitor monitor) throws CVSException, InterruptedException {	38	protected void execute(final CVSTeamProvider provider, IResource[] resources, boolean recurse, final IProgressMonitor monitor) throws CVSException, InterruptedException {
38	monitor.beginTask(null, 100);	39	monitor.beginTask(null, 100);
39	Session session = new Session(getRemoteLocation(provider), getLocalRoot(provider), true /* output to console */);	40	LocalRootRunnable runnable = new LocalRootRunnable() {
		41	public void executeSession(ICVSFolder localRoot, IResource resources[], boolean recurse) throws CVSException, InterruptedException, CVSServerException {
		42	Session session = new Session(getRemoteLocation(provider), localRoot, true /* output to console */);
40	session.open(Policy.subMonitorFor(monitor, 10), isServerModificationOperation());	43	session.open(Policy.subMonitorFor(monitor, 10), isServerModificationOperation());
41	try {	44	try {
42	IStatus status = executeCommand(session, provider, getCVSArguments(session, resources), recurse, Policy.subMonitorFor(monitor, 90));	45	IStatus status = executeCommand(session, provider, getCVSArguments(session, resources), recurse, Policy.subMonitorFor(monitor, 90));
Lines 47-52 Link Here
47	session.close();	50	session.close();
48	}	51	}
49	}	52	}
		53	};
		54	runnable.run(getLocalRoot(provider), resources, recurse);
		55	}
50		56
51	protected final ICVSResource[] getCVSArguments(IResource[] resources) {	57	protected final ICVSResource[] getCVSArguments(IResource[] resources) {
52	return super.getCVSArguments(resources);	58	return super.getCVSArguments(resources);

Lines 24-29 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java (-3 / +15 lines)
24	import org.eclipse.team.internal.ccvs.core.*;	24	import org.eclipse.team.internal.ccvs.core.*;
25	import org.eclipse.team.internal.ccvs.core.client.*;	25	import org.eclipse.team.internal.ccvs.core.client.*;
26	import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;	26	import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
		27	import org.eclipse.team.internal.ccvs.core.connection.CVSServerException;
27	import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;	28	import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
28	import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;	29	import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
29	import org.eclipse.team.internal.ccvs.ui.Policy;	30	import org.eclipse.team.internal.ccvs.ui.Policy;
Lines 79-86 Link Here
79	* any other code - warning messages received from the server	80	* any other code - warning messages received from the server
80	* @param recurse	81	* @param recurse
81	*/	82	*/
82	public IStatus tag(CVSTeamProvider provider, IResource[] resources, boolean recurse, IProgressMonitor progress) throws CVSException {	83	public IStatus tag(final CVSTeamProvider provider, IResource[] resources, boolean recurse, final IProgressMonitor progress) throws CVSException {
83		84
		85	LocalRootRunnable runnable = new LocalRootRunnable() {
		86	protected IStatus executeSessionWithStatus(ICVSFolder localRoot,
		87	IResource[] resources, boolean recurse)
		88	throws CVSException, InterruptedException,
		89	CVSServerException {
84	LocalOption[] commandOptions = (LocalOption[])localOptions.toArray(new LocalOption[localOptions.size()]);	90	LocalOption[] commandOptions = (LocalOption[])localOptions.toArray(new LocalOption[localOptions.size()]);
85	if (recurse) {	91	if (recurse) {
86	commandOptions = Command.DO_NOT_RECURSE.removeFrom(commandOptions);	92	commandOptions = Command.DO_NOT_RECURSE.removeFrom(commandOptions);
Lines 90-100 Link Here
90	}	96	}
91		97
92	// Build the arguments list	98	// Build the arguments list
93	String[] arguments = getStringArguments(resources);	99	String[] arguments = getStringArguments(localRoot, resources);
94		100
95	// Execute the command	101	// Execute the command
96	CVSWorkspaceRoot root = provider.getCVSWorkspaceRoot();	102	CVSWorkspaceRoot root = provider.getCVSWorkspaceRoot();
97	Session s = new Session(root.getRemoteLocation(), root.getLocalRoot());	103	Session s = new Session(root.getRemoteLocation(), localRoot);
98	progress.beginTask(null, 100);	104	progress.beginTask(null, 100);
99	try {	105	try {
100	// Opening the session takes 20% of the time	106	// Opening the session takes 20% of the time
Lines 110-115 Link Here
110	s.close();	116	s.close();
111	progress.done();	117	progress.done();
112	}	118	}
		119	} };
		120	try {
		121	return runnable.runWithStatus(provider.getCVSWorkspaceRoot().getLocalRoot(), resources, recurse);
		122	} catch (InterruptedException e) {
		123	throw CVSException.wrapException(e);
		124	}
113	}	125	}
114		126
115	public void addLocalOption(LocalOption option) {	127	public void addLocalOption(LocalOption option) {




<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<booleanAttribute key="askclear" value="false"/>
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value=""/>
<booleanAttribute key="default" value="false"/>
<booleanAttribute key="includeFragments" value="false"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace2"/>
<stringAttribute key="location1" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace"/>
<booleanAttribute key="maximized" value="false"/>
<booleanAttribute key="onePlugin" value="false"/>
<stringAttribute key="onePluginID" value=""/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTests.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.team.tests.ccvs.core.AllTests"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os win32 -ws win32 -arch x86 -nl en_CA"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.team.tests.cvs.core"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.cvs.properties=c:\eclipse\repository.properties -Declipse.cvs.testName2=testFileAdditions"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
<stringAttribute key="selected_target_plugins" value="org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.eclipse.compare.tests@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.tests.harness@default:default,org.eclipse.core.tests.resources@default:default,org.eclipse.jface@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.tests.core@default:default,org.eclipse.team.tests.cvs.core@default:default,org.eclipse.test.performance@default:default,workspace_loc@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="true"/>
<mapAttribute key="tracingOptions">
<mapEntry key="org.eclipse.ant.core/buildfile/timing" value="false"/>
<mapEntry key="org.eclipse.ant.core/debug" value="true"/>
<mapEntry key="org.eclipse.core.boot/monitor/bundles" value="false"/>
<mapEntry key="org.eclipse.core.boot/monitor/classes" value="false"/>
<mapEntry key="org.eclipse.core.boot/monitor/plugins" value="false"/>
<mapEntry key="org.eclipse.core.boot/trace/classLoading" value="false"/>
<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/snapshots" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/loader" value="*"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/actions" value="false"/>
<mapEntry key="org.eclipse.core.runtime/timing/shutdown" value="false"/>
<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
<mapEntry key="org.eclipse.team.ftp/debug" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
<mapEntry key="org.eclipse.core.boot/trace/filename" value="runtime.traces"/>
<mapEntry key="org.eclipse.core.boot/trace/filters" value="trace.properties"/>
<mapEntry key="org.eclipse.core.boot/trace/pluginActivation" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
<mapEntry key="org.eclipse.core.resources/history" value="false"/>
<mapEntry key="org.eclipse.core.resources/monitor/builders" value="false"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug" value="false"/>
<mapEntry key="org.eclipse.team.ftp/requests" value="true"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug" value="false"/>
<mapEntry key="org.eclipse.core.resources/monitor/listeners" value="false"/>
<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
<mapEntry key="org.eclipse.core.resources/save" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/snapshots" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
<mapEntry key="org.eclipse.core.runtime/config/debug" value="false"/>
<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
<mapEntry key="org.eclipse.core.runtime/jobs" value="false"/>
<mapEntry key="org.eclipse.core.runtime/jobs/beginend" value="false"/>
<mapEntry key="org.eclipse.core.runtime/jobs/timing" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/actions" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/failure" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/class" value="*"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/loader" value="*"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/native" value="*"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/resource" value="*"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/failure" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/success" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/properties" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/success" value="false"/>
<mapEntry key="org.eclipse.core.runtime/preferences/debug" value="false"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug" value="false"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug/dump" value=""/>
<mapEntry key="org.eclipse.core.runtime/registry/debug/events/extension" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
<mapEntry key="org.eclipse.core.boot/monitor/bundles" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug/events/plugin" value="false"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="false"/>
<mapEntry key="org.eclipse.core.runtime/timing/shutdown" value="false"/>
<mapEntry key="org.eclipse.core.runtime/timing/startup" value="false"/>
<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
<mapEntry key="org.eclipse.debug.core/debug" value="true"/>
<mapEntry key="org.eclipse.debug.ui/debug" value="true"/>
<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
<mapEntry key="org.eclipse.help.ui/debug/ieadapter" value="false"/>
<mapEntry key="org.eclipse.help.ui/debug/ieadapter/inprocess" value="false"/>
<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug/events/extension" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
<mapEntry key="org.eclipse.help/debug" value="true"/>
<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
<mapEntry key="org.eclipse.core.resources/save" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
<mapEntry key="org.eclipse.ui/debug/internalerror/openDialog" value="false"/>
<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
<mapEntry key="org.eclipse.core.boot/trace/filters" value="trace.properties"/>
<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
<mapEntry key="org.eclipse.help/debug/context" value="false"/>
<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
<mapEntry key="org.eclipse.help/debug/search" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
<mapEntry key="org.eclipse.core.resources/monitor/builders" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
<mapEntry key="org.eclipse.ui/trace/workbench.restore" value="false"/>
<mapEntry key="org.eclipse.ui/trace/part.create" value="false"/>
<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/native" value="*"/>
<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
<mapEntry key="org.eclipse.jdt.debug.ui/debug" value="true"/>
<mapEntry key="org.eclipse.jdt.debug/debug" value="true"/>
<mapEntry key="org.eclipse.jface/trace/actions" value="false"/>
<mapEntry key="org.eclipse.core.runtime/jobs/beginend" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
<mapEntry key="org.eclipse.team.ftp/responses" value="true"/>
<mapEntry key="org.eclipse.team.core/debug" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/success" value="false"/>
<mapEntry key="org.eclipse.core.runtime/jobs" value="false"/>
<mapEntry key="org.eclipse.core.boot/monitor/plugins" value="false"/>
<mapEntry key="org.eclipse.ui/trace/workbench.start" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
<mapEntry key="org.eclipse.core.runtime/timing/startup" value="false"/>
<mapEntry key="org.eclipse.team.cvs.ui/consolebuffering" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/failure" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
<mapEntry key="org.eclipse.core.resources/history" value="false"/>
<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
<mapEntry key="org.eclipse.team.core/streams" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
<mapEntry key="org.eclipse.team.cvs.core/debug" value="true"/>
<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
<mapEntry key="org.eclipse.team.cvs.ui/consolebuffering" value="false"/>
<mapEntry key="org.eclipse.team.cvs.ui/debug" value="false"/>
<mapEntry key="org.eclipse.team.ftp/debug" value="false"/>
<mapEntry key="org.eclipse.team.ftp/list" value="true"/>
<mapEntry key="org.eclipse.team.ftp/requests" value="true"/>
<mapEntry key="org.eclipse.team.ftp/responses" value="true"/>
<mapEntry key="org.eclipse.ui/debug" value="true"/>
<mapEntry key="org.eclipse.ui/debug/internalerror/openDialog" value="false"/>
<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
<mapEntry key="org.eclipse.ui/trace/part.activate" value="false"/>
<mapEntry key="org.eclipse.ui/trace/part.create" value="false"/>
<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
<mapEntry key="org.eclipse.debug.ui/debug" value="true"/>
<mapEntry key="org.eclipse.jdt.debug/debug" value="true"/>
<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
<mapEntry key="org.eclipse.ui/trace/part.listeners" value="false"/>
<mapEntry key="org.eclipse.ui/trace/perspective" value="false"/>
<mapEntry key="org.eclipse.ui/trace/workbench.restore" value="false"/>
<mapEntry key="org.eclipse.ui/trace/workbench.start" value="false"/>
<mapEntry key="org.eclipse.update.core/debug" value="true"/>
<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
</mapAttribute>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="automaticAdd" value="true"/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="includeFragments" value="false"/>
<booleanAttribute key="clearws" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.team.tests.ccvs.core.AllTests"/>
<stringAttribute key="location1" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace"/>
<booleanAttribute key="default" value="false"/>
<stringAttribute key="vmargs" value="-Declipse.cvs.properties=c:\eclipse\repository.properties -Declipse.cvs.testName2=testFileAdditions"/>
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="extplugins" value="org.eclipse.core.resources.compatibility;org.eclipse.jdt.doc.isv;org.eclipse.jdt.doc.user;org.eclipse.jdt.source;org.eclipse.pde.doc.user;org.eclipse.pde.source;org.eclipse.platform;org.eclipse.platform.source;org.eclipse.platform.source.win32.win32.x86;org.eclipse.sdk;"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
<stringAttribute key="onePluginID" value=""/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
<booleanAttribute key="useProduct" value="false"/>
<stringAttribute key="wsproject" value="org.eclipse.pde.ui;"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.team.tests.cvs.core"/>
<booleanAttribute key="askclear" value="false"/>
<booleanAttribute key="onePlugin" value="false"/>
<booleanAttribute key="includeOptional" value="true"/>
<booleanAttribute key="maximized" value="false"/>
<stringAttribute key="location0" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace2"/>
</launchConfiguration>




<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/CVS UI Tests"/>
<booleanAttribute key="default" value="false"/>
<booleanAttribute key="includeFragments" value="false"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace"/>

<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_20"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.team.tests.ccvs.core.AllTests"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os win32 -ws win32 -arch x86 -nl en_CA"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.team.tests.cvs.core"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.cvs.properties=g:\eclipse\repository.properties -Declipse.cvs.testName2=testFileAdditions"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
<stringAttribute key="selected_target_plugins" value="com.google.collect@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.ant@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.el@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.jasper@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.lucene.highlighter@default:default,org.apache.lucene.memory@default:default,org.apache.lucene.misc@default:default,org.apache.lucene.queries@default:default,org.apache.lucene.snowball@default:default,org.apache.lucene.spellchecker@default:default,org.apache.lucene@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare.win32@default:default,org.eclipse.compare@default:default,org.eclipse.core.boot@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.draw2d@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.mwe.activities@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.ui.simpleEditor@default:default,org.eclipse.emf.mwe.ui@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.gef.examples.flow@default:default,org.eclipse.gef.examples.logic@default:default,org.eclipse.gef.examples.shapes@default:default,org.eclipse.gef.examples.text@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.gef@default:default,org.eclipse.help.appserver@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.update.core.win32@default:false,org.eclipse.update.core@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.update.ui@default:default,org.eclipse.xpand.activities@default:default,org.eclipse.xpand.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xtend.check.ui@default:default,org.eclipse.xtend.profiler@default:default,org.eclipse.xtend.shared.ui@default:default,org.eclipse.xtend.typesystem.emf.ui@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend.ui@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.junit@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.junit@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtend2.lib@default:default,org.eclipse.xtext.xtend2.ui@default:default,org.eclipse.xtext.xtend2@default:default,org.eclipse.xtext.xtext.ui.examples@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.junit*4.8.2.v4_8_2_v20110321-1705@default:default,org.junit4@default:default,org.mortbay.jetty.server@default:default,org.mortbay.jetty.util@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.eclipse.compare.tests@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.tests.harness@default:default,org.eclipse.core.tests.resources@default:default,org.eclipse.jface@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.tests.core@default:default,org.eclipse.team.tests.cvs.core@default:default,org.eclipse.test.performance@default:default,workspace_loc@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="true"/>
<mapAttribute key="tracingOptions">
<mapEntry key="org.eclipse.ant.core/buildfile/timing" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
<mapEntry key="org.eclipse.team.ftp/requests" value="true"/>
<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
<mapEntry key="org.eclipse.ui/trace/workbench.restore" value="false"/>
<mapEntry key="org.eclipse.core.boot/trace/pluginActivation" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/native" value="*"/>
<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
<mapEntry key="org.eclipse.ui/trace/part.listeners" value="false"/>
<mapEntry key="org.eclipse.help.ui/debug/ieadapter/inprocess" value="false"/>
<mapEntry key="org.eclipse.ui/trace/workbench.start" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
<mapEntry key="org.eclipse.help.ui/debug/ieadapter" value="false"/>
<mapEntry key="org.eclipse.ant.core/debug" value="true"/>
<mapEntry key="org.eclipse.core.boot/monitor/bundles" value="false"/>
<mapEntry key="org.eclipse.core.boot/monitor/classes" value="false"/>
<mapEntry key="org.eclipse.core.boot/monitor/plugins" value="false"/>
<mapEntry key="org.eclipse.core.boot/trace/classLoading" value="false"/>
<mapEntry key="org.eclipse.core.boot/trace/filename" value="runtime.traces"/>
<mapEntry key="org.eclipse.core.boot/trace/filters" value="trace.properties"/>
<mapEntry key="org.eclipse.core.boot/trace/pluginActivation" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
<mapEntry key="org.eclipse.core.resources/history" value="false"/>
<mapEntry key="org.eclipse.core.resources/monitor/builders" value="false"/>
<mapEntry key="org.eclipse.core.resources/monitor/listeners" value="false"/>
<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
<mapEntry key="org.eclipse.core.resources/save" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/snapshots" value="false"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug/events/plugin" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/success" value="false"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
<mapEntry key="org.eclipse.core.runtime/config/debug" value="false"/>
<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
<mapEntry key="org.eclipse.core.runtime/jobs" value="false"/>
<mapEntry key="org.eclipse.core.runtime/jobs/beginend" value="false"/>
<mapEntry key="org.eclipse.core.runtime/jobs/timing" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/actions" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/failure" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/class" value="*"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/loader" value="*"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/native" value="*"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/resource" value="*"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/failure" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/success" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/properties" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/success" value="false"/>
<mapEntry key="org.eclipse.core.runtime/preferences/debug" value="false"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug" value="false"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug/dump" value=""/>
<mapEntry key="org.eclipse.core.runtime/registry/debug/events/extension" value="false"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug/events/plugin" value="false"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="false"/>
<mapEntry key="org.eclipse.core.runtime/timing/shutdown" value="false"/>
<mapEntry key="org.eclipse.core.runtime/timing/startup" value="false"/>
<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
<mapEntry key="org.eclipse.debug.core/debug" value="true"/>
<mapEntry key="org.eclipse.debug.ui/debug" value="true"/>
<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
<mapEntry key="org.eclipse.help.ui/debug/ieadapter" value="false"/>
<mapEntry key="org.eclipse.help.ui/debug/ieadapter/inprocess" value="false"/>
<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
<mapEntry key="org.eclipse.help/debug" value="true"/>
<mapEntry key="org.eclipse.help/debug/context" value="false"/>
<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
<mapEntry key="org.eclipse.help/debug/search" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug/events/extension" value="false"/>
<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
<mapEntry key="org.eclipse.team.ftp/responses" value="true"/>
<mapEntry key="org.eclipse.team.ftp/debug" value="false"/>
<mapEntry key="org.eclipse.core.boot/trace/filename" value="runtime.traces"/>
<mapEntry key="org.eclipse.ui/trace/part.create" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/loader" value="*"/>
<mapEntry key="org.eclipse.ui/debug/internalerror/openDialog" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
<mapEntry key="org.eclipse.core.runtime/timing/startup" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
<mapEntry key="org.eclipse.core.boot/trace/filters" value="trace.properties"/>
<mapEntry key="org.eclipse.help/debug/search" value="false"/>
<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
<mapEntry key="org.eclipse.team.core/streams" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/failure" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/snapshots" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
<mapEntry key="org.eclipse.ant.core/buildfile/timing" value="false"/>
<mapEntry key="org.eclipse.core.runtime/jobs/beginend" value="false"/>
<mapEntry key="org.eclipse.core.boot/monitor/bundles" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug" value="false"/>
<mapEntry key="org.eclipse.debug.core/debug" value="true"/>
<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
<mapEntry key="org.eclipse.jdt.debug.ui/debug" value="true"/>
<mapEntry key="org.eclipse.jdt.debug/debug" value="true"/>
<mapEntry key="org.eclipse.jface/trace/actions" value="false"/>
<mapEntry key="org.eclipse.team.core/debug" value="false"/>
<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
<mapEntry key="org.eclipse.team.core/streams" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
<mapEntry key="org.eclipse.team.cvs.core/debug" value="true"/>
<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/success" value="false"/>
<mapEntry key="org.eclipse.team.cvs.ui/consolebuffering" value="false"/>
<mapEntry key="org.eclipse.core.boot/monitor/plugins" value="false"/>
<mapEntry key="org.eclipse.core.runtime/preferences/debug" value="false"/>
<mapEntry key="org.eclipse.update.core/debug" value="true"/>
<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
<mapEntry key="org.eclipse.team.cvs.ui/consolebuffering" value="false"/>
<mapEntry key="org.eclipse.team.cvs.ui/debug" value="false"/>
<mapEntry key="org.eclipse.team.ftp/debug" value="false"/>
<mapEntry key="org.eclipse.team.ftp/list" value="true"/>
<mapEntry key="org.eclipse.team.ftp/requests" value="true"/>
<mapEntry key="org.eclipse.team.ftp/responses" value="true"/>
<mapEntry key="org.eclipse.ui/debug" value="true"/>
<mapEntry key="org.eclipse.ui/debug/internalerror/openDialog" value="false"/>
<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
<mapEntry key="org.eclipse.ui/trace/part.activate" value="false"/>
<mapEntry key="org.eclipse.ui/trace/part.create" value="false"/>
<mapEntry key="org.eclipse.ui/trace/part.listeners" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
<mapEntry key="org.eclipse.core.boot/monitor/classes" value="false"/>
<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
<mapEntry key="org.eclipse.core.runtime/jobs" value="false"/>
<mapEntry key="org.eclipse.jdt.debug.ui/debug" value="true"/>
<mapEntry key="org.eclipse.ui/trace/perspective" value="false"/>
<mapEntry key="org.eclipse.ui/trace/workbench.restore" value="false"/>
<mapEntry key="org.eclipse.ui/trace/workbench.start" value="false"/>
<mapEntry key="org.eclipse.update.core/debug" value="true"/>
<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
</mapAttribute>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>

Lines 19-24 Link Here

(-)src/org/eclipse/team/tests/ccvs/core/EclipseTest.java (+31 lines)
19	import java.io.PrintStream;	19	import java.io.PrintStream;
20	import java.io.Reader;	20	import java.io.Reader;
21	import java.lang.reflect.InvocationTargetException;	21	import java.lang.reflect.InvocationTargetException;
		22	import java.net.URI;
		23	import java.net.URISyntaxException;
22	import java.util.ArrayList;	24	import java.util.ArrayList;
23	import java.util.Arrays;	25	import java.util.Arrays;
24	import java.util.HashMap;	26	import java.util.HashMap;
Lines 32-37 Link Here
32		34
33	import org.eclipse.core.resources.IContainer;	35	import org.eclipse.core.resources.IContainer;
34	import org.eclipse.core.resources.IFile;	36	import org.eclipse.core.resources.IFile;
		37	import org.eclipse.core.resources.IFolder;
35	import org.eclipse.core.resources.IProject;	38	import org.eclipse.core.resources.IProject;
36	import org.eclipse.core.resources.IResource;	39	import org.eclipse.core.resources.IResource;
37	import org.eclipse.core.resources.IResourceVisitor;	40	import org.eclipse.core.resources.IResourceVisitor;
Lines 807-812 Link Here
807	ignoredState, getCVSResource(resource).isIgnored());	810	ignoredState, getCVSResource(resource).isIgnored());
808	}	811	}
809		812
		813	protected void assertIsNotIgnored(IResource resource, boolean ignoredState) throws TeamException {
		814	assertEquals("Resource " + resource.getFullPath() + " should be ignored but isn't.",
		815	ignoredState, !getCVSResource(resource).isIgnored());
		816	}
		817
810	protected void assertValidCheckout(IProject project) {	818	protected void assertValidCheckout(IProject project) {
811	// NOTE: Add code to ensure that the project was checkout out properly	819	// NOTE: Add code to ensure that the project was checkout out properly
812	CVSTeamProvider provider = (CVSTeamProvider)RepositoryProvider.getProvider(project);	820	CVSTeamProvider provider = (CVSTeamProvider)RepositoryProvider.getProvider(project);
Lines 1468-1471 Link Here
1468	//don't leak builder jobs, since they may affect subsequent tests	1476	//don't leak builder jobs, since they may affect subsequent tests
1469	waitForBuild();	1477	waitForBuild();
1470	}	1478	}
		1479
		1480	protected void createLink(IProject project, String name, IPath target) {
		1481	IPath relativeTarget = null;
		1482	try {
		1483	relativeTarget = new Path(project.getPathVariableManager().convertToRelative(new URI(target.toString()), true, null).getPath());
		1484	} catch (CoreException e) {
		1485	fail("failure with convertToRelative(" + target + ")", e);
		1486	} catch (URISyntaxException e) {
		1487	fail("failure with convertToRelative(" + target + ")", e);
		1488	}
		1489	try {
		1490	if (name.endsWith("/")) {
		1491	name = name.substring(0, name.lastIndexOf('/'));
		1492	IFolder folder = project.getFolder(new Path(name));
		1493	folder.createLink(relativeTarget, 0, getMonitor());
		1494	} else {
		1495	IFile file = project.getFile(new Path(name));
		1496	file.createLink(relativeTarget, 0, getMonitor());
		1497	}
		1498	} catch (CoreException e) {
		1499	fail("failure with createLink(" + relativeTarget + ")", e);
		1500	}
		1501	}
1471	}	1502	}




import junit.framework.Test;
import junit.framework.TestSuite;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;

import org.eclipse.team.core.RepositoryProvider;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin;
import org.eclipse.team.internal.ccvs.core.CVSTag;
import org.eclipse.team.internal.ccvs.core.ICVSFolder;
import org.eclipse.team.internal.ccvs.core.ILogEntry;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer;
import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;

		IProject project = createProject("testLinkFailure", new String[] { "changed.txt", "deleted.txt", "folder1/", "folder1/a.txt" });
		IFolder folder = project.getFolder("link");
		folder.createLink(Platform.getLocation().append("temp"), IResource.ALLOW_MISSING_LOCAL, null);
		assertIsNotIgnored(folder, true);
		folder = project.getFolder("folder1/folder2/");
		folder.createLink(Platform.getLocation().append("temp"), IResource.ALLOW_MISSING_LOCAL, null);
		assertIsNotIgnored(folder, true);
	}
	
	public void testLinkCVSFolder() throws CoreException, TeamException, IOException {

		folder.createLink(source.getLocation(), 0, null);
		assertEquals(sourceCopy, source);
	}
    /**
     * Test a simple commit of a commit set with linked resource folder. The set being committed is not managed.
     * @throws CoreException
     * @throws IOException
     * @throws TeamException
     */
    public void testSimpleCommitLinkedResourceFolder() throws TeamException, CoreException, IOException {
        IProject projectA = createProject(getName() + "_A", new String[] { "folder1/", "folder1/added.txt", "folder1/changed.txt", 
        	"folder1/subfolder/", "folder1/subfolder/real_resource.txt",});
        IProject projectB = createProject(getName() + "_B", new String[] { "real_changed.txt", "real_deleted.txt"});
        
        IPath target = projectA.getLocation();
        projectA.close(getMonitor());
        
        createLink(projectB, "folder1/", target.append("folder1"));
        
        setContentsAndEnsureModified(projectB.getFile("real_changed.txt"));
        setContentsAndEnsureModified(projectB.getFile("folder1/changed.txt"));
        setContentsAndEnsureModified(projectB.getFile("folder1/subfolder/real_resource.txt"));
        addResources(projectB, new String[] { "folder1/added.txt" }, false /* don't commit */);
        
        commitProject(projectB);
        assertLocalStateEqualsRemote(projectB);
        
        projectA.open(getMonitor());
        projectA.refreshLocal(IResource.DEPTH_INFINITE, getMonitor());
        assertLocalStateEqualsRemote(projectA);
    }

    /**
     * Test a simple commit of a commit set with linked resource file. The set being committed is not managed.
     * @throws CoreException
     * @throws IOException
     * @throws TeamException
     */
    public void testSimpleCommitLinkedResourceFile() throws TeamException, CoreException, IOException {
        IProject projectA = createProject(getName() + "_A", new String[] { "folder1/", "added.txt", "folder1/changed.txt"});
        IProject projectB = createProject(getName() + "_B", new String[] { "real_changed.txt", "real_deleted.txt", "folder2/"});
        
        IPath target = projectA.getLocation();
        projectA.close(getMonitor());
        
        createLink(projectB, "folder2/changed.txt", target.append("folder1/changed.txt"));
        createLink(projectB, "added.txt", target.append("added.txt"));
        
        setContentsAndEnsureModified(projectB.getFile("real_changed.txt"));
        setContentsAndEnsureModified(projectB.getFile("folder2/changed.txt"));
        addResources(projectB, new String[] { "added.txt" }, false /* don't commit */);
        
        commitProject(projectB);
        assertLocalStateEqualsRemote(projectB);
        
        projectA.open(getMonitor());
        projectA.refreshLocal(IResource.DEPTH_INFINITE, getMonitor());
        assertLocalStateEqualsRemote(projectA);
    }

    public void testMakeBranchWithLinkedResources() throws TeamException, CoreException, IOException {
		// Create a test project
        IProject projectA = createProject(getName() + "_A", new String[] { "simple_link.txt", "folder1/", "folder1/added.txt", "folder1/changed.txt", 
        	"folder1/subfolder/", "folder1/subfolder/real_resource.txt",});
        IProject projectB = createProject(getName() + "_B", new String[] { "real_changed.txt", "real_deleted.txt"});
        
        IPath target = projectA.getLocation();
        projectA.close(getMonitor());
        
        createLink(projectB, "folder1/", target.append("folder1"));
        createLink(projectB, "folder1/subfolder/simple_link.txt", target.append("simple_link.txt"));

		// Make some local modifications including "cvs adds" and "cvs removes"
		addResources(projectB, new String[] {"folder1/added.txt"}, false);
		changeResources(projectB, new String[] {"folder1/changed.txt", "folder1/subfolder/simple_link.txt"}, false);
		
		// Make the branch including a pre-version
		CVSTag version = new CVSTag("v1", CVSTag.BRANCH);
		CVSTag branch = new CVSTag("branch1", CVSTag.BRANCH);
		makeBranch(new IResource[] {projectB}, version, branch, true);

		// Checkout a copy from the branch and version and compare
		IProject branchCopy = checkoutCopy(projectB, branch);
		IProject versionCopy = checkoutCopy(projectB, version);
		assertEquals(branchCopy, versionCopy, true, false);
		
		// Commit the project, update the branch and compare
		commitProject(projectB);
		updateProject(branchCopy, null, false);
		assertEquals(branchCopy, projectB, false, true);
	}

	public void testVersionTagWithLinkedResources() throws TeamException, CoreException, IOException {
		
		// Create a test project
        IProject projectA = createProject(getName() + "_A", new String[] { "simple_link.txt", "folder1/", "folder1/added.txt", "folder1/changed.txt", 
        	"folder1/subfolder/", "folder1/subfolder/real_resource.txt",});
        IProject projectB = createProject(getName() + "_B", new String[] { "real_changed.txt", "real_deleted.txt"});
        
        IPath target = projectA.getLocation();
        projectA.close(getMonitor());
        
        createLink(projectB, "folder1/", target.append("folder1"));
        createLink(projectB, "folder1/subfolder/simple_link.txt", target.append("simple_link.txt"));
		commitProject(projectB);
		
		// Perform some operations on the copy and commit
		IProject copy = checkoutCopy(projectB, "-copy");
		addResources(copy, new String[] { "folder1/added.txt" }, false);
		changeResources(copy, new String[] {"folder1/changed.txt", "folder1/subfolder/simple_link.txt"}, false);
		commitResources(copy, true);
		
		// Tag the original, checkout the tag and compare with original
		CVSTag v1Tag = new CVSTag("v1", CVSTag.VERSION);
		tagProject(projectB, v1Tag, false);
		
		projectA.open(getMonitor());
		projectA.refreshLocal(IResource.DEPTH_INFINITE, getMonitor());
		assertFileContainsTag(projectA, "simple_link.txt", "v1");
		assertFileContainsTag(projectA, "folder1/added.txt", "v1");
		assertFileContainsTag(projectA, "folder1/changed.txt", "v1");
	}

	private void assertFileContainsTag(IProject projectA, String filePath,
			String version) throws TeamException {
		IFile file = projectA.getFile(Path.fromPortableString(filePath));
		ILogEntry[] entries = CVSWorkspaceRoot.getCVSFileFor(file).getLogEntries(getMonitor());
		assertTrue("tagged entry is not null", entries != null && (entries.length > 0));
		
		boolean found = false;
		for (int i = 0; i < entries.length; i++) {
			CVSTag[] tags = entries[0].getTags();
			for (int j = 0; j < tags.length; j++) {
				if (tags[j].getName().equals(version))
					found = true;
			}
		}
		assertTrue("file is tagged", found);
	}
}

Lines 16-29 Link Here

(-)src/org/eclipse/team/tests/ccvs/ui/CommitSetTests.java (-2 / +7 lines)
16		16
17	import junit.framework.Test;	17	import junit.framework.Test;
18		18
19	import org.eclipse.core.resources.*;	19	import org.eclipse.core.resources.IFile;
		20	import org.eclipse.core.resources.IProject;
		21	import org.eclipse.core.resources.IResource;
20	import org.eclipse.core.runtime.CoreException;	22	import org.eclipse.core.runtime.CoreException;
21	import org.eclipse.core.runtime.IPath;	23	import org.eclipse.core.runtime.IPath;
22	import org.eclipse.swt.widgets.Display;	24	import org.eclipse.swt.widgets.Display;
23	import org.eclipse.team.core.TeamException;	25	import org.eclipse.team.core.TeamException;
24	import org.eclipse.team.internal.ccvs.core.CVSException;	26	import org.eclipse.team.internal.ccvs.core.CVSException;
25	import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;	27	import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
26	import org.eclipse.team.internal.core.subscribers.*;	28	import org.eclipse.team.internal.core.subscribers.ActiveChangeSet;
		29	import org.eclipse.team.internal.core.subscribers.ActiveChangeSetManager;
		30	import org.eclipse.team.internal.core.subscribers.ChangeSet;
		31	import org.eclipse.team.internal.core.subscribers.IChangeSetChangeListener;
27	import org.eclipse.team.tests.ccvs.core.EclipseTest;	32	import org.eclipse.team.tests.ccvs.core.EclipseTest;
28		33
29	/**	34	/**

Return to bug 41929

Lines 13-20 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/client/Command.java (-7 / +9 lines)
13		13
14	import java.util.*;	14	import java.util.*;
15		15
16	import org.eclipse.core.resources.IFile;	16	import org.eclipse.core.filesystem.URIUtil;
17	import org.eclipse.core.resources.IResource;	17	import org.eclipse.core.resources.*;
18	import org.eclipse.core.runtime.*;	18	import org.eclipse.core.runtime.*;
19	import org.eclipse.osgi.util.NLS;	19	import org.eclipse.osgi.util.NLS;
20	import org.eclipse.team.internal.ccvs.core.*;	20	import org.eclipse.team.internal.ccvs.core.*;
Lines 309-319 Link Here
309	// print the invocation string to the console	309	// print the invocation string to the console
310	if (session.isOutputToConsole() \|\| Policy.isDebugProtocol()) {	310	if (session.isOutputToConsole() \|\| Policy.isDebugProtocol()) {
311	IPath commandRootPath;	311	IPath commandRootPath;
312	IResource resource = session.getLocalRoot().getIResource();	312	commandRootPath = session.getLocalRoot().getLocation();
313	if (resource == null) {	313	if (commandRootPath == null)
314	commandRootPath = Path.EMPTY;	314	commandRootPath = Path.EMPTY;
315	} else {	315	else {
316	commandRootPath = resource.getFullPath();	316	IContainer[] containers = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocationURI(URIUtil.toURI(commandRootPath));
		317	if (containers.length > 0)
		318	commandRootPath = containers[0].getFullPath();
317	}	319	}
318	String line = constructCommandInvocationString(commandRootPath, gOptions, lOptions, arguments);	320	String line = constructCommandInvocationString(commandRootPath, gOptions, lOptions, arguments);
319	ConsoleListeners.getInstance().commandInvoked(session, line);	321	ConsoleListeners.getInstance().commandInvoked(session, line);

Added Link Here

(-)src/org/eclipse/team/internal/ccvs/core/resources/CVSFileSystemRoot.java (+42 lines)
1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.team.internal.ccvs.core.resources;
12
13	import org.eclipse.core.runtime.IPath;
14	import org.eclipse.team.core.RepositoryProvider;
15	import org.eclipse.team.internal.ccvs.core.*;
16
17	/**
18	* This class provides static methods for checking out projects from a repository
19	* into the local file system (not necessarily mappable to a workspace resource)
20	* and for converting IPaths into CVSRespources and sync trees.
21	* Instances of this class represent a local workspace root (i.e. a project).
22	*/
23	public class CVSFileSystemRoot {
24
25	public CVSFileSystemRoot(){
26	}
27
28	public static ICVSFolder getCVSFolderFor(IPath resource, RepositoryProvider repositoryProvider) {
29	return new FileSystemFolder(resource, repositoryProvider);
30	}
31
32	public static ICVSFile getCVSFileFor(IPath resource, RepositoryProvider repositoryProvider) {
33	return new FileSystemFile(resource, repositoryProvider);
34	}
35
36	public static ICVSResource getCVSResourceFor(IPath resource, RepositoryProvider repositoryProvider) {
37	if (resource.toFile().isFile())
38	return getCVSFileFor(resource, repositoryProvider);
39	else
40	return getCVSFolderFor(resource, repositoryProvider);
41	}
42	}

Added Link Here

(-)src/org/eclipse/team/internal/ccvs/core/resources/FileSystemFolder.java (+363 lines)
1	/*******************************************************************************
2	* Copyright (c) 2000, 2006 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.team.internal.ccvs.core.resources;
12
13	import java.io.File;
14	import java.util.ArrayList;
15	import java.util.List;
16
17	import org.eclipse.core.filesystem.*;
18	import org.eclipse.core.filesystem.URIUtil;
19	import org.eclipse.core.resources.*;
20	import org.eclipse.core.runtime.*;
21	import org.eclipse.osgi.util.NLS;
22	import org.eclipse.team.core.RepositoryProvider;
23	import org.eclipse.team.internal.ccvs.core.*;
24	import org.eclipse.team.internal.ccvs.core.client.Session;
25	import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;
26	import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
27	import org.eclipse.team.internal.ccvs.core.util.Util;
28
29	/**
30	* Implements the ICVSFolder interface on top of an
31	* instance of the ICVSFolder interface
32	*
33	* @see ICVSFolder
34	*/
35	class FileSystemFolder extends FileSystemResource implements ICVSFolder {
36
37	protected FileSystemFolder(IPath resource, RepositoryProvider repositoryProvider) {
38	super(resource, repositoryProvider);
39	}
40
41	/**
42	* @see ICVSFolder#members(int)
43	*/
44	public ICVSResource[] members(int flags) throws CVSException {
45	final List result = new ArrayList();
46	File resources[] = resource.toFile().listFiles();
47	boolean includeFiles = (((flags & FILE_MEMBERS) != 0) \|\| ((flags & (FILE_MEMBERS \| FOLDER_MEMBERS)) == 0));
48	boolean includeFolders = (((flags & FOLDER_MEMBERS) != 0) \|\| ((flags & (FILE_MEMBERS \| FOLDER_MEMBERS)) == 0));
49	boolean includeManaged = (((flags & MANAGED_MEMBERS) != 0) \|\| ((flags & (MANAGED_MEMBERS \| UNMANAGED_MEMBERS \| IGNORED_MEMBERS)) == 0));
50	boolean includeUnmanaged = (((flags & UNMANAGED_MEMBERS) != 0) \|\| ((flags & (MANAGED_MEMBERS \| UNMANAGED_MEMBERS \| IGNORED_MEMBERS)) == 0));
51	boolean includeIgnored = ((flags & IGNORED_MEMBERS) != 0);
52	boolean includeExisting = (((flags & EXISTING_MEMBERS) != 0) \|\| ((flags & (EXISTING_MEMBERS \| PHANTOM_MEMBERS)) == 0));
53	boolean includePhantoms = (((flags & PHANTOM_MEMBERS) != 0) \|\| ((flags & (EXISTING_MEMBERS \| PHANTOM_MEMBERS)) == 0));
54	for (int i = 0; i < resources.length; i++) {
55	File resource = resources[i];
56	if ((includeFiles && resource.isFile())
57	\|\| (includeFolders && resource.isDirectory())) {
58	boolean exists = resource.exists();
59	if ((includeExisting && exists) \|\| (includePhantoms && !exists)) {
60	ICVSResource cvsResource = CVSFileSystemRoot.getCVSResourceFor(new Path(resource.getAbsolutePath()), repositoryProvider);
61	boolean includeResource = false;
62	if ((includeManaged && includeUnmanaged && includeIgnored)) {
63	includeResource = true;
64	} else {
65	boolean isManaged = cvsResource.isManaged();
66	if (isManaged && includeManaged) {
67	includeResource = true;
68	} else if (exists) {
69	boolean isIgnored = cvsResource.isIgnored();
70	if (isIgnored && includeIgnored) {
71	includeResource = true;
72	} else if (! isManaged && ! isIgnored && includeUnmanaged) {
73	includeResource = true;
74	}
75	}
76	}
77	if (includeResource) {
78	result.add(cvsResource);
79	}
80	}
81	}
82	}
83	return (ICVSResource[]) result.toArray(new ICVSResource[result.size()]);
84	}
85
86	public boolean isManaged() throws CVSException {
87	boolean result = super.isManaged();
88	if (!result) {
89	FolderSyncInfo info = getFolderSyncInfo();
90	if (info != null) // returns true is this is the root of the file system CVS repository
91	result = info.getRepository().equals(resource.lastSegment());
92	}
93	return result;
94	}
95
96	/**
97	* @see ICVSFolder#createFolder(String)
98	*/
99	public ICVSFolder getFolder(String name) throws CVSException {
100	if ((CURRENT_LOCAL_FOLDER.equals(name)) \|\| ((CURRENT_LOCAL_FOLDER + SEPARATOR).equals(name)))
101	return this;
102	IPath folderLocation = resource.append(name);
103	IProject project = repositoryProvider.getProject();
104	if (project != null) {
105	IContainer[]folders = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocationURI(URIUtil.toURI(folderLocation));
106	if (folders.length > 0) {
107	for (int i = 0; i < folders.length; i++) {
108	if (folders[i].getProject().equals(project))
109	return new EclipseFolder(folders[i]);
110	}
111	}
112	}
113	return new FileSystemFolder(folderLocation, repositoryProvider);
114	}
115
116	/**
117	* @see ICVSFolder#createFile(String)
118	*/
119	public ICVSFile getFile(String name) throws CVSException {
120	IPath fileLocation = resource.append(name);
121	IProject project = repositoryProvider.getProject();
122	if (project != null) {
123	IFile[]files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(URIUtil.toURI(fileLocation));
124	if (files.length > 0) {
125	for (int i = 0; i < files.length; i++) {
126	if (files[i].exists() && files[i].getProject().equals(project))
127	return new EclipseFile(files[i]);
128	}
129	}
130	}
131	return new FileSystemFile(fileLocation, repositoryProvider);
132	}
133
134	/**
135	* @see ICVSFolder#mkdir()
136	*/
137	public void mkdir() throws CVSException {
138	resource.toFile().mkdir();
139	// EclipseSynchronizer.getInstance().created(resource);;
140	}
141
142	/**
143	* @see ICVSResource#isFolder()
144	*/
145	public boolean isFolder() {
146	return true;
147	}
148
149	/**
150	* @see ICVSFolder#acceptChildren(ICVSResourceVisitor)
151	*/
152	public void acceptChildren(ICVSResourceVisitor visitor) throws CVSException {
153
154	// Visit files and then folders
155	ICVSResource[] subFiles = members(FILE_MEMBERS);
156	for (int i=0; i<subFiles.length; i++) {
157	subFiles[i].accept(visitor);
158	}
159	ICVSResource[] subFolders = members(FOLDER_MEMBERS);
160	for (int i=0; i<subFolders.length; i++) {
161	subFolders[i].accept(visitor);
162	}
163	}
164
165	/**
166	* @see ICVSResource#accept(ICVSResourceVisitor)
167	*/
168	public void accept(ICVSResourceVisitor visitor) throws CVSException {
169	visitor.visitFolder(this);
170	}
171
172	/**
173	* @see ICVSResource#accept(ICVSResourceVisitor, boolean)
174	*/
175	public void accept(ICVSResourceVisitor visitor, boolean recurse) throws CVSException {
176	visitor.visitFolder(this);
177	ICVSResource[] resources;
178	if (recurse) {
179	resources = members(ICVSFolder.ALL_MEMBERS);
180	} else {
181	resources = members(ICVSFolder.FILE_MEMBERS);
182	}
183	for (int i = 0; i < resources.length; i++) {
184	resources[i].accept(visitor, recurse);
185	}
186	}
187
188	/**
189	* @see ICVSResource#getRemoteLocation(ICVSFolder)
190	*/
191	public String getRemoteLocation(ICVSFolder stopSearching) throws CVSException {
192
193	if (getFolderSyncInfo() != null) {
194	return getFolderSyncInfo().getRemoteLocation();
195	}
196
197	ICVSFolder parent = getParent();
198	if(parent!=null && !equals(stopSearching)) {
199	String parentLocation;
200	parentLocation = parent.getRemoteLocation(stopSearching);
201	if (parentLocation!=null) {
202	return parentLocation + SEPARATOR + getName();
203	}
204	}
205	return null;
206	}
207
208	/*
209	* @see ICVSFolder#getFolderInfo()
210	*/
211	public FolderSyncInfo getFolderSyncInfo() throws CVSException {
212	return EclipseSynchronizer.getInstance().getFolderSync(resource);
213	}
214
215	/*
216	* @see ICVSFolder#setFolderInfo(FolderSyncInfo)
217	*/
218	public void setFolderSyncInfo(final FolderSyncInfo folderInfo) throws CVSException {
219	// ignore folder sync on the root (i.e. CVSROOT/config/TopLevelAdmin=yes but we just ignore it)
220	if (resource.isRoot()) return;
221	run(new ICVSRunnable() {
222	public void run(IProgressMonitor monitor) throws CVSException {
223	EclipseSynchronizer synchronizer = EclipseSynchronizer.getInstance();
224	IResource workspaceResource = getIResource();
225	if (workspaceResource != null)
226	synchronizer.setFolderSync((IContainer)workspaceResource, folderInfo);
227	else
228	synchronizer.setFolderSync(resource, folderInfo);
229	// the server won't add directories as sync info, therefore it must be done when
230	// a directory is shared with the repository.
231	byte[] newSyncBytes = new ResourceSyncInfo(getName()).getBytes();
232	byte[] oldSyncBytes = getSyncBytes();
233	// only set the bytes if the new differs from the old.
234	// this avoids unnecessary saving of sync files
235	if (oldSyncBytes == null \|\| ! Util.equals(newSyncBytes, oldSyncBytes))
236	setSyncBytes(newSyncBytes);
237	}
238	}, null);
239
240	}
241
242	/*
243	* @see ICVSFolder#isCVSFolder()
244	*/
245	public boolean isCVSFolder() throws CVSException {
246	return EclipseSynchronizer.getInstance().getFolderSync(resource) != null;
247	}
248
249	/*
250	* @see ICVSResource#unmanage()
251	*/
252	public void unmanage(IProgressMonitor monitor) throws CVSException {
253	run(new ICVSRunnable() {
254	public void run(IProgressMonitor monitor) throws CVSException {
255	monitor = Policy.monitorFor(monitor);
256	monitor.beginTask(null, 100);
257	recursiveUnmanage(resource.toFile(), Policy.subMonitorFor(monitor, 99));
258	FileSystemFolder.super.unmanage(Policy.subMonitorFor(monitor, 1));
259	monitor.done();
260	}
261	}, Policy.subMonitorFor(monitor, 99));
262	}
263
264	/* private */ static void recursiveUnmanage(File container, IProgressMonitor monitor) {
265	try {
266	monitor.beginTask(null, 10);
267	monitor.subTask(NLS.bind(CVSMessages.EclipseFolder_0, new String[] {container.getAbsolutePath()}));
268
269	File[] members = container.listFiles();
270	for (int i = 0; i < members.length; i++) {
271	monitor.worked(1);
272	File resource = members[i];
273	if (resource.isFile()) {
274	if (!resource.canWrite()) {
275	try {
276	IFileStore fileStore = EFS.getStore(resource.toURI());
277	if (fileStore != null) {
278	IFileInfo fileInfo = fileStore.fetchInfo();
279	if (fileInfo != null)
280	fileInfo.setAttribute(EFS.ATTRIBUTE_READ_ONLY, false);
281	}
282	} catch (CoreException e) {
283	CVSException.wrapException(e);
284	}
285	}
286	} else {
287	recursiveUnmanage(resource, monitor);
288	}
289	}
290	} finally {
291	monitor.done();
292	}
293	}
294
295	/*
296	* @see ICVSResource#isIgnored()
297	*/
298	public boolean isIgnored() throws CVSException {
299	if(isCVSFolder()) {
300	return false;
301	}
302	return super.isIgnored();
303	}
304
305	/*
306	* @see ICVSFolder#getChild(String)
307	*/
308	public ICVSResource getChild(String namedPath) throws CVSException {
309	if (namedPath.equals(Session.CURRENT_LOCAL_FOLDER)) {
310	return this;
311	}
312	IPath newPath = resource.append(namedPath);
313	if(newPath.toFile().isFile())
314	return getFile(namedPath);
315	else
316	return new FileSystemFolder(newPath, repositoryProvider);
317	}
318
319	/**
320	* @see ICVSFolder#fetchChildren(IProgressMonitor)
321	*/
322	public ICVSResource[] fetchChildren(IProgressMonitor monitor) throws CVSException {
323	return members(FILE_MEMBERS \| FOLDER_MEMBERS);
324	}
325	/**
326	* @see org.eclipse.team.internal.ccvs.core.ICVSResource#delete()
327	*/
328	public void delete() throws CVSException {
329	if (!exists()) return;
330	resource.toFile().delete();
331	}
332
333	/**
334	* Assumption this is only called from decorator and isIgnored() is purposely
335	* omitted here for performance reasons.
336	*/
337	public boolean isModified(IProgressMonitor monitor) throws CVSException {
338	return false;
339	}
340
341	public void handleModification(boolean forAddition) throws CVSException {
342	// For non-additions, we are only interested in sync info changes
343	if (isIgnored() \|\| !forAddition) return;
344
345	// the folder is an addition.
346	FolderSyncInfo info = getFolderSyncInfo();
347	// if the folder has sync info, it was handled is setFolderInfo
348	// otherwise, flush the ancestors to recalculate
349	if (info == null) {
350	EclipseSynchronizer.getInstance().setDirtyIndicator(getIResource(), true);
351	}
352	}
353
354	/* (non-Javadoc)
355	* @see org.eclipse.team.internal.ccvs.core.ICVSResource#getRepositoryRelativePath()
356	*/
357	public String getRepositoryRelativePath() throws CVSException {
358	FolderSyncInfo info = getFolderSyncInfo();
359	if (info == null) return null;
360	// The REPOSITORY property of the folder info is the repository relative path
361	return info.getRepository();
362	}
363	}

Lines 130-150 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/operations/BranchOperation.java (-7 / +11 lines)
130	}	130	}
131	}	131	}
132		132
133	private void makeBranch(CVSTeamProvider provider, IResource[] resources, final CVSTag versionTag, final CVSTag branchTag, boolean moveToBranch, boolean recurse, IProgressMonitor monitor) throws TeamException {	133	private void makeBranch(final CVSTeamProvider provider, IResource[] resources, final CVSTag versionTag, final CVSTag branchTag, boolean moveToBranch, boolean recurse, final IProgressMonitor monitor) throws TeamException {
134		134
135	// Determine the total amount of work	135	// Determine the total amount of work
136	int totalWork = (versionTag!= null ? 60 : 40) + (moveToBranch ? 20 : 0);	136	int totalWork = (versionTag!= null ? 60 : 40) + (moveToBranch ? 20 : 0);
137	monitor.beginTask(CVSUIMessages.CVSTeamProvider_makeBranch, totalWork);	137	monitor.beginTask(CVSUIMessages.CVSTeamProvider_makeBranch, totalWork);
138	try {	138	try {
139	// Build the arguments list	139	// Build the arguments list
		140	LocalRootRunnable runnable = new LocalRootRunnable() {
		141	public void executeSession(ICVSFolder localRoot, IResource resources[], boolean recurse) throws CVSException, InterruptedException, CVSServerException {
140	ICVSResource[] arguments = getCVSArguments(resources);	142	ICVSResource[] arguments = getCVSArguments(resources);
141	LocalOption[] localOptions = getLocalOptions(recurse);	143	LocalOption[] localOptions = getLocalOptions(recurse);
142
143	// Tag the remote resources	144	// Tag the remote resources
144	IStatus status = null;	145	IStatus status = null;
145	if (versionTag != null) {	146	if (versionTag != null) {
146	// Version using a custom tag command that skips added but not commited reesources	147	// Version using a custom tag command that skips added but not commited reesources
147	Session session = new Session(getRemoteLocation(provider), getLocalRoot(provider), true /* output to console */);	148	Session session = new Session(getRemoteLocation(provider),localRoot, true /* output to console */);
148	session.open(Policy.subMonitorFor(monitor, 5), true /* open for modification */);	149	session.open(Policy.subMonitorFor(monitor, 5), true /* open for modification */);
149	try {	150	try {
150	status = Command.CUSTOM_TAG.execute(	151	status = Command.CUSTOM_TAG.execute(
Lines 160-166 Link Here
160	}	161	}
161	if (status.isOK()) {	162	if (status.isOK()) {
162	// Branch using the tag	163	// Branch using the tag
163	session = new Session(getRemoteLocation(provider), getLocalRoot(provider), true /* output to console */);	164	session = new Session(getRemoteLocation(provider), localRoot, true /* output to console */);
164	session.open(Policy.subMonitorFor(monitor, 5), true /* open for modification */);	165	session.open(Policy.subMonitorFor(monitor, 5), true /* open for modification */);
165	try {	166	try {
166	status = Command.CUSTOM_TAG.execute(	167	status = Command.CUSTOM_TAG.execute(
Lines 177-183 Link Here
177	}	178	}
178	} else {	179	} else {
179	// Just branch using tag	180	// Just branch using tag
180	Session session = new Session(getRemoteLocation(provider), getLocalRoot(provider), true /* output to console */);	181	Session session = new Session(getRemoteLocation(provider), localRoot, true /* output to console */);
181	session.open(Policy.subMonitorFor(monitor, 5), true /* open for modification */);	182	session.open(Policy.subMonitorFor(monitor, 5), true /* open for modification */);
182	try {	183	try {
183	status = Command.CUSTOM_TAG.execute(	184	status = Command.CUSTOM_TAG.execute(
Lines 191-207 Link Here
191	} finally {	192	} finally {
192	session.close();	193	session.close();
193	}	194	}
194
195	}	195	}
196	if ( ! status.isOK()) {	196	if ( ! status.isOK()) {
197	throw new CVSServerException(status);	197	throw new CVSServerException(status);
198	}	198	}
199		199	}
		200	};
		201	runnable.run(getLocalRoot(provider), resources, recurse);
200	// Set the tag of the local resources to the branch tag (The update command will not	202	// Set the tag of the local resources to the branch tag (The update command will not
201	// properly update "cvs added" and "cvs removed" resources so a custom visitor is used	203	// properly update "cvs added" and "cvs removed" resources so a custom visitor is used
202	if (moveToBranch) {	204	if (moveToBranch) {
203	setTag(provider, resources, branchTag, recurse, Policy.subMonitorFor(monitor, 20));	205	setTag(provider, resources, branchTag, recurse, Policy.subMonitorFor(monitor, 20));
204	}	206	}
		207	} catch (InterruptedException e) {
		208	CVSException.wrapException(e);
205	} finally {	209	} finally {
206	monitor.done();	210	monitor.done();
207	}	211	}

Added Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/operations/LocalRootRunnable.java (+395 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.team.internal.ccvs.ui.operations;
12
13	import java.util.*;
14
15	import org.eclipse.core.resources.IContainer;
16	import org.eclipse.core.resources.IResource;
17	import org.eclipse.core.runtime.*;
18	import org.eclipse.core.runtime.Status;
19	import org.eclipse.osgi.util.NLS;
20	import org.eclipse.team.internal.ccvs.core.*;
21	import org.eclipse.team.internal.ccvs.core.client.*;
22	import org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener;
23	import org.eclipse.team.internal.ccvs.core.connection.CVSServerException;
24	import org.eclipse.team.internal.ccvs.core.resources.CVSFileSystemRoot;
25	import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
26	import org.eclipse.team.internal.ccvs.ui.Policy;
27
28	public class LocalRootRunnable {
29
30	private CVSTeamProvider provider;
31
32	public LocalRootRunnable() {
33	super();
34	}
35
36	public LocalRootRunnable(CVSTeamProvider provider) {
37	super();
38	this.provider = provider;
39	}
40
41	protected void executeSession(ICVSFolder localRoot, IResource resources[], boolean recurse) throws CVSException, InterruptedException, CVSServerException {}
42
43	protected void executeSession(ICVSFolder localRoot, ICVSResource resources[], boolean recurse) throws CVSException, InterruptedException, CVSServerException {}
44
45	protected IStatus executeSessionWithStatus(ICVSFolder localRoot, IResource resources[], boolean recurse) throws CVSException, InterruptedException, CVSServerException {return Status.OK_STATUS;}
46
47	protected IStatus executeSessionWithStatus(ICVSFolder localRoot, ICVSResource resources[], boolean recurse) throws CVSException, InterruptedException, CVSServerException {return Status.OK_STATUS;}
48
49	private static class Root
50	{
51	public Root(ICVSFolder localRoot, List resources, boolean recurse) {
52	super();
53	this.localRoot = localRoot;
54	this.resources = resources;
55	this.recurse = recurse;
56	}
57	ICVSFolder localRoot;
58	List resources; // either IResource or ICVSResource
59	boolean recurse;
60
61	public boolean contains(Root newRoot) {
62	if (localRoot.getClass().equals(newRoot.localRoot.getClass()) && (recurse == newRoot.recurse))
63	return localRoot.getLocation().isPrefixOf(newRoot.localRoot.getLocation());
64	return false;
65	}
66
67	public void merge(Root root) {
68	ArrayList newList = new ArrayList(resources);
69	resources = newList;
70	resources.addAll(root.resources);
71	}
72	}
73
74	/*
75	* Represents either a IResource or ICVSResource
76	*/
77	private static class CommonResource {
78	IResource workspaceResource = null;
79	ICVSResource cvsResource = null;
80
81	public CommonResource(ICVSResource resource) {
82	cvsResource = resource;
83	}
84
85	public CommonResource(IResource resource) {
86	workspaceResource = resource;
87	}
88
89	public String toString() {
90	if (cvsResource != null)
91	return cvsResource.toString();
92	return workspaceResource.toString();
93	}
94
95	public boolean isFolder() {
96	if (cvsResource != null)
97	return cvsResource.isFolder();
98	return workspaceResource instanceof IContainer;
99	}
100
101	public IPath getLocation() {
102	if (cvsResource != null)
103	return cvsResource.getLocation();
104	return workspaceResource.getLocation();
105	}
106
107	public CommonResource[] members() throws CoreException {
108	if (cvsResource != null) {
109	ICVSResource[] resources = ((ICVSFolder) cvsResource).members(ICVSFolder.FILE_MEMBERS \| ICVSFolder.FOLDER_MEMBERS);
110	CommonResource[] result = new CommonResource[resources.length];
111	for (int i = 0; i < result.length; i++)
112	result[i] = new CommonResource(resources[i]);
113	return result;
114	}
115	IResource[] resources = ((IContainer) workspaceResource).members();
116	CommonResource[] result = new CommonResource[resources.length];
117	for (int i = 0; i < result.length; i++)
118	result[i] = new CommonResource(resources[i]);
119	return result;
120	}
121
122	public ICVSResource getCVSResource() {
123	if (cvsResource != null)
124	return cvsResource;
125	return CVSWorkspaceRoot.getCVSResourceFor(workspaceResource);
126	}
127	}
128
129	/*
130	* Returns the root that is sufficient to accommodate all resources to be committed.
131	* For example, if the local root's location is c:\foo\bar\, but the resource's location
132	* is c:\foo\other\res.txt, the common root will be 'c:\foo'
133	*/
134	private Root[] getCommonRoots(ICVSFolder localRoot,
135	IResource[] resources, boolean recurse) throws CVSException {
136	ArrayList/<Root>/ list = new ArrayList();
137	getCommonRoots(list, localRoot, toCommonRootArray(resources), recurse);
138	return (Root[]) list.toArray(new Root[0]);
139	}
140
141	private CommonResource[] toCommonRootArray(IResource[] resources) {
142	CommonResource[] result = new CommonResource[resources.length];
143	for (int i = 0;i < resources.length; i++)
144	result[i] = new CommonResource(resources[i]);
145	return result;
146	}
147
148	private Root[] getCommonRoots(ICVSFolder localRoot,
149	ICVSResource[] resources, boolean recurse) throws CVSException {
150	ArrayList/<Root>/ list = new ArrayList();
151	getCommonRoots(list, localRoot, toCommonRootArray(resources), recurse);
152	return (Root[]) list.toArray(new Root[0]);
153	}
154
155	private CommonResource[] toCommonRootArray(ICVSResource[] resources) {
156	CommonResource[] result = new CommonResource[resources.length];
157	for (int i = 0;i < resources.length; i++)
158	result[i] = new CommonResource(resources[i]);
159	return result;
160	}
161
162	private ICVSFolder selectAppropriateRoot(ICVSResource cvsResource)
163	throws CVSException {
164	ICVSFolder newRoot = null;
165	IPath location = cvsResource.getLocation();
166	if (!cvsResource.isFolder())
167	newRoot = cvsResource.getParent();
168	else
169	newRoot = (ICVSFolder) cvsResource;
170	while (newRoot != null && !newRoot.isCVSFolder() && newRoot.getLocation().isPrefixOf(location)) {
171	newRoot = newRoot.getParent();
172	}
173	if ( newRoot != null && (!newRoot.isCVSFolder() \|\| !newRoot.getLocation().isPrefixOf(location)))
174	newRoot = null;
175	return newRoot;
176	}
177
178	private boolean isCVSResource(ICVSResource cvsResource) throws CVSException {
179	ICVSFolder root = null;
180	if (!cvsResource.isFolder())
181	root = cvsResource.getParent();
182	else
183	root = (ICVSFolder) cvsResource;
184
185	while (root != null && !root.isCVSFolder() && root.getLocation().isPrefixOf(cvsResource.getLocation())) {
186	root = root.getParent();
187	}
188
189	return !(root == null);
190	}
191
192	/*
193	* Returns true if the root was changed
194	*/
195	private boolean getCommonRoots(ArrayList list, ICVSFolder localRoot,
196	CommonResource[] resources, boolean recurse) throws CVSException {
197	boolean wasChanged = false;
198	IPath rootLocation = localRoot.getLocation();
199	if (rootLocation != null) {
200	ArrayList/<CommonResource>/ notAdded = new ArrayList();
201	Vector notCVS = new Vector();
202	for (int i = 0; i < resources.length; i++) {
203	boolean added = false;
204	boolean isCVS = true;
205	IPath location = resources[i].getLocation();
206	if (location != null) {
207	if (!rootLocation.isPrefixOf(location)) {
208	// first, try to get the root as the resource itself, and its immediate workspace parents.
209	CommonResource cvsResource = resources[i];
210	if (isCVSResource(cvsResource.getCVSResource())) {
211	ICVSFolder newRoot = null;
212	newRoot = selectAppropriateRoot(cvsResource.getCVSResource());
213
214	if (newRoot == null) {
215	// create FileSystem Parent Resources.
216	cvsResource = new CommonResource(CVSFileSystemRoot.getCVSResourceFor(cvsResource.getLocation(), localRoot.getProvider()));
217	newRoot = selectAppropriateRoot(cvsResource.getCVSResource());
218	}
219	if (newRoot == null)
220	throw new CVSException(new CVSStatus(IStatus.ERROR,
221	CVSMessages.CVSRepositoryLocation_mixedRepository));
222	added = true;
223	wasChanged = true;
224	getCommonChildrenRoots(list, new CommonResource[] {resources[i]}, recurse, newRoot);
225	} else {
226	notCVS.add(resources[i]);
227	isCVS = false;
228	}
229	}
230	}
231	if (!added && isCVS)
232	notAdded.add(resources[i]);
233	}
234	if (!notAdded.isEmpty())
235	wasChanged \|= getCommonChildrenRoots(list, (CommonResource[]) notAdded.toArray(new CommonResource[0]), recurse, localRoot);
236
237	// write to log the files that are located somewhere not under cvs root
238	if (!notCVS.isEmpty()) {
239	if (provider != null) {
240	Session session = new Session(provider.getCVSWorkspaceRoot().getRemoteLocation(), localRoot, true);
241	session.open(Policy.subMonitorFor(null, 2), true /* open for modification */);
242	try {
243	ICommandOutputListener listener = new CommandOutputListener();
244	for (int i = 0; i < notCVS.size(); i++){
245	CommonResource cvsResource = (CommonResource) notCVS.get(i);
246	String argument = NLS.bind(CVSMessages.Resource_not_in_CVS,
247	new String[] {cvsResource.getCVSResource().getRelativePath(localRoot),
248	cvsResource.getLocation().toString()});
249	IStatus status = listener.messageLine(argument, session.getCVSRepositoryLocation(), session.getLocalRoot(), null);
250	session.addError(status); // The session ignores OK status
251	ConsoleListeners.getInstance().messageLineReceived(session, argument, status);
252	}
253	} finally {
254	session.close();
255	}
256	}
257	}
258	}
259	else
260	wasChanged = getCommonChildrenRoots(list, resources, recurse, localRoot);
261	return wasChanged;
262	}
263
264	private boolean getCommonChildrenRoots(ArrayList list,
265	CommonResource[] resources, boolean recurse, ICVSFolder newRoot)
266	throws CVSException {
267	boolean wasChanged = false;
268	if (recurse) {
269	boolean hadFolderChildren = false;
270	ArrayList/<CommonResource>/ notAdded = new ArrayList();
271	for (int i = 0; i < resources.length; i++) {
272	CommonResource resource = resources[i];
273	if (resource.isFolder()) {
274	hadFolderChildren = true;
275	try {
276	CommonResource[] resChildren = null;
277	try {
278	resChildren = resource.members();
279	} catch (CoreException e) {
280	addToList(list, new Root(newRoot, Arrays.asList(new CommonResource[] {resource}), true));
281	}
282	if (resChildren != null) {
283	ArrayList childrenList = new ArrayList();
284	boolean changed = getCommonRoots(childrenList, newRoot, resChildren, true);
285	if (changed) {
286	list.addAll(childrenList);
287	recurse = false;
288	wasChanged = true;
289	}
290	else {
291	if (!newRoot.getLocation().isPrefixOf(resource.getLocation())) {
292	ICVSFolder localRoot = selectAppropriateRoot(newRoot);
293	addToList(list, new Root(localRoot, Arrays.asList(new CommonResource[] {resource}), true));
294	}
295	else
296	notAdded.add(resource);
297	}
298	}
299	} catch (CoreException e) {
300	throw CVSException.wrapException(e);
301	}
302	}
303	else
304	notAdded.add(resource);
305	}
306	if (!notAdded.isEmpty())
307	addToList(list, new Root(newRoot, notAdded, recurse && hadFolderChildren));
308	}
309	else
310	addToList(list, new Root(newRoot, Arrays.asList(resources), recurse));
311	return wasChanged;
312	}
313
314	private void addToList(ArrayList list, Root newRoot) {
315	Iterator it = list.iterator();
316	while (it.hasNext()) {
317	Root root = (Root) it.next();
318	if (root.contains(newRoot)) {
319	root.merge(newRoot);
320	return;
321	}
322	if (newRoot.contains(root)) {
323	newRoot.merge(root);
324	list.remove(root);
325	list.add(newRoot);
326	return;
327	}
328	}
329	list.add(newRoot);
330	}
331
332	public void run(ICVSFolder localRoot, IResource[] resources,
333	boolean recurse) throws CVSException, InterruptedException, CVSServerException {
334	Root commonRoots[] = getCommonRoots(localRoot, resources, recurse);
335	for (int i = 0; i < commonRoots.length; i++) {
336	IResource [] array = toIResourceArray(commonRoots[i].resources);
337	executeSession(commonRoots[i].localRoot, array, commonRoots[i].recurse);
338	}
339	}
340
341	public IStatus runWithStatus(ICVSFolder localRoot, IResource[] resources,
342	boolean recurse) throws CVSException, InterruptedException, CVSServerException {
343	Root commonRoots[] = getCommonRoots(localRoot, resources, recurse);
344	for (int i = 0; i < commonRoots.length; i++) {
345	IResource [] array = toIResourceArray(commonRoots[i].resources);
346	IStatus status = executeSessionWithStatus(commonRoots[i].localRoot, array, commonRoots[i].recurse);
347	if (!status.isOK())
348	return status;
349	}
350	return Status.OK_STATUS;
351	}
352
353	private IResource[] toIResourceArray(List resources) {
354	IResource[] result = new IResource[resources.size()];
355	Iterator it = resources.iterator();
356	int i = 0;
357	while (it.hasNext()) {
358	CommonResource commonRes = (CommonResource) it.next();
359	result[i++] = commonRes.workspaceResource;
360	}
361	return result;
362	}
363
364	public void run(ICVSFolder localRoot, ICVSResource[] resources,
365	boolean recurse) throws CVSException, InterruptedException, CVSServerException {
366	Root commonRoots[] = getCommonRoots(localRoot, resources, recurse);
367	for (int i = 0; i < commonRoots.length; i++) {
368	ICVSResource [] array = toICVSResourceArray(commonRoots[i].resources);
369	executeSession(commonRoots[i].localRoot, array, commonRoots[i].recurse);
370	}
371	}
372
373	public IStatus runWithStatus(ICVSFolder localRoot, ICVSResource[] resources,
374	boolean recurse) throws CVSException, InterruptedException, CVSServerException {
375	Root commonRoots[] = getCommonRoots(localRoot, resources, recurse);
376	for (int i = 0; i < commonRoots.length; i++) {
377	ICVSResource [] array = toICVSResourceArray(commonRoots[i].resources);
378	IStatus status = executeSessionWithStatus(commonRoots[i].localRoot, array, commonRoots[i].recurse);
379	if (!status.isOK())
380	return status;
381	}
382	return Status.OK_STATUS;
383	}
384
385	private ICVSResource[] toICVSResourceArray(List resources) {
386	ICVSResource[] result = new ICVSResource[resources.size()];
387	Iterator it = resources.iterator();
388	int i = 0;
389	while (it.hasNext()) {
390	CommonResource commonRes = (CommonResource) it.next();
391	result[i++] = commonRes.cvsResource;
392	}
393	return result;
394	}
395	}

Lines 27-33 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java (-8 / +4 lines)
27	import org.eclipse.team.core.mapping.provider.SynchronizationScopeManager;	27	import org.eclipse.team.core.mapping.provider.SynchronizationScopeManager;
28	import org.eclipse.team.internal.ccvs.core.*;	28	import org.eclipse.team.internal.ccvs.core.*;
29	import org.eclipse.team.internal.ccvs.core.client.Command;	29	import org.eclipse.team.internal.ccvs.core.client.Command;
30	import org.eclipse.team.internal.ccvs.core.client.Session;
31	import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;	30	import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
32	import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;	31	import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
33	import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;	32	import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
Lines 387-401 Link Here
387	/*	386	/*
388	* Get the arguments to be passed to a commit or update	387	* Get the arguments to be passed to a commit or update
389	*/	388	*/
390	protected String[] getStringArguments(IResource[] resources) throws CVSException {	389	protected String[] getStringArguments(ICVSFolder localRoot, IResource[] resources) throws CVSException {
391	List arguments = new ArrayList(resources.length);	390	List arguments = new ArrayList(resources.length);
392	for (int i=0;i<resources.length;i++) {	391	for (int i=0;i<resources.length;i++) {
393	IPath cvsPath = resources[i].getFullPath().removeFirstSegments(1);	392	ICVSResource res = CVSWorkspaceRoot.getCVSResourceFor(resources[i]);
394	if (cvsPath.segmentCount() == 0) {	393	String path = res.getRelativePath(localRoot);
395	arguments.add(Session.CURRENT_LOCAL_FOLDER);	394	arguments.add(path);
396	} else {
397	arguments.add(cvsPath.toString());
398	}
399	}	395	}
400	return (String[])arguments.toArray(new String[arguments.size()]);	396	return (String[])arguments.toArray(new String[arguments.size()]);
401	}	397	}