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
|
/*******************************************************************************
* Copyright (c) 2010, 2016 SAP AG and others.
* 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
* Mathias Kinzler (SAP AG) - use the abstract super class
* Thomas Wolf <thomas.wolf@paranor.ch> - Bug 499482
*******************************************************************************/
package org.eclipse.egit.ui.internal.dialogs;
import java.io.IOException;
import java.text.MessageFormat;
import org.eclipse.egit.ui.internal.UIText;
import org.eclipse.jface.window.Window;
import org.eclipse.jgit.lib.BranchConfig.BranchRebaseMode;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
/**
* Dialog for selecting a merge target.
*/
public class RebaseTargetSelectionDialog extends AbstractBranchSelectionDialog {
private boolean interactive = false;
private boolean preserveMerges = false;
/**
* @param parentShell
* @param repo
*/
public RebaseTargetSelectionDialog(Shell parentShell, Repository repo) {
super(parentShell, repo, getMergeTarget(repo), SHOW_LOCAL_BRANCHES
| SHOW_REMOTE_BRANCHES | EXPAND_REMOTE_BRANCHES_NODE
| getSelectSetting(repo));
}
@Override
protected void createButtonsForButtonBar(Composite parent) {
super.createButtonsForButtonBar(parent);
getButton(Window.OK).setText(
UIText.RebaseTargetSelectionDialog_RebaseButton);
}
@Override
protected String getMessageText() {
String branch = getCurrentBranch();
if (branch != null)
return MessageFormat.format(
UIText.RebaseTargetSelectionDialog_DialogMessageWithBranch,
branch);
else
return UIText.RebaseTargetSelectionDialog_DialogMessage;
}
@Override
protected String getTitle() {
String branch = getCurrentBranch();
if (branch != null)
return MessageFormat.format(
UIText.RebaseTargetSelectionDialog_DialogTitleWithBranch,
branch);
else
return UIText.RebaseTargetSelectionDialog_DialogTitle;
}
@Override
protected String getWindowTitle() {
String branch = getCurrentBranch();
if (branch != null)
return MessageFormat.format(
UIText.RebaseTargetSelectionDialog_RebaseTitleWithBranch,
branch);
else
return UIText.RebaseTargetSelectionDialog_RebaseTitle;
}
@Override
protected void refNameSelected(String refName) {
boolean tagSelected = refName != null
&& refName.startsWith(Constants.R_TAGS);
boolean branchSelected = refName != null
&& (refName.startsWith(Constants.R_HEADS) || refName
.startsWith(Constants.R_REMOTES));
boolean currentSelected;
try {
currentSelected = refName != null
&& refName.equals(repo.getFullBranch());
} catch (IOException e) {
currentSelected = false;
}
getButton(Window.OK).setEnabled(
!currentSelected && (branchSelected || tagSelected));
}
@Override
protected void createCustomArea(Composite parent) {
final Button interactiveButton = new Button(parent, SWT.CHECK);
interactiveButton
.setText(UIText.RebaseTargetSelectionDialog_InteractiveButton);
interactiveButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
interactive = interactiveButton.getSelection();
}
});
final Button preserveMergesButton = new Button(parent, SWT.CHECK);
preserveMergesButton
.setText(UIText.RebaseTargetSelectionDialog_PreserveMergesButton);
preserveMergesButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
preserveMerges = preserveMergesButton.getSelection();
}
});
String branchName = getCurrentBranch();
if (branchName == null) {
return;
}
Config cfg = repo.getConfig();
BranchRebaseMode rebase = cfg.getEnum(BranchRebaseMode.values(),
ConfigConstants.CONFIG_BRANCH_SECTION, branchName,
ConfigConstants.CONFIG_KEY_REBASE, BranchRebaseMode.NONE);
switch (rebase) {
case PRESERVE:
preserveMergesButton.setSelection(true);
preserveMerges = true;
break;
case INTERACTIVE:
interactiveButton.setSelection(true);
interactive = true;
break;
default:
break;
}
}
/**
* @return whether the rebase should be interactive
*/
public boolean isInteractive() {
return interactive;
}
/**
* @return whether merges should be preserved during rebase
*/
public boolean isPreserveMerges() {
return preserveMerges;
}
}
|
