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
|
/*******************************************************************************
* Copyright (c) 2010, 2015 SAP AG and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Mathias Kinzler <mathias.kinzler@sap.com> - initial implementation
* Laurent Delaigue (Obeo) - use of preferred merge strategy
* Stephan Hackstedt <stephan.hackstedt@googlemail.com> - Bug 477695
*******************************************************************************/
package org.eclipse.egit.core.op;
import org.eclipse.core.resources.IProject;
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.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.egit.core.Activator;
import org.eclipse.egit.core.EclipseGitProgressTransformer;
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.Git;
import org.eclipse.jgit.api.RebaseCommand;
import org.eclipse.jgit.api.RebaseCommand.InteractiveHandler;
import org.eclipse.jgit.api.RebaseCommand.Operation;
import org.eclipse.jgit.api.RebaseResult;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.merge.MergeStrategy;
/**
* This class implements rebase.
*/
public class RebaseOperation implements IEGitOperation {
private final Repository repository;
private final Ref ref;
private final Operation operation;
private RebaseResult result;
private final InteractiveHandler handler;
private boolean preserveMerges = false;
/**
* Construct a {@link RebaseOperation} object for a {@link Ref}.
* <p>
* Upon {@link #execute(IProgressMonitor)}, the current HEAD will be rebased
* onto the provided {@link Ref}
*
* @param repository
* the {@link Repository}
* @param ref
* the branch or tag
*/
public RebaseOperation(Repository repository, Ref ref) {
this(repository, ref, Operation.BEGIN, null);
}
/**
* Construct a {@link RebaseOperation} object for a {@link Ref}.
* <p>
* Upon {@link #execute(IProgressMonitor)}, the current HEAD will be rebased
* interactively onto the provided {@link Ref}
*
* @param repository
* the {@link Repository}
* @param ref
* the branch or tag
* @param handler
*/
public RebaseOperation(Repository repository, Ref ref,
InteractiveHandler handler) {
this(repository, ref, Operation.BEGIN, handler);
}
/**
* Used to abort, skip, or continue a stopped rebase operation that has been
* started before.
*
* @param repository
* the {@link Repository}
* @param operation
* one of {@link Operation#ABORT}, {@link Operation#CONTINUE},
* {@link Operation#SKIP}
*/
public RebaseOperation(Repository repository, Operation operation) {
this(repository, null, operation, null);
}
/**
* Used to abort, skip, or continue a stopped rebase interactive operation
* that has been started before.
*
* @param repository
* the {@link Repository}
* @param operation
* one of {@link Operation#ABORT}, {@link Operation#CONTINUE},
* {@link Operation#SKIP}
* @param handler
*/
public RebaseOperation(Repository repository, Operation operation,
InteractiveHandler handler) {
this(repository, null, operation, handler);
}
private RebaseOperation(Repository repository, Ref ref,
Operation operation, InteractiveHandler handler) {
this.repository = repository;
this.ref = ref;
this.operation = operation;
this.handler = handler;
}
@Override
public void execute(IProgressMonitor m) throws CoreException {
if (result != null)
throw new CoreException(new Status(IStatus.ERROR, Activator
.getPluginId(), CoreText.OperationAlreadyExecuted));
final IProject[] validProjects = ProjectUtil.getValidOpenProjects(repository);
IWorkspaceRunnable action = new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor actMonitor) throws CoreException {
SubMonitor progress = SubMonitor.convert(actMonitor, 2);
try (Git git = new Git(repository)) {
RebaseCommand cmd = git.rebase().setProgressMonitor(
new EclipseGitProgressTransformer(
progress.newChild(1)));
MergeStrategy strategy = Activator.getDefault()
.getPreferredMergeStrategy();
if (strategy != null) {
cmd.setStrategy(strategy);
}
if (handler != null) {
cmd.runInteractively(handler, true);
}
if (operation == Operation.BEGIN) {
cmd.setPreserveMerges(preserveMerges);
result = cmd.setUpstream(ref.getName()).call();
} else {
result = cmd.setOperation(operation).call();
}
} catch (JGitInternalException | GitAPIException e) {
throw new CoreException(Activator.error(e.getMessage(), e));
} finally {
if (refreshNeeded()) {
ProjectUtil.refreshValidProjects(validProjects,
progress.newChild(1));
}
}
}
};
ResourcesPlugin.getWorkspace().run(action, getSchedulingRule(),
IWorkspace.AVOID_UPDATE, m);
}
private boolean refreshNeeded() {
return result == null
|| result.getStatus() != RebaseResult.Status.UP_TO_DATE;
}
@Override
public ISchedulingRule getSchedulingRule() {
return RuleUtil.getRule(repository);
}
/**
* @return the result of calling {@link #execute(IProgressMonitor)}, or
* <code>null</code> if this has not been executed yet
*/
public RebaseResult getResult() {
return result;
}
/**
* @return the {@link Repository}
*/
public final Repository getRepository() {
return repository;
}
/**
* @return the {@link Operation} if it has been set, otherwise null
*/
public final Operation getOperation() {
return operation;
}
/**
* @param preserveMerges
* true to preserve merges during the rebase
*/
public void setPreserveMerges(boolean preserveMerges) {
this.preserveMerges = preserveMerges;
}
}
|
