╭ changed ───────────────╮ │src/test/event/patch.zig│ ╰────────────────────────╯ ╭───────────╮ │← all files│ ╰───────────╯ ╭──────────────────────────────────────────────────────────────╮ │10 const push = @import("../../push.zig"); │ │11 const serve_common = @import("../../serve_common.zig"); │ │12 const ui = @import("../../ui.zig"); │ │13 +const progress = @import("../../progress.zig"); │ │14 │ │15 const repo_opts: rp.RepoOpts(.xit) = .{ .is_test = true };│ │16 const Repo = rp.Repo(.xit, repo_opts); │ ╰──────────────────────────────────────────────────────────────╯ ╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │156 fn testBranchMerge(selection: evt.Patch.MergeRevision) !void { │ │157 const io = std.testing.io; │ │158 const allocator = std.testing.allocator; │ │158 - const opts: rp.RepoOpts(.xit) = .{ .is_test = true, .ProgressCtx = *serve_common.SidebandProgress };│ │159 + const opts: rp.RepoOpts(.xit) = .{ .is_test = true, .ProgressCtx = *progress.Sideband }; │ │160 var temp = std.testing.tmpDir(.{}); │ │161 defer temp.cleanup(); │ │162 const path = try temp.dir.realPathFileAlloc(io, ".", allocator); │ ╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │201 response.sideband = true; │ │202 var output = std.Io.Writer.Allocating.init(allocator); │ │203 defer output.deinit(); │ │203 - var progress = serve_common.SidebandProgress{ .response = &response, .writer = &output.writer }; │ │204 + var sideband = progress.Sideband{ .response = &response, .writer = &output.writer }; │ │205 const before_refresh = try repo.core.db.rootCursor().count(); │ │205 - try pch.refreshBranches(.server, .xit, opts, io, allocator, &repo, null, &progress); │ │206 + try pch.refreshBranches(.server, .xit, opts, io, allocator, &repo, null, &sideband); │ │207 try std.testing.expectEqual(before_refresh + 1, try repo.core.db.rootCursor().count()); │ │208 try std.testing.expect(std.mem.indexOf(u8, output.written(), "Checking mergeability: 100% (1/1)\n") != null);│ │209 │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │212 const next = try repo.commitAtRef(io, allocator, .{ .message = "revise while closed" }, null, .{ .kind = .head, .name = "feature" });│ │213 const closed_tip = (try repo.readRef(io, evt.events_ref)) orelse return error.NotFound; │ │214 const closed_progress_len = output.written().len; │ │214 - try pch.refreshBranches(.server, .xit, opts, io, allocator, &repo, null, &progress); │ │215 + try pch.refreshBranches(.server, .xit, opts, io, allocator, &repo, null, &sideband); │ │216 try std.testing.expectEqualStrings(&closed_tip, &(try repo.readRef(io, evt.events_ref) orelse return error.NotFound)); │ │217 try std.testing.expectEqual(closed_progress_len, output.written().len); │ │218 │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │271 _ = try repo.commitAtRef(io, allocator, .{ .message = "later" }, null, .{ .kind = .head, .name = "feature" }); │ │272 const tip = (try repo.readRef(io, evt.events_ref)) orelse return error.NotFound; │ │273 const progress_len = output.written().len; │ │273 - try pch.refreshBranches(.server, .xit, opts, io, allocator, &repo, null, &progress); │ │274 + try pch.refreshBranches(.server, .xit, opts, io, allocator, &repo, null, &sideband); │ │275 try std.testing.expectEqual(progress_len, output.written().len); │ │276 try std.testing.expectEqualStrings(&tip, &(try repo.readRef(io, evt.events_ref) orelse return error.NotFound));│ │277 │ ╰────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯