Commit `60cc6810d1`

60cc6810d163822ffc1d5d22221cb58e828f7890

parent: c694ac101b

Verified · cmc

cmc <hello@cleberg.net> · 2026-09-06 21:44 UTC

Fix merge dialog stack options, branch error clearing, draft toggle, and reload assertions

- Merge dialog offers Merge and Fast-forward on a stacked branch, not just Fast-forward
- loadBranches() clears branchesError before fetching
- MRCreateSheet exposes the draft toggle, making --draft reachable
- MR lifecycle action tests assert the reload GETs happen, and that a refusal skips them

Layout: unified · split

gitbay/MRs/MRDetailViewModel.swift +1

	@@ -139,6 +139,7 @@ final class MRDetailViewModel {
139	/// secondary action, not the primary content `load()` refreshes.	139	/// secondary action, not the primary content `load()` refreshes.
140	func loadBranches() async {	140	func loadBranches() async {
141	guard branches == nil else { return }	141	guard branches == nil else { return }
		142	branchesError = nil
142	do {	143	do {
143	let refs = try await client.read(["repo", "refs", repoPath], as: RepoRefs.self)	144	let refs = try await client.read(["repo", "refs", repoPath], as: RepoRefs.self)
144	branches = refs.branches.map(\.name)	145	branches = refs.branches.map(\.name)

gitbay/Views/MRs/MRListView.swift +6

                         .autocorrectionDisabled()
                         .accessibilityIdentifier("mr-body")
                 }
+                Section {
+                    Toggle("Draft", isOn: Bindable(model).draft)
+                        .accessibilityIdentifier("mr-draft")
+                } footer: {
+                    Text("A draft merge request is open but not asking for review: it won't merge and won't show up in a review queue.")
+                }
                 if let error = model.errorMessage {
                     Section {
                         GBNotice(error)

gitbay/Views/MRs/MRView.swift +2 −1

         .refreshable { await model.load() }
         .confirmationDialog("Merge !\(model.number)?", isPresented: $confirmingMerge) {
             if let mr = model.state.value, !mr.stacked.isEmpty {
+                Button("Merge") { Task { await model.merge() } }
                 Button("Fast-forward") { Task { await model.merge(strategy: "ff") } }
             } else {
                 Button("Merge") { Task { await model.merge() } }
             Button("Cancel", role: .cancel) {}
         } message: {
             if let mr = model.state.value, !mr.stacked.isEmpty {
-                Text("Merge requests are stacked on this one. Only a fast-forward merge is offered — squash and rebase would rewrite the commits the stack builds on.")
+                Text("Merge requests are stacked on this one. Squash and rebase are unavailable — they would rewrite the commits the stack builds on.")
             } else {
                 Text("The server enforces approvals, threads and checks — a refusal will say why.")
             }

gitbayTests/MRLifecycleTests.swift +15

             """))
     }
+    /// `load()` issues three GETs: `mr show`, `mr diff`, `mr threads`.
+    /// `loaded()` runs it once (3 GETs, the last two unstubbed and failed),
+    /// so a reload after a write brings the total to 6.
+    private func gets(_ box: StubProtocol.Box) -> Int {
+        box.seen.count { $0.method == "GET" }
+    }
     @Test func markingDraftAndReadyAreDifferentCommands() async throws {
         let (model, box) = try await loaded()
         ok(box)
         await model.setDraft(true)
         var write = try #require(box.seen.first { $0.method == "POST" })
         #expect(try argvOf(write) == ["mr", "draft", "krz/gitbay", "7"])
+        #expect(gets(box) == 6)
         let (model2, box2) = try await loaded()
         ok(box2)
         await model2.setDraft(false)
         write = try #require(box2.seen.first { $0.method == "POST" })
         #expect(try argvOf(write) == ["mr", "ready", "krz/gitbay", "7"])
+        #expect(gets(box2) == 6)
     }
     @Test func retargetPassesTheBranchPositionally() async throws {
         await model.retarget(to: "release")
         let write = try #require(box.seen.first { $0.method == "POST" })
         #expect(try argvOf(write) == ["mr", "retarget", "krz/gitbay", "7", "release"])
+        #expect(gets(box) == 6)
     }
     /// `mr review request` is a THREE-word path. Two words posts a
         let write = try #require(box.seen.first { $0.method == "POST" })
         #expect(try argvOf(write)
             == ["mr", "review", "request", "krz/gitbay", "7", "--add", "rae"])
+        #expect(gets(box) == 6)
     }
     @Test func removingAReviewRequestUsesRemoveNotAdd() async throws {
         let write = try #require(box.seen.first { $0.method == "POST" })
         #expect(try argvOf(write)
             == ["mr", "review", "request", "krz/gitbay", "7", "--remove", "rae"])
+        #expect(gets(box) == 6)
     }
     @Test func branchesComeFromRepoRefs() async throws {
         await model.retarget(to: "release")
         #expect(model.actionError?.isEmpty == false)
         #expect(model.working == false)
+        // A refusal throws before `perform` reaches `load()`: still the
+        // 3 GETs from `loaded()`, none from a reload.
+        #expect(gets(box) == 3)
     }
 }

Commit 60cc6810d1

Commit `60cc6810d1`