Commit `c88e4da270`

c88e4da270a522888e0d7215d47b9ed21f138836

parent: 53ba11d5e1

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-14 06:03 UTC

Summarize changes: keep what is typed while the lines load

The lines are appended to the notes as they are when the read returns,
not as they were when it started.

Ref #26

Layout: unified · split

gitbay/Releases/ReleaseViewModels.swift +14 −8

     }
     /// `release notes <owner/name> <tag>`: one line per merge request
-    /// landed since the previous release, appended to `notes` the way the
+    /// landed since the previous release, in the CLI's form. nil when
-    /// web's Summarize changes appends them. The lines are the CLI's.
+    /// there are none or the server refused, with `summaryNote` saying
-    func summarize(tag: String, into notes: String) async -> String {
+    /// which.
+    func summary(tag: String) async -> String? {
         summaryNote = nil
         working = true
         defer { working = false }
                 summaryNote = summary.since.isEmpty
                     ? "No merge requests landed on \(tag)."
                     : "No merge requests landed since \(summary.since)."
-                return notes
+                return nil
             }
-            let lines = summary.items.map { "- \($0.title) (!\($0.number)) by @\($0.author)\n" }.joined()
+            return summary.items.map { "- \($0.title) (!\($0.number)) by @\($0.author)\n" }.joined()
-            let typed = notes.trimmingCharacters(in: .whitespacesAndNewlines)
-            return typed.isEmpty ? lines : typed + "\n\n" + lines
         } catch let error as GitbayError {
             summaryNote = error.userFacingMessage
         } catch {
             summaryNote = GitbayError.transport(error).userFacingMessage
         }
-        return notes
+        return nil
+    }
+    /// The notes with `lines` after them, as the web's Summarize changes
+    /// appends them.
+    nonisolated static func appending(_ lines: String, to notes: String) -> String {
+        let typed = notes.trimmingCharacters(in: .whitespacesAndNewlines)
+        return typed.isEmpty ? lines : typed + "\n\n" + lines
     }
     /// `release create <owner/name> <tag> [--title <t>] [--file -]` —

gitbay/Views/Releases/ReleaseListView.swift +5 −2

                         .autocorrectionDisabled()
                     Button("Summarize changes") {
                         Task {
-                            notes = await model.summarize(
+                            // Appended to the notes as they are when the lines
-                                tag: tag.trimmingCharacters(in: .whitespaces), into: notes)
+                            // arrive, so typing meanwhile is kept.
+                            if let lines = await model.summary(tag: tag.trimmingCharacters(in: .whitespaces)) {
+                                notes = ReleaseListViewModel.appending(lines, to: notes)
+                            }
                         }
                     }
                     .disabled(tag.trimmingCharacters(in: .whitespaces).isEmpty || model.working)

gitbayTests/ReleaseTests.swift +9 −11

 @MainActor
 struct ReleaseSummaryTests {
-    @Test func summarizingAppendsOneLinePerMergeRequestAfterWhatWasTyped() async throws {
+    @Test func theSummaryIsOneLinePerMergeRequestAppendedAfterWhatWasTyped() async throws {
         let (client, stub) = try makeClient()
         stub.enqueue(.init(status: 200, json: """
             {"protocol_version":1,"data":{"since":"v1.0.0","items":[\
             """))
         let model = ReleaseListViewModel(client: client, repoPath: "krz/gitbay")
-        let notes = await model.summarize(tag: "v1.1.0", into: "Second cut.")
+        let lines = try #require(await model.summary(tag: "v1.1.0"))
-        #expect(notes == "Second cut.\n\n- Add a thing (!12) by @cmc\n- Fix it (!14) by @dee\n")
+        #expect(ReleaseListViewModel.appending(lines, to: "Second cut.\n")
+                == "Second cut.\n\n- Add a thing (!12) by @cmc\n- Fix it (!14) by @dee\n")
+        #expect(ReleaseListViewModel.appending(lines, to: "  ") == lines)
         #expect(stub.seen.first?.url.query() == "argv=release&argv=notes&argv=krz/gitbay&argv=v1.1.0")
         #expect(model.summaryNote == nil)
     }
-    @Test func anEmptyRangeLeavesTheNotesAndSaysWhy() async throws {
+    @Test func anEmptyRangeGivesNoLinesAndSaysWhy() async throws {
         let (client, stub) = try makeClient()
         stub.enqueue(.init(status: 200, json: #"{"protocol_version":1,"data":{"since":"v1.0.0","items":[]},"exit_code":0}"#))
         let model = ReleaseListViewModel(client: client, repoPath: "krz/gitbay")
-        let notes = await model.summarize(tag: "v1.1.0", into: "typed")
+        #expect(await model.summary(tag: "v1.1.0") == nil)
-        #expect(notes == "typed")
         #expect(model.summaryNote == "No merge requests landed since v1.0.0.")
     }
-    @Test func aRefusalLeavesTheNotesAndShowsIt() async throws {
+    @Test func aRefusalGivesNoLinesAndShowsIt() async throws {
         let (client, stub) = try makeClient()
         stub.enqueue(.init(status: 404, json: #"{"protocol_version":1,"error":"no ref \"v9\" in krz/gitbay","exit_code":3}"#))
         let model = ReleaseListViewModel(client: client, repoPath: "krz/gitbay")
-        let notes = await model.summarize(tag: "v9", into: "")
+        #expect(await model.summary(tag: "v9") == nil)
-        #expect(notes == "")
         #expect(model.summaryNote == #"no ref "v9" in krz/gitbay"#)
     }
 }

Commit c88e4da270

Commit `c88e4da270`