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
|
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package git4idea.merge;
import com.intellij.ide.util.ElementsChooser;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vfs.VirtualFile;
import git4idea.GitVcs;
import git4idea.commands.GitCommand;
import git4idea.commands.GitLineHandler;
import git4idea.commands.GitSimpleHandler;
import git4idea.i18n.GitBundle;
import git4idea.util.GitUIUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Collections;
import java.util.List;
import java.util.StringTokenizer;
/**
* A dialog for merge action. It represents most options available for git merge.
*/
public class GitMergeDialog extends DialogWrapper {
/**
* The git root available for git merge action
*/
private JComboBox myGitRoot;
/**
* The check box indicating that no commit will be created
*/
private JCheckBox myNoCommitCheckBox;
/**
* The checkbox that suppresses fast forward resolution even if it is available
*/
private JCheckBox myNoFastForwardCheckBox;
/**
* The checkbox that allows squashing all changes from branch into a single commit
*/
private JCheckBox mySquashCommitCheckBox;
/**
* The label containing a name of the current branch
*/
private JLabel myCurrentBranchText;
/**
* The panel containing a chooser of branches to merge
*/
private JPanel myBranchToMergeContainer;
/**
* Chooser of branches to merge
*/
private ElementsChooser<String> myBranchChooser;
/**
* The commit message
*/
private JTextField myCommitMessage;
/**
* The strategy for merge
*/
private JComboBox myStrategy;
/**
* The panel
*/
private JPanel myPanel;
/**
* The log information checkbox
*/
private JCheckBox myAddLogInformationCheckBox;
@NotNull private final Project myProject;
private final GitVcs myVcs;
public GitMergeDialog(@NotNull Project project, List<VirtualFile> roots, VirtualFile defaultRoot) {
super(project, true);
setTitle(GitBundle.getString("merge.branch.title"));
myProject = project;
myVcs = GitVcs.getInstance(project);
initBranchChooser();
setOKActionEnabled(false);
setOKButtonText(GitBundle.getString("merge.branch.button"));
GitUIUtil.setupRootChooser(myProject, roots, defaultRoot, myGitRoot, myCurrentBranchText);
GitUIUtil.imply(mySquashCommitCheckBox, true, myNoCommitCheckBox, true);
GitUIUtil.imply(mySquashCommitCheckBox, true, myAddLogInformationCheckBox, false);
GitUIUtil.implyDisabled(mySquashCommitCheckBox, true, myCommitMessage);
GitUIUtil.exclusive(mySquashCommitCheckBox, true, myNoFastForwardCheckBox, true);
myGitRoot.addActionListener(new ActionListener() {
public void actionPerformed(final ActionEvent event) {
try {
updateBranches();
}
catch (VcsException ex) {
if (myVcs.getExecutableValidator().checkExecutableAndShowMessageIfNeeded(getRootPane())) {
myVcs.showErrors(Collections.singletonList(ex), GitBundle.getString("merge.retrieving.branches"));
}
}
}
});
init();
}
private void initBranchChooser() {
myBranchChooser = new ElementsChooser<String>(true);
myBranchChooser.setToolTipText(GitBundle.getString("merge.branches.tooltip"));
GridBagConstraints c = new GridBagConstraints();
c.insets = new Insets(0, 0, 0, 0);
c.gridx = 0;
c.gridy = 0;
c.weightx = 1;
c.weighty = 1;
c.fill = GridBagConstraints.BOTH;
myBranchToMergeContainer.add(myBranchChooser, c);
GitMergeUtil.setupStrategies(myBranchChooser, myStrategy);
final ElementsChooser.ElementsMarkListener<String> listener = new ElementsChooser.ElementsMarkListener<String>() {
public void elementMarkChanged(final String element, final boolean isMarked) {
setOKActionEnabled(myBranchChooser.getMarkedElements().size() != 0);
}
};
listener.elementMarkChanged(null, true);
myBranchChooser.addElementsMarkListener(listener);
}
@Nullable
@Override
public JComponent getPreferredFocusedComponent() {
return myBranchChooser.getComponent();
}
/**
* Setup branches for git root, this method should be called when root is changed.
*/
public void updateBranches() throws VcsException {
VirtualFile root = getSelectedRoot();
GitSimpleHandler handler = new GitSimpleHandler(myProject, root, GitCommand.BRANCH);
handler.setSilent(true);
handler.addParameters("--no-color", "-a", "--no-merged");
String output = handler.run();
myBranchChooser.clear();
for (StringTokenizer lines = new StringTokenizer(output, "\n", false); lines.hasMoreTokens();) {
String branch = lines.nextToken().substring(2);
myBranchChooser.addElement(branch, false);
}
}
/**
* @return get line handler configured according to the selected options
*/
public GitLineHandler handler() {
if (!isOK()) {
throw new IllegalStateException("The handler could be retrieved only if dialog was completed successfully.");
}
VirtualFile root = (VirtualFile)myGitRoot.getSelectedItem();
GitLineHandler h = new GitLineHandler(myProject, root, GitCommand.MERGE);
// ignore merge failure
h.ignoreErrorCode(1);
if (myNoCommitCheckBox.isSelected()) {
h.addParameters("--no-commit");
}
if (myAddLogInformationCheckBox.isSelected()) {
h.addParameters("--log");
}
final String msg = myCommitMessage.getText().trim();
if (msg.length() != 0) {
h.addParameters("-m", msg);
}
if (mySquashCommitCheckBox.isSelected()) {
h.addParameters("--squash");
}
if (myNoFastForwardCheckBox.isSelected()) {
h.addParameters("--no-ff");
}
String strategy = (String)myStrategy.getSelectedItem();
if (!GitMergeUtil.DEFAULT_STRATEGY.equals(strategy)) {
h.addParameters("--strategy", strategy);
}
for (String branch : myBranchChooser.getMarkedElements()) {
h.addParameters(branch);
}
return h;
}
protected JComponent createCenterPanel() {
return myPanel;
}
@Override
protected String getDimensionServiceKey() {
return getClass().getName();
}
@Override
protected String getHelpId() {
return "reference.VersionControl.Git.MergeBranches";
}
public VirtualFile getSelectedRoot() {
return (VirtualFile)myGitRoot.getSelectedItem();
}
}
|
