feat: OpFeatureContext support; force create merge request; feature branch name into opc;

Author: yeqown

cmd/gitlab-flow/commands.go

@@ -52,9 +52,24 @@ func getInitCommand() *cli.Command {
 // gitlab-flow feature [command options] -c --conf_path
 func getFeatureCommand() *cli.Command {
 	return &cli.Command{
-		Name:        "feature",
-		Usage:       "managing the works in developing.",
-		Category:    "flow",
+		Name:     "feature",
+		Usage:    "managing the works in developing.",
+		Category: "flow",
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:        "force-create-mr",
+				Value:       false,
+				Usage:       "force to create Merge Request",
+				DefaultText: "false",
+				Required:    false,
+			},
+			&cli.StringFlag{
+				Name:     "feature-branch-name",
+				Aliases:  []string{"-f"},
+				Usage:    "input the `featureBranchName`",
+				Required: false,
+			},
+		},
 		Subcommands: getFeatureSubCommands(),
 	}
 }

cmd/gitlab-flow/commands_feature.go

@@ -41,7 +41,8 @@ func getFeatureBeginSubCommand() *cli.Command {
 			if desc == "" {
 				return errors.New("'Description' could not be empty")
 			}
-			return getFlow(c).FeatureBegin(title, desc)
+			opc := getOpFeatureContext(c)
+			return getFlow(c).FeatureBegin(opc, title, desc)
 		},
 	}
 }
@@ -73,7 +74,8 @@ func getFeatureBeginIssueSubCommand() *cli.Command {
 			issueTitle := c.Args().Get(0)
 			issueDesc := c.Args().Get(1)
 			featureBranchName := c.String("feature_branch_name")
-			return getFlow(c).FeatureBeginIssue(featureBranchName, issueTitle, issueDesc)
+			opc := getOpFeatureContext(c)
+			return getFlow(c).FeatureBeginIssue(opc, featureBranchName, issueTitle, issueDesc)
 		},
 	}
 }
@@ -105,7 +107,8 @@ func getFeatureFinishIssueSubCommand() *cli.Command {
 		Action: func(c *cli.Context) error {
 			featureBranchName := c.String("feature_branch_name")
 			issueBranchName := c.String("issue_branch_name")
-			return getFlow(c).FeatureFinishIssue(featureBranchName, issueBranchName)
+			opc := getOpFeatureContext(c)
+			return getFlow(c).FeatureFinishIssue(opc, featureBranchName, issueBranchName)
 		},
 	}
 }
@@ -126,8 +129,8 @@ func getFeatureDebugSubCommand() *cli.Command {
 			},
 		},
 		Action: func(c *cli.Context) error {
-			featureBranchName := c.String("feature_branch_name")
-			return getFlow(c).FeatureDebugging(featureBranchName)
+			opc := getOpFeatureContext(c)
+			return getFlow(c).FeatureDebugging(opc)
 		},
 	}
 }
@@ -148,8 +151,8 @@ func getFeatureTestSubCommand() *cli.Command {
 			},
 		},
 		Action: func(c *cli.Context) error {
-			featureBranchName := c.String("feature_branch_name")
-			return getFlow(c).FeatureTest(featureBranchName)
+			opc := getOpFeatureContext(c)
+			return getFlow(c).FeatureTest(opc)
 		},
 	}
 }
@@ -170,8 +173,8 @@ func getFeatureReleaseSubCommand() *cli.Command {
 			},
 		},
 		Action: func(c *cli.Context) error {
-			featureBranchName := c.String("feature_branch_name")
-			return getFlow(c).FeatureRelease(featureBranchName)
+			opc := getOpFeatureContext(c)
+			return getFlow(c).FeatureRelease(opc)
 		},
 	}
 }
@@ -183,12 +186,6 @@ func getFeatureResolveConflictCommand() *cli.Command {
 		ArgsUsage: "-f, --feature_branch_name `featureBranchName`, -t, --target_branch `targetBranch`",
 		Category:  "feature",
 		Flags: []cli.Flag{
-			&cli.StringFlag{
-				Name:     "feature_branch_name",
-				Aliases:  []string{"-f"},
-				Usage:    "input the `featureBranchName`",
-				Required: false,
-			},
 			&cli.StringFlag{
 				Name:        "target_branch",
 				Aliases:     []string{"-t"},
@@ -199,9 +196,9 @@ func getFeatureResolveConflictCommand() *cli.Command {
 			},
 		},
 		Action: func(c *cli.Context) error {
-			featureBranchName := c.String("feature_branch_name")
 			targetBranchName := c.String("target_branch")
-			return getFlow(c).FeatureResolveConflict(featureBranchName, types.BranchTyp(targetBranchName))
+			opc := getOpFeatureContext(c)
+			return getFlow(c).FeatureResolveConflict(opc, types.BranchTyp(targetBranchName))
 		},
 	}
 }

cmd/gitlab-flow/support.go

@@ -82,6 +82,13 @@ func parseGlobalFlags(c *cli.Context) globalFlags {
 	}
 }
 
+func getOpFeatureContext(c *cli.Context) *types.OpFeatureContext {
+	return &types.OpFeatureContext{
+		ForceCreateMergeRequest: c.Bool("force-create-mr"),
+		FeatureBranchName:       c.String("feature-branch-name"),
+	}
+}
+
 func getFlow(c *cli.Context) internal.IFlow {
 	flags := parseGlobalFlags(c)
 	ctx := setEnviron(flags)

docs/example.md

@@ -6,11 +6,12 @@ development resources.
 ### 0. Global flags
 
 ```sh
-flow [-c, --conf_path] [--debug] [--web] [-p, --project] SUB_COMMAND [options]
+flow [-c, --conf_path] [--debug] [--web] [-p, --project] [--force-remote] SUB_COMMAND [options]
 # (OPTIONAL) -c, --conf_path path/to/config_file.
 # (OPTIONAL) --debug verbose mode.
 # (OPTIONAL) --web open web browser of resource url automatically.
 # (OPTIONAL) -p, --project projectName of current working directory.
+# (OPTIONAL) --force-remote use project from remote not from local DB.
 
 # example:
 flow -c ~/.gitlab-flow --debug init ...

internal/dash_impl.go

@@ -100,7 +100,7 @@ func (d dashImpl) FeatureDetail(featureBranchName string) ([]byte, error) {
 		featureBranchName, _ = d.gitOperator.CurrentBranch()
 	}
 	if featureBranchName == "" {
-		return nil, errors.New("feature branch could not be empty")
+		return nil, errInvalidFeatureName
 	}
 	featureBranchName = genFeatureBranchName(featureBranchName)
 

internal/flow.go

@@ -19,24 +19,24 @@ type IFlow interface {
 	// FeatureBegin open a milestone and related to a feature branch,
 	// then CLI would automate fetch origin branches and pull them to local.
 	// Of course, flow would save data in local storage.
-	FeatureBegin(title, desc string) error
+	FeatureBegin(opc *types.OpFeatureContext, title, desc string) error
 	// FeatureDebugging open a MergeRequest of feature branch and types.DevBranch branch.
-	FeatureDebugging(featureBranchName string) error
+	FeatureDebugging(opc *types.OpFeatureContext) error
 	// FeatureTest open a MergeRequest of feature branch and types.TestBranch branch.
-	FeatureTest(featureBranchName string) error
+	FeatureTest(opc *types.OpFeatureContext) error
 	// FeatureRelease open a MergeRequest of feature branch and types.MasterBranch branch.
-	FeatureRelease(featureBranchName string) error
+	FeatureRelease(opc *types.OpFeatureContext) error
 	// DONE(@yeqown) this would be useful while you merge feature into master but there is conflict.
 	// FeatureResolveConflict will checkout a new branch from target branch,
 	// then create a merge request from current feature branch to the new branch.
 	// newBranch = "resolve-conflict/featureBranchName-to-master"
-	FeatureResolveConflict(featureBranchName string, targetBranch types.BranchTyp) error
+	FeatureResolveConflict(opc *types.OpFeatureContext, targetBranch types.BranchTyp) error
 
 	// FeatureBeginIssue checkout a issue branch from feature branch, also open a merge request
 	// which is from issue branch to feature branch.
-	FeatureBeginIssue(featureBranchName string, title, desc string) error
+	FeatureBeginIssue(opc *types.OpFeatureContext, title, desc string) error
 	// FeatureFinishIssue open the WebURL of merge request which is from issue branch to feature branch.
-	FeatureFinishIssue(featureBranchName, issueBranchName string) error
+	FeatureFinishIssue(opc *types.OpFeatureContext, issueBranchName string) error
 
 	// HotfixStart checkout a hotfix branch from types.MasterBranch, also open a merge request
 	// which is from hotfix branch to types.MasterBranch.
@@ -113,7 +113,7 @@ func genHotfixBranchName(name string) string {
 
 // genMRTitle
 func genMRTitle(srcBranch, targetBranch string) string {
-	return fmt.Sprintf("Merge %s to %s", srcBranch, targetBranch)
+	return fmt.Sprintf("Merge %s into %s", srcBranch, targetBranch)
 }
 
 // genIssueBranchName .