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
|
/*******************************************************************************
* Copyright (c) 2010 SAP AG.
* 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
*******************************************************************************/
package org.eclipse.egit.ui.internal.actions;
import java.io.IOException;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
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.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.egit.core.op.MergeOperation;
import org.eclipse.egit.ui.Activator;
import org.eclipse.egit.ui.UIText;
import org.eclipse.egit.ui.internal.dialogs.MergeTargetSelectionDialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.RepositoryState;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Display;
/**
* Action for selecting a commit and merging it with the current branch.
*/
public class MergeActionHandler extends RepositoryActionHandler {
public Object execute(final ExecutionEvent event) throws ExecutionException {
final Repository repository = getRepository(true, event);
if (repository == null)
return null;
if (!canMerge(repository, event))
return null;
MergeTargetSelectionDialog mergeTargetSelectionDialog = new MergeTargetSelectionDialog(
getShell(event), repository);
if (mergeTargetSelectionDialog.open() == IDialogConstants.OK_ID) {
final String refName = mergeTargetSelectionDialog.getRefName();
String jobname = NLS.bind(UIText.MergeAction_JobNameMerge, refName);
final MergeOperation op = new MergeOperation(repository, refName);
Job job = new Job(jobname) {
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
op.execute(monitor);
} catch (final CoreException e) {
return e.getStatus();
}
return Status.OK_STATUS;
}
};
job.setUser(true);
job.addJobChangeListener(new JobChangeAdapter() {
@Override
public void done(IJobChangeEvent cevent) {
IStatus result = cevent.getJob().getResult();
if (result.getSeverity() == IStatus.CANCEL) {
Display.getDefault().asyncExec(new Runnable() {
public void run() {
try {
MessageDialog
.openInformation(
getShell(event),
UIText.MergeAction_MergeCanceledTitle,
UIText.MergeAction_MergeCanceledMessage);
} catch (ExecutionException e) {
Activator
.handleError(
UIText.MergeAction_MergeCanceledMessage,
null, true);
}
}
});
} else if (!result.isOK()) {
Activator.handleError(result.getMessage(), result
.getException(), true);
} else {
Display.getDefault().asyncExec(new Runnable() {
public void run() {
try {
MessageDialog
.openInformation(
getShell(event),
UIText.MergeAction_MergeResultTitle,
op.getResult().toString());
} catch (ExecutionException e) {
Activator.handleError(op.getResult()
.toString(), null, true);
}
}
});
}
}
});
job.schedule();
}
return null;
}
private boolean canMerge(final Repository repository, ExecutionEvent event)
throws ExecutionException {
String message = null;
try {
Ref head = repository.getRef(Constants.HEAD);
if (head == null || !head.isSymbolic())
message = UIText.MergeAction_HeadIsNoBranch;
else if (!repository.getRepositoryState().equals(
RepositoryState.SAFE))
message = NLS.bind(UIText.MergeAction_WrongRepositoryState,
repository.getRepositoryState());
} catch (IOException e) {
Activator.logError(e.getMessage(), e);
message = e.getMessage();
}
if (message != null) {
MessageDialog.openError(getShell(event),
UIText.MergeAction_CannotMerge, message);
}
return (message == null);
}
@Override
public boolean isEnabled() {
return getRepository() != null;
}
}
|
