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
|
/*******************************************************************************
* Copyright (c) 2010 SAP AG.
* Copyright (C) 2012, 2013 Tomasz Zarna <tzarna@gmail.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
*
* Contributors:
* Stefan Lay (SAP AG) - initial implementation
* Tomasz Zarna (IBM) - merge squash, bug 382720
*******************************************************************************/
package org.eclipse.egit.core.op;
import java.io.IOException;
import org.eclipse.core.resources.IProject;
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.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.egit.core.Activator;
import org.eclipse.egit.core.CoreText;
import org.eclipse.egit.core.internal.util.ProjectUtil;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.MergeCommand;
import org.eclipse.jgit.api.MergeCommand.FastForwardMode;
import org.eclipse.jgit.api.MergeResult;
import org.eclipse.jgit.api.errors.CheckoutConflictException;
import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.NoHeadException;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.merge.MergeStrategy;
import org.eclipse.osgi.util.NLS;
import org.eclipse.team.core.TeamException;
/**
* This class implements the merge of a ref with the current head
*
*/
public class MergeOperation implements IEGitOperation {
private final Repository repository;
private final String refName;
private MergeStrategy mergeStrategy;
private boolean squash;
private MergeResult mergeResult;
/**
* @param repository
* @param refName name of a commit which should be merged
*/
public MergeOperation(Repository repository, String refName) {
this.repository = repository;
this.refName = refName;
}
/**
* Create a MergeOperation object
* @param repository
* @param refName name of a commit which should be merged
* @param mergeStrategy the strategy to use for merge
*/
public MergeOperation(Repository repository, String refName,
String mergeStrategy) {
this.repository = repository;
this.refName = refName;
if (mergeStrategy != null)
this.mergeStrategy = MergeStrategy.get(mergeStrategy);
}
/**
* @param squash true to squash merge commits
*/
public void setSquash(boolean squash) {
this.squash = squash;
}
public void execute(IProgressMonitor m) throws CoreException {
if (mergeResult != null)
throw new CoreException(new Status(IStatus.ERROR, Activator
.getPluginId(), CoreText.OperationAlreadyExecuted));
IProgressMonitor monitor;
if (m == null)
monitor = new NullProgressMonitor();
else
monitor = m;
IWorkspaceRunnable action = new IWorkspaceRunnable() {
public void run(IProgressMonitor mymonitor) throws CoreException {
IProject[] validProjects = ProjectUtil.getValidOpenProjects(repository);
mymonitor.beginTask(NLS.bind(CoreText.MergeOperation_ProgressMerge, refName), 3);
Git git = new Git(repository);
mymonitor.worked(1);
MergeCommand merge;
try {
FastForwardMode ffmode = getFastForwardMode();
Ref ref = repository.getRef(refName);
if (ref != null)
merge = git.merge().include(ref).setFastForward(ffmode);
else
merge = git.merge()
.include(ObjectId.fromString(refName))
.setFastForward(ffmode);
} catch (IOException e) {
throw new TeamException(CoreText.MergeOperation_InternalError, e);
}
merge.setSquash(squash);
if (mergeStrategy != null) {
merge.setStrategy(mergeStrategy);
}
try {
mergeResult = merge.call();
mymonitor.worked(1);
if (MergeResult.MergeStatus.NOT_SUPPORTED.equals(mergeResult.getMergeStatus()))
throw new TeamException(new Status(IStatus.INFO, Activator.getPluginId(), mergeResult.toString()));
} catch (NoHeadException e) {
throw new TeamException(CoreText.MergeOperation_MergeFailedNoHead, e);
} catch (ConcurrentRefUpdateException e) {
throw new TeamException(CoreText.MergeOperation_MergeFailedRefUpdate, e);
} catch (CheckoutConflictException e) {
mergeResult = new MergeResult(e.getConflictingPaths());
return;
} catch (GitAPIException e) {
throw new TeamException(e.getLocalizedMessage(), e.getCause());
} finally {
ProjectUtil.refreshValidProjects(validProjects, new SubProgressMonitor(
mymonitor, 1));
mymonitor.done();
}
}
};
// lock workspace to protect working tree changes
ResourcesPlugin.getWorkspace().run(action, monitor);
}
private FastForwardMode getFastForwardMode() throws IOException {
FastForwardMode ffmode = FastForwardMode.valueOf(repository.getConfig()
.getEnum(ConfigConstants.CONFIG_KEY_MERGE, null,
ConfigConstants.CONFIG_KEY_FF,
FastForwardMode.Merge.TRUE));
ffmode = repository.getConfig().getEnum(
ConfigConstants.CONFIG_BRANCH_SECTION, repository.getBranch(),
ConfigConstants.CONFIG_KEY_MERGEOPTIONS, ffmode);
return ffmode;
}
/**
* @return the merge result, or <code>null</code> if this has not been
* executed or if an exception occurred
*/
public MergeResult getResult() {
return this.mergeResult;
}
public ISchedulingRule getSchedulingRule() {
return ResourcesPlugin.getWorkspace().getRoot();
}
}
|
