1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
|
/*******************************************************************************
* 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.client;
import java.util.Collection;
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.listeners.ICommandOutputListener;
public class Commit extends Command {
/*** Local options: specific to commit ***/
// Forces a file to be committed even if it has not been modified; implies -l.
// NOTE: This option is not fully supported -- a file will not be sent
// unless it is dirty. The primary use is to resend a file that may
// or may not be changed (e.g. could depend on CR/LF translations, etc...)
// and force the server to create a new revision and reply Checked-in.
public static final LocalOption FORCE = new LocalOption("-f"); //$NON-NLS-1$
protected Commit() { }
protected String getRequestId() {
return "ci"; //$NON-NLS-1$
}
/**
* Send all files under the workingFolder as changed files to
* the server.
*/
protected ICVSResource[] sendLocalResourceState(Session session, GlobalOption[] globalOptions,
LocalOption[] localOptions, ICVSResource[] resources, IProgressMonitor monitor)
throws CVSException {
// Get the folders we want to work on
checkResourcesManaged(session, resources);
// Send all changed files to the server
ModifiedFileSender visitor = new ModifiedFileSender(session, localOptions);
visitor.visit(session, resources, monitor);
// Send the changed files as arguments (because this is what other cvs clients do)
ICVSFile[] changedFiles = visitor.getModifiedFiles();
for (int i = 0; i < changedFiles.length; i++) {
// escape file names, see bug 149683
String fileName = changedFiles[i].getRelativePath(session.getLocalRoot());
if(fileName.startsWith("-")){ //$NON-NLS-1$
fileName = "./" + fileName; //$NON-NLS-1$
}
session.sendArgument(fileName);
}
return changedFiles;
}
/**
* On successful finish, prune empty directories if the -P or -D option was specified.
*/
protected IStatus commandFinished(Session session, GlobalOption[] globalOptions,
LocalOption[] localOptions, ICVSResource[] resources, IProgressMonitor monitor,
IStatus status) throws CVSException {
// If we didn't succeed, don't do any post processing
if (status.getCode() == CVSStatus.SERVER_ERROR) {
return status;
}
// If pruning is enable, prune empty directories after a commit
if (CVSProviderPlugin.getPlugin().getPruneEmptyDirectories()) {
new PruneFolderVisitor().visit(session, resources);
}
// Reset the timestamps of any committed files that are still dirty.
// Only do so if there were no E messages from the server
if (status.isOK()) {
for (int i = 0; i < resources.length; i++) {
ICVSResource resource = resources[i];
if (!resource.isFolder()) {
ICVSFile cvsFile = (ICVSFile)resources[i];
if (cvsFile.exists() && cvsFile.isModified(null)) {
status = mergeStatus(status, clearModifiedState(cvsFile));
}
}
}
}
return status;
}
protected IStatus clearModifiedState(ICVSFile cvsFile) throws CVSException {
byte[] info = cvsFile.getSyncBytes();
IResource resource = cvsFile.getIResource();
String filePath;
if (resource == null) {
filePath = cvsFile.getRepositoryRelativePath();
} else {
filePath = resource.getFullPath().toString();
}
if (info == null) {
// There should be sync info. Log the problem
return new Status(IStatus.WARNING, CVSProviderPlugin.ID, 0, NLS.bind(CVSMessages.Commit_syncInfoMissing, new String[] { filePath }), null);
}
cvsFile.checkedIn(null, true /* commit in progress */);
return new Status(IStatus.INFO, CVSProviderPlugin.ID, 0, NLS.bind(CVSMessages.Commit_timestampReset, new String[] { filePath }), null); //;
}
/**
* We do not want to send the arguments here, because we send
* them in sendRequestsToServer (special handling).
*/
protected void sendArguments(Session session, String[] arguments) throws CVSException {
}
public final IStatus execute(Session session, GlobalOption[] globalOptions, LocalOption[] localOptions,
ICVSResource[] arguments, Collection filesToCommitAsText,
ICommandOutputListener listener, IProgressMonitor pm) throws CVSException {
session.setTextTransferOverride(filesToCommitAsText);
try {
return super.execute(session, globalOptions, localOptions, arguments, listener, pm);
} finally {
session.setTextTransferOverride(null);
}
}
protected String getDisplayText() {
return "commit"; //$NON-NLS-1$
}
}
|
