Commit `e56e8ca1bb`

e56e8ca1bb20b1546231e63c75601742f6dafd77

parent: 2faceb4c41

Verified · cmc

cmc <hello@cleberg.net> · 2026-09-29 05:23 UTC

cli: mr apply-suggestion takes --json on both paths; a local apply whose thread stays open warns and exits 0

Ref #288

Layout: unified · split

cmd/gitbay/local.go +34 −6

 		fmt.Fprintln(os.Stderr, "gitbay:", err)
 		return protocol.ExitFailure
 	}
-	if args, err = withRepo(t, args); err != nil {
+	asJSON := false
+	var rest []string
+	for _, a := range args {
+		if a == "--json" {
+			asJSON = true
+			continue
+		}
+		rest = append(rest, a)
+	}
+	if args, err = withRepo(t, rest); err != nil {
 		fmt.Fprintln(os.Stderr, "gitbay:", err)
 		return protocol.ExitUsage
 	}
 	if len(args) != 3 {
-		fmt.Fprintln(os.Stderr, "usage: gitbay mr apply-suggestion [<owner/name>] <n> <thread-id>")
+		fmt.Fprintln(os.Stderr, "usage: gitbay mr apply-suggestion [<owner/name>] <n> <thread-id> [--json]")
 		return protocol.ExitUsage
 	}
 	repo, n, thread := args[0], args[1], args[2]
 		fmt.Fprintf(os.Stderr, "gitbay: thread %s carries no suggestion\n", thread)
 		return protocol.ExitUsage
 	case s.Apply != "local":
-		return runSSH(t, []string{"mr", "apply-suggestion", repo, n, thread}, strings.NewReader(""))
+		argv := []string{"mr", "apply-suggestion", repo, n, thread}
+		if asJSON {
+			argv = append(argv, "--json")
+		}
+		return runSSH(t, argv, strings.NewReader(""))
 	case s.Outdated:
 		fmt.Fprintf(os.Stderr, "gitbay: suggestion in thread %s is outdated: %s\n", thread, s.Reason)
 		return protocol.ExitUsage
 	if code := runGitLocal("push", "--quiet", url, sha+":refs/heads/"+branch); code != 0 {
 		return code
 	}
-	if _, code := captureSSH(t, []string{"mr", "resolve", repo, n, thread}); code != 0 {
+	// The commit has landed, so a thread that cannot be resolved (the
-		return code
+	// server's resolve rule is narrower than who can push) is a warning,
+	// not a failure; captureSSH has already printed the server's reason.
+	_, code = captureSSH(t, []string{"mr", "resolve", repo, n, thread})
+	resolved := code == 0
+	if asJSON {
+		out, _ := json.Marshal(protocol.Envelope{ProtocolVersion: protocol.Version, Data: map[string]any{
+			"thread": tn, "sha": sha, "source": mr.Data.Source, "branch": branch, "resolved": resolved}})
+		fmt.Println(string(out))
+	} else {
+		fmt.Printf("applied thread %s to %s at %.10s", thread, mr.Data.Source, sha)
+		if resolved {
+			fmt.Print("; thread resolved")
+		}
+		fmt.Println()
+	}
+	if !resolved {
+		fmt.Fprintf(os.Stderr, "gitbay: warning: thread %s is still open\n", thread)
 	}
-	fmt.Printf("applied thread %s to %s at %.10s; thread resolved\n", thread, mr.Data.Source, sha)
 	return 0
 }

e2e/suggestion_test.go +18 −2

 		t.Fatalf("reader applied a suggestion: exit %d %s", code, errOut)
 	}
-	out, errOut, code := c.run(t, dir, "", "mr", "apply-suggestion", "1", thread)
+	out, errOut, code := c.run(t, dir, "", "mr", "apply-suggestion", "1", thread, "--json")
 	if code != 0 {
 		t.Fatalf("apply-suggestion: exit %d\n%s\n%s", code, out, errOut)
 	}
+	if !strings.Contains(out, `"resolved":true`) {
+		t.Errorf("apply-suggestion --json = %s", out)
+	}
 	mustGit(t, dir, env, "fetch", "-q", "origin", "feat")
 	if got := mustGit(t, dir, env, "show", "FETCH_HEAD:lib.txt"); got != "one\nTWO\nTWO AND A HALF\nthree\n" {
 		t.Fatalf("lib.txt = %q", got)
 		t.Fatalf("server-side apply on a require-signed repository: exit %d %s", code, errOut)
 	}
-	out, errOut, code := c.run(t, dir, "", "mr", "apply-suggestion", "1", thread)
+	out, errOut, code := c.run(t, dir, "", "mr", "apply-suggestion", "1", thread, "--json")
 	if code != 0 {
 		t.Fatalf("local apply-suggestion: exit %d\n%s\n%s", code, out, errOut)
 	}
+	var res struct {
+		Data struct {
+			SHA      string `json:"sha"`
+			Branch   string `json:"branch"`
+			Resolved bool   `json:"resolved"`
+		} `json:"data"`
+	}
+	if err := json.Unmarshal([]byte(out), &res); err != nil || res.Data.Branch != "feat" || !res.Data.Resolved {
+		t.Fatalf("local apply-suggestion --json = %s (%v)", out, err)
+	}
 	mustGit(t, dir, env, "fetch", "-q", "origin", "feat")
+	if tip := strings.TrimSpace(mustGit(t, dir, env, "rev-parse", "FETCH_HEAD")); tip != res.Data.SHA {
+		t.Errorf("reported sha %s, branch at %s", res.Data.SHA, tip)
+	}
 	if got := mustGit(t, dir, env, "show", "FETCH_HEAD:lib.txt"); got != "one\nTWO\nTWO AND A HALF\nthree\n" {
 		t.Fatalf("lib.txt = %q", got)
 	}

Commit e56e8ca1bb

Commit `e56e8ca1bb`