Merge branch 'release/0.6.2'

OpherV · Jun 22, 2017 · a2eb4d9 · a2eb4d9
2 parents f74d5e0 + 55629b2
commit a2eb4d9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -2,15 +2,15 @@
     <name>Git Flow Integration</name>
     <id>Gitflow</id>
     <description>Git Flow Integration</description>
-    <version>0.6.1</version>
+    <version>0.6.2</version>
     <category>VCS Integration</category>
     <vendor url="http://www.opherv.com">Opher Vishnia</vendor>
 
     <depends>com.intellij.modules.vcs</depends>
     <depends>com.intellij.tasks</depends>
     <depends>Git4Idea</depends>
 
-    <idea-version since-build="162.0" until-build="172.*"/>
+    <idea-version since-build="171.0" until-build="172.*"/>
 
     <actions>
         <action id="Gitflow.OpenGitflowPopup" class="gitflow.actions.OpenGitflowPopup"

diff --git a/src/gitflow/actions/FinishFeatureAction.java b/src/gitflow/actions/FinishFeatureAction.java
@@ -22,7 +22,7 @@ public FinishFeatureAction() {
         super("Finish Feature");
     }
 
-    FinishFeatureAction(GitRepository repo) {
+    public FinishFeatureAction(GitRepository repo) {
         super(repo, "Finish Feature");
     }
 

diff --git a/src/gitflow/actions/GitflowAction.java b/src/gitflow/actions/GitflowAction.java
@@ -51,6 +51,7 @@ public void actionPerformed(AnActionEvent e) {
     public void setup(Project project){
         myProject = project;
         virtualFileMananger = VirtualFileManager.getInstance();
+        repos.add(myRepo);
 
         featurePrefix = GitflowConfigUtil.getFeaturePrefix(myProject, myRepo);
         releasePrefix = GitflowConfigUtil.getReleasePrefix(myProject, myRepo);
@@ -59,6 +60,8 @@ public void setup(Project project){
         developBranch= GitflowConfigUtil.getDevelopBranch(myProject, myRepo);
 
         branchUtil= GitflowBranchUtilManager.getBranchUtil(myRepo);
+
+        currentBranchName= GitBranchUtil.getBranchNameOrRev(myRepo);
     }
 
     public void runAction(Project project, final String baseBranchName, final String branchName){

diff --git a/src/gitflow/ui/GitflowCloseTaskPanel.java b/src/gitflow/ui/GitflowCloseTaskPanel.java
@@ -36,9 +36,10 @@ public class GitflowCloseTaskPanel extends TaskDialogPanel {
 
     final private GitflowState gitflowState;
 
-    GitflowCloseTaskPanel(Project project, Task task){
+    GitflowCloseTaskPanel(Project project, Task task, GitRepository repo){
         myProject = project;
         myTask = task;
+        myRepo = repo;
         gitflowState = ServiceManager.getService(GitflowState.class);
 
         gitflowBranchUtil = GitflowBranchUtilManager.getBranchUtil(myRepo);
@@ -100,11 +101,11 @@ public void commit() {
         String taskBranchName = gitflowBranchUtil.stripFullBranchName(taskFullBranchName);
 
         if (finishFeatureCheckbox.isSelected()){
-            FinishFeatureAction action = new FinishFeatureAction();
+            FinishFeatureAction action = new FinishFeatureAction(myRepo);
             action.runAction(myProject, taskBranchName);
         }
         else if (finishHotfixCheckbox.isSelected()){
-            FinishHotfixAction action = new FinishHotfixAction();
+            FinishHotfixAction action = new FinishHotfixAction(myRepo);
             action.runAction(myProject, taskBranchName, tagMessageTextField.getText());
         }
     }

diff --git a/src/gitflow/ui/GitflowOpenTaskPanel.java b/src/gitflow/ui/GitflowOpenTaskPanel.java
@@ -42,9 +42,11 @@ public class GitflowOpenTaskPanel extends TaskDialogPanel implements ItemListene
     private GitflowState gitflowState;
 
 
-    public GitflowOpenTaskPanel(Project project, Task task){
+    public GitflowOpenTaskPanel(Project project, Task task, GitRepository repo){
         myProject = project;
         currentTask = task;
+        myRepo = repo;
+
         myTaskManager = (TaskManagerImpl) TaskManager.getManager(project);
         VcsTaskHandler[] vcsTaskHAndlers = VcsTaskHandler.getAllHandlers(project);
         if (vcsTaskHAndlers.length > 0){
@@ -101,12 +103,12 @@ public void commit() {
         GitflowAction action;
 
         if (startFeatureRadioButton.isSelected()) {
-            action = new StartFeatureAction();
+            action = new StartFeatureAction(myRepo);
             action.runAction(myProject, selectedFeatureBaseBranch.getBranchName(), featureName.getText());
             gitflowState.setTaskBranch(currentTask, GitflowConfigUtil.getFeaturePrefix(myProject, myRepo) + featureName.getText());
         }
         else if (startHotfixRadioButton.isSelected()) {
-            action =  new StartHotfixAction();
+            action =  new StartHotfixAction(myRepo);
             action.runAction(myProject, selectedHotfixBaseBranch.getBranchName(), hotfixName.getText());
             gitflowState.setTaskBranch(currentTask, GitflowConfigUtil.getHotfixPrefix(myProject, myRepo) + hotfixName.getText());
         }

diff --git a/src/gitflow/ui/GitflowTaskDialogPanelProvider.java b/src/gitflow/ui/GitflowTaskDialogPanelProvider.java
@@ -24,7 +24,7 @@ public TaskDialogPanel getOpenTaskPanel(@NotNull Project project, @NotNull Task
         GitRepository currentRepo = GitBranchUtil.getCurrentRepository(project);
         GitflowBranchUtil branchUtil = GitflowBranchUtilManager.getBranchUtil(currentRepo);
         if (branchUtil.hasGitflow()) {
-            return TaskManager.getManager(project).isVcsEnabled() ? new GitflowOpenTaskPanel(project, task) : null;
+            return TaskManager.getManager(project).isVcsEnabled() ? new GitflowOpenTaskPanel(project, task, currentRepo) : null;
         }
         else{
             return null;
@@ -38,7 +38,7 @@ public TaskDialogPanel getCloseTaskPanel(@NotNull Project project, @NotNull Loca
         GitflowBranchUtil branchUtil = GitflowBranchUtilManager.getBranchUtil(currentRepo);
 
         if (branchUtil.hasGitflow()) {
-            return TaskManager.getManager(project).isVcsEnabled() ? new GitflowCloseTaskPanel(project, task) : null;
+            return TaskManager.getManager(project).isVcsEnabled() ? new GitflowCloseTaskPanel(project, task, currentRepo) : null;
         }
         else{
             return null;