From 4f8cb7ef19ec5ab9fe6f8b9346ad1d4dc301ab76 Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.com>
Date: Mon, 2 Feb 2026 22:59:22 +0000
Subject: [PATCH] helpful error messages (#871)

Reviewed-on: https://gitea.com/gitea/tea/pulls/871
Co-authored-by: techknowlogick <techknowlogick@gitea.com>
Co-committed-by: techknowlogick <techknowlogick@gitea.com>
---
 cmd/milestones/issues.go    | 20 +++++++++++++-------
 cmd/organizations/delete.go |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/cmd/milestones/issues.go b/cmd/milestones/issues.go
index 1f0a3c5..440f245 100644
--- a/cmd/milestones/issues.go
+++ b/cmd/milestones/issues.go
@@ -132,13 +132,16 @@ func runMilestoneIssueAdd(_ stdctx.Context, cmd *cli.Command) error {
 	// make sure milestone exist
 	mile, _, err := client.GetMilestoneByName(ctx.Owner, ctx.Repo, mileName)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to get milestone '%s': %w", mileName, err)
 	}
 
 	_, _, err = client.EditIssue(ctx.Owner, ctx.Repo, idx, gitea.EditIssueOption{
 		Milestone: &mile.ID,
 	})
-	return err
+	if err != nil {
+		return fmt.Errorf("failed to add issue #%d to milestone '%s': %w", idx, mileName, err)
+	}
+	return nil
 }
 
 func runMilestoneIssueRemove(_ stdctx.Context, cmd *cli.Command) error {
@@ -153,25 +156,28 @@ func runMilestoneIssueRemove(_ stdctx.Context, cmd *cli.Command) error {
 	issueIndex := ctx.Args().Get(1)
 	idx, err := utils.ArgToIndex(issueIndex)
 	if err != nil {
-		return err
+		return fmt.Errorf("invalid issue index '%s': %w", issueIndex, err)
 	}
 
 	issue, _, err := client.GetIssue(ctx.Owner, ctx.Repo, idx)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to get issue #%d: %w", idx, err)
 	}
 
 	if issue.Milestone == nil {
-		return fmt.Errorf("issue is not assigned to a milestone")
+		return fmt.Errorf("issue #%d is not assigned to a milestone", idx)
 	}
 
 	if issue.Milestone.Title != mileName {
-		return fmt.Errorf("issue is not assigned to this milestone")
+		return fmt.Errorf("issue #%d is assigned to milestone '%s', not '%s'", idx, issue.Milestone.Title, mileName)
 	}
 
 	zero := int64(0)
 	_, _, err = client.EditIssue(ctx.Owner, ctx.Repo, idx, gitea.EditIssueOption{
 		Milestone: &zero,
 	})
-	return err
+	if err != nil {
+		return fmt.Errorf("failed to remove issue #%d from milestone '%s': %w", idx, mileName, err)
+	}
+	return nil
 }
diff --git a/cmd/organizations/delete.go b/cmd/organizations/delete.go
index 2cdbd2d..5fb747e 100644
--- a/cmd/organizations/delete.go
+++ b/cmd/organizations/delete.go
@@ -38,7 +38,7 @@ func RunOrganizationDelete(_ stdctx.Context, cmd *cli.Command) error {
 
 	response, err := client.DeleteOrg(ctx.Args().First())
 	if response != nil && response.StatusCode == 404 {
-		return fmt.Errorf("The given organization does not exist")
+		return fmt.Errorf("organization not found: %s", ctx.Args().First())
 	}
 
 	return err