Skip to content

Commit 79aa567

Browse files
OpherVOpherV
committed
Merge branch 'release/0.6.5.1'
2 parents 388618e + c2a60bc commit 79aa567

8 files changed

+102
-45
lines changed

‎ISSUE_TEMPLATE.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
* **I'm submitting a ...**
2+
- [ ] bug report
3+
- [ ] feature request
4+
- [ ] puppy => You're not submitting a puppy. I already have one and he's [adorable](https://twitter.com/Opherv/status/974341249099542528)
5+
6+
7+
* **What is the current behavior?**
8+
9+
10+
11+
* **Is this a bug? Sorry about that. If so give me explicit details how to reproduce:**
12+
13+
1. Open IntelliJ
14+
2. ???
15+
3. Profit
16+
17+
* **What is the expected behavior?**
18+
19+
20+
21+
* **What is the motivation / use case for changing the behavior?**
22+
23+
* **Please tell me about your environment:**
24+
25+
- Gitflow4idea version: *find in IntelliJ settings plugins*
26+
- Gitflow version: run in terminal `>git flow version`
27+
28+
- *IntelliJ Help -> about > click copy icon and paste here. Should look like this:*
29+
~~~~
30+
IntelliJ IDEA 2018.1.1 EAP (Community Edition)
31+
Build #IC-181.4445.4, built on March 29, 2018
32+
JRE: 1.8.0_152-release-1136-b27 x86_64
33+
JVM: OpenJDK 64-Bit Server VM by JetBrains s.r.o
34+
~~~~
35+
36+
37+
38+
* **Other information** (e.g. detailed explanation, stacktrace, related issues, suggestions how to fix, links for me to have context words of praises, pictures of puppies (again with the puppy??) )

‎META-INF/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<name>Git Flow Integration</name>
33
<id>Gitflow</id>
44
<description>Git Flow Integration</description>
5-
<version>0.6.5</version>
5+
<version>0.6.5.1</version>
66
<category>VCS Integration</category>
77
<vendor url="http://www.opherv.com">Opher Vishnia</vendor>
88

‎src/gitflow/GitflowConfigurable.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ public JComponent createComponent() {
5353
return gitflowOptionsForm.getContentPane();
5454
}
5555

56-
public boolean isOptionActive(String optionId){
57-
return propertiesComponent.getBoolean(optionId+"_active");
56+
public static boolean isOptionActive(Project project, String optionId){
57+
return PropertiesComponent.getInstance(project).getBoolean(optionId+"_active");
5858
}
5959

60-
public String getOptionTextString (String optionId){
61-
return propertiesComponent.getValue(optionId+"_text");
60+
public static String getOptionTextString (Project project, String optionId){
61+
return PropertiesComponent.getInstance(project).getValue(optionId+"_text");
6262
}
6363

6464
@Override

‎src/gitflow/GitflowImpl.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ private GitCommand GitflowCommand() {
5151
}
5252

5353

54-
private void addOptionsCommand(GitLineHandler h, String optionId){
54+
private void addOptionsCommand(GitLineHandler h, Project project, String optionId){
5555
HashMap<String,String> optionMap = GitflowOptionsFactory.getOptionById(optionId);
56-
if (GitflowConfigurable.getInstance().isOptionActive(optionMap.get("id"))){
56+
if (GitflowConfigurable.isOptionActive(project, optionMap.get("id"))){
5757
h.addParameters(optionMap.get("flag"));
5858
}
5959
}
@@ -107,7 +107,7 @@ public GitCommandResult startFeature(@NotNull GitRepository repository,
107107
h.addParameters("feature");
108108
h.addParameters("start");
109109

110-
addOptionsCommand(h, "FEATURE_fetchFromOrigin");
110+
addOptionsCommand(h, repository.getProject(),"FEATURE_fetchFromOrigin");
111111

112112
h.addParameters(featureName);
113113

@@ -133,11 +133,11 @@ public GitCommandResult finishFeature(@NotNull GitRepository repository,
133133
h.addParameters("finish");
134134

135135

136-
addOptionsCommand(h, "FEATURE_keepRemote");
137-
addOptionsCommand(h, "FEATURE_keepLocal");
138-
addOptionsCommand(h, "FEATURE_keepBranch");
139-
addOptionsCommand(h, "FEATURE_fetchFromOrigin");
140-
// addOptionsCommand(h, "FEATURE_squash");
136+
addOptionsCommand(h, repository.getProject(),"FEATURE_keepRemote");
137+
addOptionsCommand(h, repository.getProject(),"FEATURE_keepLocal");
138+
addOptionsCommand(h, repository.getProject(),"FEATURE_keepBranch");
139+
addOptionsCommand(h, repository.getProject(),"FEATURE_fetchFromOrigin");
140+
// addOptionsCommand(h, repository.getProject(),"FEATURE_squash");
141141

142142
h.addParameters(featureName);
143143

@@ -215,7 +215,7 @@ public GitCommandResult startRelease(@NotNull GitRepository repository,
215215
h.addParameters("release");
216216
h.addParameters("start");
217217

218-
addOptionsCommand(h, "RELEASE_fetchFromOrigin");
218+
addOptionsCommand(h, repository.getProject(),"RELEASE_fetchFromOrigin");
219219

220220
h.addParameters(releaseName);
221221

@@ -236,15 +236,15 @@ public GitCommandResult finishRelease(@NotNull GitRepository repository,
236236
h.addParameters("release");
237237
h.addParameters("finish");
238238

239-
addOptionsCommand(h, "RELEASE_fetchFromOrigin");
240-
addOptionsCommand(h, "RELEASE_pushOnFinish");
241-
addOptionsCommand(h, "RELEASE_keepRemote");
242-
addOptionsCommand(h, "RELEASE_keepLocal");
243-
addOptionsCommand(h, "RELEASE_keepBranch");
244-
// addOptionsCommand(h, "RELEASE_squash");
239+
addOptionsCommand(h, repository.getProject(),"RELEASE_fetchFromOrigin");
240+
addOptionsCommand(h, repository.getProject(),"RELEASE_pushOnFinish");
241+
addOptionsCommand(h, repository.getProject(),"RELEASE_keepRemote");
242+
addOptionsCommand(h, repository.getProject(),"RELEASE_keepLocal");
243+
addOptionsCommand(h, repository.getProject(),"RELEASE_keepBranch");
244+
// addOptionsCommand(h, repository.getProject(),"RELEASE_squash");
245245

246246
HashMap<String,String> dontTag = GitflowOptionsFactory.getOptionById("RELEASE_dontTag");
247-
if (GitflowConfigurable.getInstance().isOptionActive(dontTag.get("id"))){
247+
if (GitflowConfigurable.isOptionActive(repository.getProject(), dontTag.get("id"))){
248248
h.addParameters(dontTag.get("flag"));
249249
}
250250
else{
@@ -309,7 +309,7 @@ public GitCommandResult startHotfix(@NotNull GitRepository repository,
309309
h.addParameters("hotfix");
310310
h.addParameters("start");
311311

312-
addOptionsCommand(h, "HOTFIX_fetchFromOrigin");
312+
addOptionsCommand(h, repository.getProject(),"HOTFIX_fetchFromOrigin");
313313

314314
h.addParameters(hotfixName);
315315

@@ -334,11 +334,11 @@ public GitCommandResult finishHotfix(@NotNull GitRepository repository,
334334
h.addParameters("hotfix");
335335
h.addParameters("finish");
336336

337-
addOptionsCommand(h, "HOTFIX_fetchFromOrigin");
338-
addOptionsCommand(h, "HOTFIX_pushOnFinish");
337+
addOptionsCommand(h, repository.getProject(),"HOTFIX_fetchFromOrigin");
338+
addOptionsCommand(h, repository.getProject(),"HOTFIX_pushOnFinish");
339339

340340
HashMap<String,String> dontTag = GitflowOptionsFactory.getOptionById("HOTFIX_dontTag");
341-
if (GitflowConfigurable.getInstance().isOptionActive(dontTag.get("id"))){
341+
if (GitflowConfigurable.isOptionActive(repository.getProject(), dontTag.get("id"))){
342342
h.addParameters(dontTag.get("flag"));
343343
}
344344
else{

‎src/gitflow/actions/FinishHotfixAction.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,23 @@ public void actionPerformed(AnActionEvent e) {
3535
final String hotfixName = GitflowConfigUtil.getHotfixNameFromBranch(myProject, myRepo, currentBranchName);
3636

3737
final String tagMessage;
38+
String tagMessageTemplate;
3839

39-
String defaultTagMessage = GitflowConfigurable.getInstance().getOptionTextString("HOTFIX_customHotfixCommitMessage");
40-
defaultTagMessage=defaultTagMessage.replace("%name%", hotfixName);
40+
String defaultTagMessage = "Tagging hotfix %name%";
41+
String customTagMessage = GitflowConfigurable.getOptionTextString(myProject, "HOTFIX_customHotfixCommitMessage");
42+
43+
if (customTagMessage != null) {
44+
tagMessageTemplate = customTagMessage.replace("%name%", hotfixName);
45+
}
46+
else{
47+
tagMessageTemplate = defaultTagMessage.replace("%name%", hotfixName);
48+
}
4149

42-
if (GitflowConfigurable.getInstance().isOptionActive("HOTFIX_dontTag")) {
50+
if (GitflowConfigurable.isOptionActive(myProject, "HOTFIX_dontTag")) {
4351
tagMessage="";
4452
}
4553
else {
46-
tagMessage = Messages.showInputDialog(myProject, "Enter the tag message:", "Finish Hotfix", Messages.getQuestionIcon(), defaultTagMessage, null);
54+
tagMessage = Messages.showInputDialog(myProject, "Enter the tag message:", "Finish Hotfix", Messages.getQuestionIcon(), tagMessageTemplate, null);
4755
}
4856

4957
this.runAction(e.getProject(), hotfixName, tagMessage);

‎src/gitflow/actions/FinishReleaseAction.java

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public class FinishReleaseAction extends GitflowAction {
2727

2828
FinishReleaseAction(String name, String tagMessage) {
2929
super("Finish Release");
30-
customReleaseName=name;
31-
customtagMessage=tagMessage;
30+
customReleaseName = name;
31+
customtagMessage = tagMessage;
3232
}
3333

3434
@Override
@@ -48,28 +48,36 @@ public void actionPerformed(AnActionEvent e) {
4848

4949
final GitflowErrorsListener errorLineHandler = new GitflowErrorsListener(myProject);
5050

51-
String defaultTagMessage = GitflowConfigurable.getInstance().getOptionTextString("RELEASE_customTagCommitMessage");
52-
defaultTagMessage = defaultTagMessage.replace("%name%", releaseName);
51+
String tagMessageTemplate;
5352

54-
String tagMessageDraft;
53+
String defaultTagMessage = "Tagging version %name%";
54+
String customTagMessage = GitflowConfigurable.getOptionTextString(myProject, "RELEASE_customTagCommitMessage");
55+
if (customTagMessage != null) {
56+
tagMessageTemplate = customTagMessage.replace("%name%", releaseName);
57+
}
58+
else{
59+
tagMessageTemplate = defaultTagMessage.replace("%name%", releaseName);
60+
}
5561

56-
boolean cancelAction=false;
62+
String tagMessageDraft;
5763

58-
if (GitflowConfigurable.getInstance().isOptionActive("RELEASE_dontTag")) {
64+
65+
boolean cancelAction=false;
66+
67+
if (GitflowConfigurable.isOptionActive(myProject, "RELEASE_dontTag")) {
5968
tagMessage="";
6069
}
6170
else if (customtagMessage!=null){
6271
//probably repeating the release finish after a merge
6372
tagMessage=customtagMessage;
6473
}
6574
else{
66-
tagMessageDraft= Messages.showInputDialog(myProject, "Enter the tag message:", "Finish Release", Messages.getQuestionIcon(), defaultTagMessage, null);
75+
tagMessageDraft = Messages.showInputDialog(myProject, "Enter the tag message:", "Finish Release", Messages.getQuestionIcon(), tagMessageTemplate, null);
6776
if (tagMessageDraft==null){
6877
cancelAction=true;
6978
tagMessage="";
7079
}
7180
else{
72-
7381
tagMessage=tagMessageDraft;
7482
}
7583
}
@@ -104,7 +112,7 @@ public void onSuccess() {
104112
//merge conflicts if necessary
105113
if (errorLineHandler.hasMergeError){
106114
if (handleMerge()) {
107-
FinishReleaseAction completeFinisReleaseAction = new FinishReleaseAction(releaseName,tagMessage);
115+
FinishReleaseAction completeFinisReleaseAction = new FinishReleaseAction(releaseName, tagMessage);
108116
completeFinisReleaseAction.actionPerformed(event);
109117
}
110118
}

‎src/gitflow/actions/StartReleaseAction.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,13 @@ public void actionPerformed(AnActionEvent e) {
2828
GitNewBranchNameValidator.newInstance(repos));
2929
final GitflowErrorsListener errorLineHandler = new GitflowErrorsListener(myProject);
3030

31-
if (releaseName!=null && !releaseName.isEmpty()){
31+
if (releaseName == null){
32+
// user clicked cancel
33+
}
34+
else if (releaseName.isEmpty()){
35+
Messages.showWarningDialog(myProject, "You must provide a name for the release", "Whoops");
36+
}
37+
else {
3238
new Task.Backgroundable(myProject,"Starting release "+releaseName,false){
3339
@Override
3440
public void run(@NotNull ProgressIndicator indicator) {
@@ -48,9 +54,6 @@ public void run(@NotNull ProgressIndicator indicator) {
4854
}.queue();
4955

5056
}
51-
else{
52-
Messages.showWarningDialog(myProject, "You must provide a name for the release", "Whoops");
53-
}
5457

5558
}
5659
}

‎src/gitflow/ui/GitflowCloseTaskPanel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ public class GitflowCloseTaskPanel extends TaskDialogPanel {
5454

5555
//TODO same code exists in FinishHotfixAction, make DRYer
5656

57-
if (GitflowConfigurable.getInstance().isOptionActive("HOTFIX_dontTag")) {
57+
if (GitflowConfigurable.isOptionActive(project, "HOTFIX_dontTag")) {
5858
tagMessage="";
5959
tagMessageTextField.setEnabled(false);
6060
tagMessageTextField.setToolTipText("Hotfix tagging is disabled in Gitflow options");
6161

6262
}
6363
else{
64-
tagMessage = GitflowConfigurable.getInstance().getOptionTextString("HOTFIX_customHotfixCommitMessage").replace("%name%", branchName);
64+
tagMessage = GitflowConfigurable.getOptionTextString(project, "HOTFIX_customHotfixCommitMessage").replace("%name%", branchName);
6565
tagMessageTextField.setToolTipText(null);
6666
}
6767

0 commit comments

Comments
 (0)