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
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
|
/*******************************************************************************
* Copyright (C) 2007, Dave Watson <dwatson@mimvista.com>
* Copyright (C) 2008, Robin Rosenberg <robin.rosenberg@dewire.com>
* Copyright (C) 2006, Shawn O. Pearce <spearce@spearce.org>
* Copyright (C) 2010, Jens Baumgart <jens.baumgart@sap.com>
* Copyright (C) 2010, 2011, Mathias Kinzler <mathias.kinzler@sap.com>
* Copyright (C) 2015, Stephan Hackstedt <stephan.hackstedt@googlemail.com>
*
* 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
*******************************************************************************/
package org.eclipse.egit.core.op;
import java.io.File;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.egit.core.Activator;
import org.eclipse.egit.core.internal.CoreText;
import org.eclipse.egit.core.internal.job.RuleUtil;
import org.eclipse.egit.core.internal.util.ProjectUtil;
import org.eclipse.jgit.api.CheckoutCommand;
import org.eclipse.jgit.api.CheckoutResult;
import org.eclipse.jgit.api.CheckoutResult.Status;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.CheckoutConflictException;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.treewalk.AbstractTreeIterator;
import org.eclipse.jgit.treewalk.FileTreeIterator;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.filter.AndTreeFilter;
import org.eclipse.jgit.treewalk.filter.PathSuffixFilter;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.eclipse.jgit.util.FileUtils;
import org.eclipse.osgi.util.NLS;
/**
* This class implements checkouts of a specific revision. A check is made that
* this can be done without data loss.
*/
public class BranchOperation extends BaseOperation {
private final String target;
private CheckoutResult result;
private boolean delete;
/**
* Construct a {@link BranchOperation} object for a {@link Ref}.
*
* @param repository
* @param target
* a {@link Ref} name or {@link RevCommit} id
*/
public BranchOperation(Repository repository, String target) {
this(repository, target, true);
}
/**
* Construct a {@link BranchOperation} object for a {@link Ref}.
*
* @param repository
* @param target
* a {@link Ref} name or {@link RevCommit} id
* @param delete
* true to delete missing projects on new branch, false to close
* them
*/
public BranchOperation(Repository repository, String target, boolean delete) {
super(repository);
this.target = target;
this.delete = delete;
}
@Override
public void execute(IProgressMonitor m) throws CoreException {
IWorkspaceRunnable action = new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor pm) throws CoreException {
SubMonitor progress = SubMonitor.convert(pm, 4);
preExecute(progress.newChild(1));
IProject[] missing = getMissingProjects(target, ProjectUtil
.getValidOpenProjects(repository));
progress.setTaskName(NLS.bind(
CoreText.BranchOperation_performingBranch, target));
progress.setWorkRemaining(missing.length > 0 ? 4 : 3);
if (missing.length > 0) {
SubMonitor closeMonitor = progress.newChild(1);
closeMonitor.setWorkRemaining(missing.length);
for (IProject project : missing) {
closeMonitor.subTask(MessageFormat.format(
CoreText.BranchOperation_closingMissingProject,
project.getName()));
project.close(closeMonitor.newChild(1));
}
}
CheckoutCommand co = new Git(repository).checkout();
co.setName(target);
try {
co.call();
} catch (CheckoutConflictException e) {
return;
} catch (JGitInternalException e) {
throw new CoreException(Activator.error(e.getMessage(), e));
} catch (GitAPIException e) {
throw new CoreException(Activator.error(e.getMessage(), e));
} finally {
BranchOperation.this.result = co.getResult();
}
if (result.getStatus() == Status.NONDELETED)
retryDelete(result.getUndeletedList());
progress.worked(1);
List<String> pathsToHandle = new ArrayList<String>();
pathsToHandle.addAll(co.getResult().getModifiedList());
pathsToHandle.addAll(co.getResult().getRemovedList());
pathsToHandle.addAll(co.getResult().getConflictList());
IProject[] refreshProjects = ProjectUtil
.getProjectsContaining(repository, pathsToHandle);
ProjectUtil.refreshValidProjects(refreshProjects, delete,
progress.newChild(1));
postExecute(progress.newChild(1));
}
};
// lock workspace to protect working tree changes
ResourcesPlugin.getWorkspace().run(action, getSchedulingRule(),
IWorkspace.AVOID_UPDATE, m);
}
@Override
public ISchedulingRule getSchedulingRule() {
return RuleUtil.getRule(repository);
}
/**
* @return the result of the operation
*/
public CheckoutResult getResult() {
return result;
}
void retryDelete(List<String> pathList) {
// try to delete, but for a short time only
long startTime = System.currentTimeMillis();
for (String path : pathList) {
if (System.currentTimeMillis() - startTime > 1000)
break;
File fileToDelete = new File(repository.getWorkTree(), path);
if (fileToDelete.exists())
try {
// Only files should be passed here, thus
// we ignore attempt to delete submodules when
// we switch to a branch without a submodule
if (!fileToDelete.isFile())
FileUtils.delete(fileToDelete, FileUtils.RETRY);
} catch (IOException e) {
// ignore here
}
}
}
/**
* Compute the current projects that will be missing after the given branch
* is checked out
*
* @param branch
* @param currentProjects
* @return non-null but possibly empty array of missing projects
*/
private IProject[] getMissingProjects(String branch,
IProject[] currentProjects) {
if (delete || currentProjects.length == 0)
return new IProject[0];
ObjectId targetTreeId;
ObjectId currentTreeId;
try {
targetTreeId = repository.resolve(branch + "^{tree}"); //$NON-NLS-1$
currentTreeId = repository.resolve(Constants.HEAD + "^{tree}"); //$NON-NLS-1$
} catch (IOException e) {
return new IProject[0];
}
if (targetTreeId == null || currentTreeId == null)
return new IProject[0];
Map<File, IProject> locations = new HashMap<File, IProject>();
for (IProject project : currentProjects) {
IPath location = project.getLocation();
if (location == null)
continue;
location = location
.append(IProjectDescription.DESCRIPTION_FILE_NAME);
locations.put(location.toFile(), project);
}
List<IProject> toBeClosed = new ArrayList<IProject>();
File root = repository.getWorkTree();
try (TreeWalk walk = new TreeWalk(repository)) {
walk.addTree(targetTreeId);
walk.addTree(currentTreeId);
walk.addTree(new FileTreeIterator(repository));
walk.setRecursive(true);
walk.setFilter(AndTreeFilter.create(PathSuffixFilter
.create(IProjectDescription.DESCRIPTION_FILE_NAME),
TreeFilter.ANY_DIFF));
while (walk.next()) {
AbstractTreeIterator targetIter = walk.getTree(0,
AbstractTreeIterator.class);
if (targetIter != null)
continue;
AbstractTreeIterator currentIter = walk.getTree(1,
AbstractTreeIterator.class);
AbstractTreeIterator workingIter = walk.getTree(2,
AbstractTreeIterator.class);
if (currentIter == null || workingIter == null)
continue;
IProject project = locations.get(new File(root, walk
.getPathString()));
if (project != null)
toBeClosed.add(project);
}
} catch (IOException e) {
return new IProject[0];
}
return toBeClosed.toArray(new IProject[toBeClosed.size()]);
}
}
|
