Merge branch 'main' into lunny/add_reply_code_review

cmd/pulls/create.go

@@ -13,6 +13,7 @@ import (
 	"gitea.dev/tea/modules/context"
 	"gitea.dev/tea/modules/interact"
 	"gitea.dev/tea/modules/task"
+	"gitea.dev/tea/modules/utils"
 )
 
 // CmdPullsCreate creates a pull request
@@ -46,6 +47,10 @@ var CmdPullsCreate = cli.Command{
 			Name:  "topic",
 			Usage: "Topic name for agit flow pull request",
 		},
+		&cli.BoolFlag{
+			Name:  "draft",
+			Usage: "Create as a draft (prepends \"WIP: \" to the title; Gitea treats WIP-prefixed PRs as drafts)",
+		},
 	}, flags.IssuePRCreateFlags...),
 }
 
@@ -54,10 +59,16 @@ func runPullsCreate(requestCtx stdctx.Context, cmd *cli.Command) error {
 	if err != nil {
 		return err
 	}
-	if err := ctx.Ensure(context.CtxRequirement{
-		LocalRepo:  true,
-		RemoteRepo: true,
-	}); err != nil {
+	// Interactive mode and head-branch defaulting both need a local repo.
+	// When --head is given explicitly the user can target a cross-fork PR
+	// from outside a working tree (e.g. with --repo <owner>/<repo>);
+	// task.CreatePull only consults ctx.LocalRepo when head is empty.
+	needsLocalRepo := ctx.IsInteractiveMode() || len(ctx.String("head")) == 0
+	requirement := context.CtxRequirement{RemoteRepo: true}
+	if needsLocalRepo {
+		requirement.LocalRepo = true
+	}
+	if err := ctx.Ensure(requirement); err != nil {
 		return err
 	}
 
@@ -75,6 +86,10 @@ func runPullsCreate(requestCtx stdctx.Context, cmd *cli.Command) error {
 		return err
 	}
 
+	if ctx.Bool("draft") {
+		opts.Title = utils.AddDraftPrefix(opts.Title)
+	}
+
 	if ctx.Bool("agit") {
 		return task.CreateAgitFlowPull(
 			requestCtx,

cmd/pulls/edit.go

@@ -18,6 +18,42 @@ import (
 	"github.com/urfave/cli/v3"
 )
 
+// applyDraftFlag mutates opts.Title according to --draft / --ready.
+// If a flag is set but --title isn't, it fetches the current title from the server.
+// Returns an error if both --draft and --ready are set, or on a server error.
+func applyDraftFlag(requestCtx stdctx.Context, ctx *context.TeaContext, client *gitea.Client, idx int64, opts *task.EditIssueOption) error {
+	draft := ctx.Bool("draft")
+	ready := ctx.Bool("ready")
+	if !draft && !ready {
+		return nil
+	}
+	if draft && ready {
+		return fmt.Errorf("--draft and --ready are mutually exclusive")
+	}
+
+	var current string
+	if opts.Title != nil {
+		current = *opts.Title
+	} else {
+		pr, _, err := client.PullRequests.GetPullRequest(requestCtx, ctx.Owner, ctx.Repo, idx)
+		if err != nil {
+			return fmt.Errorf("could not fetch pull request #%d: %s", idx, err)
+		}
+		current = pr.Title
+	}
+
+	var next string
+	if draft {
+		next = utils.AddDraftPrefix(current)
+	} else {
+		next = utils.StripDraftPrefix(current)
+	}
+	if next != current || opts.Title != nil {
+		opts.Title = &next
+	}
+	return nil
+}
+
 // CmdPullsEdit is the subcommand of pulls to edit pull requests
 var CmdPullsEdit = cli.Command{
 	Name:    "edit",
@@ -37,6 +73,14 @@ use an empty string (eg. --milestone "").`,
 			Name:  "remove-reviewers",
 			Usage: "Comma-separated list of usernames to remove from reviewers",
 		},
+		&cli.BoolFlag{
+			Name:  "draft",
+			Usage: "Mark as draft by prepending \"WIP: \" to the title (idempotent)",
+		},
+		&cli.BoolFlag{
+			Name:  "ready",
+			Usage: "Mark as ready for review by stripping any leading \"WIP: \" or \"[WIP]\" prefix",
+		},
 	),
 }
 
@@ -72,6 +116,9 @@ func runPullsEdit(requestCtx stdctx.Context, cmd *cli.Command) error {
 
 	client := ctx.Login.Client()
 	for _, opts.Index = range indices {
+		if err := applyDraftFlag(requestCtx, ctx, client, opts.Index, opts); err != nil {
+			return err
+		}
 		pr, err := task.EditPull(requestCtx, ctx, client, *opts)
 		if err != nil {
 			return err