╭ changed ────╮ │src/patch.zig│ ╰─────────────╯ ╭───────────╮ │← all files│ ╰───────────╯ ╭─────────────────────────────────────────────────────╮ │10 const srch_cmmt = @import("search_commit.zig"); │ │11 const fork = @import("fork.zig"); │ │12 const serve_common = @import("serve_common.zig");│ │13 +const progress = @import("./progress.zig"); │ │14 │ │15 // the action a patch merge records │ │16 pub const merge_undo_action = "haxy/merge"; │ ╰─────────────────────────────────────────────────────╯ ╭───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │267 │ │268 const total = patches.count(); │ │269 if (total > 0) { │ │269 - serve_common.reportProgress(repo_opts, io, progress_ctx_maybe, .{ .text = "Updating patches" }); │ │270 - serve_common.reportProgress(repo_opts, io, progress_ctx_maybe, .{ .start = .{ .kind = .writing_patch, .estimated_total_items = total } });│ │270 + progress.report(repo_opts, io, progress_ctx_maybe, .{ .text = "Updating patches" }); │ │271 + progress.report(repo_opts, io, progress_ctx_maybe, .{ .start = .{ .kind = .writing_patch, .estimated_total_items = total } }); │ │272 } │ │273 │ │274 var refreshed = false; │ ╰───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │275 for (patches.keys(), patches.values()) |id, record| { │ │275 - defer serve_common.reportProgress(repo_opts, io, progress_ctx_maybe, .{ .complete_one = .writing_patch });│ │276 + defer progress.report(repo_opts, io, progress_ctx_maybe, .{ .complete_one = .writing_patch }); │ │277 │ │278 // a branch patch opens no fork, so its checks need no lock of their own │ │279 var checks: MergeCheckInputs(repo_opts) = .{}; │ ╰───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭───────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │287 }; │ │288 refreshed = true; │ │289 } │ │289 - if (total > 0) serve_common.reportProgress(repo_opts, io, progress_ctx_maybe, .{ .end = .writing_patch });│ │290 + if (total > 0) progress.report(repo_opts, io, progress_ctx_maybe, .{ .end = .writing_patch }); │ │291 return refreshed; │ │292 } │ │293 │ ╰───────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │545 } │ │546 │ │547 // start progress reporting after the patch count is known │ │547 - serve_common.reportProgress(repo_opts, io, progress_ctx_maybe, .{ .text = "Checking mergeability" }); │ │548 - serve_common.reportProgress(repo_opts, io, progress_ctx_maybe, .{ .start = .{ .kind = .writing_patch, .estimated_total_items = ids.items.len } });│ │548 + progress.report(repo_opts, io, progress_ctx_maybe, .{ .text = "Checking mergeability" }); │ │549 + progress.report(repo_opts, io, progress_ctx_maybe, .{ .start = .{ .kind = .writing_patch, .estimated_total_items = ids.items.len } }); │ │550 │ │551 // refresh each collected patch independently │ │552 for (ids.items) |id| { │ ╰───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │553 refreshMergeability(repo_opts, io, allocator, target_repo, id); │ │553 - serve_common.reportProgress(repo_opts, io, progress_ctx_maybe, .{ .complete_one = .writing_patch });│ │554 + progress.report(repo_opts, io, progress_ctx_maybe, .{ .complete_one = .writing_patch }); │ │555 } │ │556 │ │557 // finish progress reporting after all patches have been visited │ ╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭────────────────────────────────────────────────────────────────────────────────────────────────────╮ │557 - serve_common.reportProgress(repo_opts, io, progress_ctx_maybe, .{ .end = .writing_patch });│ │558 + progress.report(repo_opts, io, progress_ctx_maybe, .{ .end = .writing_patch }); │ │559 } │ │560 │ │561 fn refreshMergeCheck( │ ╰────────────────────────────────────────────────────────────────────────────────────────────────────╯