Merge branch '574-cli-branching' into 'dle-4-0'

feat: add an optional flag to specify a parent branch (#574)

See merge request postgres-ai/database-lab!939

Author: agneum

engine/cmd/cli/commands/branch/actions.go

@@ -181,9 +181,15 @@ func create(cliCtx *cli.Context) error {
 
 	branchName := cliCtx.Args().First()
 
+	baseBranch := cliCtx.String("parent-branch")
+
+	if baseBranch == "" {
+		baseBranch = getBaseBranch(cliCtx)
+	}
+
 	branchRequest := types.BranchCreateRequest{
 		BranchName: branchName,
-		BaseBranch: getBaseBranch(cliCtx),
+		BaseBranch: baseBranch,
 	}
 
 	branch, err := dblabClient.CreateBranch(cliCtx.Context, branchRequest)

engine/cmd/cli/commands/branch/command_list.go

@@ -20,6 +20,9 @@ func List() []*cli.Command {
 					Name:    "delete",
 					Aliases: []string{"d"},
 				},
+				&cli.StringFlag{
+					Name: "parent-branch",
+				},
 			},
 			ArgsUsage: "BRANCH_NAME",
 		},