HAXY

▄ ▄▄▄▄▄ ▄ ▄▀ ▄▀▀▀▀▀▀ ▄ ▀▄ ▀▀▀▀▀▀▀▀ ▀▀ ▀▀▄ ▀▀▀▀▀▀▀▀ ▀▀▀ ▀▀▀▀ ▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀ ▀▄ ▀▀▀▀▀▀▀▀▀▄ ▀▀▀▀▀▀▀ ▀ ▀▀▀▀▀▀▀▀▀▀▄ ▄▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▄ ▄▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▄ ▀▀▀▀▀▀▀▀▀▀▀▀ ▄▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄ ▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▄▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▄ ▄▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▄▄▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▄▀▀▀▀▀▄ ▄▀▀▀▀▀▀▀▀ ▀▀▀▄ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▄▀▀▀▀▀▀▀▀▀▀▄▄▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄▀▀▀▀ ▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▄▀▀▀▀▄ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄▀▀▀▀ ▀▀▀▀ ▀▀▀▀▄▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▄▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▄▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▄▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄ ▀▀▀▀▀▀▀▀▀▀▀▄▄▀▀▀▄▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▄▀▀▀▀▀▄ ▀▀▀▀▀▀▄▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▄▄▀▀▀▀▀▀▀▀▀▀ ▄▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀

╭ patch.zig ────────────────────────────────────────────────────╮ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ╰───────────────────────────────────────────────────────────────╯

╭────╮ ╭ clone ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ╮ │http│ ssh │ │ ╰────╯ ╰ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ╯

1 const std = @import("std"); 2 const evt = @import("event.zig"); 3 const xit = @import("xit"); 4 const rp = xit.repo; 5 const hash = xit.hash; 6 const obj = xit.object; 7 const rf = xit.ref; 8 const mrg = xit.merge; 9 const find = @import("find.zig"); 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"; 17 18 // the action a mergeability recheck records 19 pub const mergeability_undo_action = "haxy/mergeability"; 20 21 // whether a push moved this branch 22 fn branchUpdated(updates: []const xit.net_server_receive_pack.AppliedRefUpdate, branch: []const u8) bool { 23 const prefix = "refs/heads/"; 24 for (updates) |update| { 25 if (std.mem.startsWith(u8, update.ref_name, prefix) and std.mem.eql(u8, update.ref_name[prefix.len..], branch)) return true; 26 } 27 return false; 28 } 29 30 // capture an existing branch without creating a fork 31 pub fn writeBranchPatch( 32 host_kind: evt.HostKind, 33 comptime repo_kind: rp.RepoKind, 34 comptime repo_opts: rp.RepoOpts(repo_kind), 35 io: std.Io, 36 allocator: std.mem.Allocator, 37 repo: *rp.Repo(repo_kind, repo_opts), 38 id: [evt.event_id_size * 2]u8, 39 patch: evt.Patch, 40 expected_patch: ?evt.Patch, 41 author: evt.CommitAuthor, 42 ) !void { 43 var arena = std.heap.ArenaAllocator.init(allocator); 44 defer arena.deinit(); 45 46 // write git events through the local event database 47 if (repo_kind == .git) { 48 // reject edits based on an outdated patch 49 if (expected_patch) |expected| { 50 const current = (try evt.readFromRepo(evt.Patch, repo_kind, repo_opts, io, allocator, &arena, repo, &try evt.parseEventId(&id))) orelse return error.PatchOutOfDate; 51 if (current.removed or !evt.fieldEqual(evt.Patch, current.event, expected)) return error.PatchOutOfDate; 52 } 53 54 // capture the branch revision and consume its events 55 const events = try branchEvents(repo_kind, repo_opts, .{ .core = &repo.core, .extra = .{} }, io, &arena, id, patch, author); 56 try evt.consume(host_kind, .repo, repo_kind, repo_opts, io, allocator, repo, evt.events_ref, &events); 57 } else { 58 const DB = evt.EventDB(repo_opts.hash); 59 60 const first_parent = try eventsFirstParent(repo_kind, repo_opts, io, allocator, repo); 61 62 // commit the patch, mergeability, and undo record together 63 { 64 const Ctx = struct { 65 repo: *rp.Repo(repo_kind, repo_opts), 66 io: std.Io, 67 arena: *std.heap.ArenaAllocator, 68 id: [evt.event_id_size * 2]u8, 69 patch: evt.Patch, 70 expected_patch: ?evt.Patch, 71 author: evt.CommitAuthor, 72 checks: *MergeCheckInputs(repo_opts), 73 first_parent: ?[1][hash.hexLen(repo_opts.hash)]u8, 74 75 pub fn run(ctx: @This(), cursor: *DB.Cursor(.read_write)) !void { 76 var moment = try DB.HashMap(.read_write).init(cursor.*); 77 const state = rp.Repo(repo_kind, repo_opts).State(.read_write){ .core = &ctx.repo.core, .extra = .{ .moment = &moment } }; 78 79 try writeBranchPatchInTransaction(repo_opts, state, &moment, ctx.io, ctx.arena, ctx.id, ctx.patch, ctx.expected_patch, ctx.author, ctx.first_parent, ctx.checks); 80 81 // record the user action for undo 82 try xit.undo.write(repo_opts, state, std.Io.Timestamp.now(ctx.io, .real).toSeconds(), .{ .custom = .{ .action_kind = evt.undo_action } }); 83 } 84 }; 85 86 // a branch patch has no fork, so this only names the patch to check 87 var checks: MergeCheckInputs(repo_opts) = .{}; 88 defer checks.deinit(io, allocator); 89 if (host_kind == .server) try checks.add(io, allocator, repo.core.work_path, try evt.parseEventId(&id), patch); 90 91 try repo.core.db_file.lock(io, .exclusive); 92 defer repo.core.db_file.unlock(io); 93 94 const history = try DB.ArrayList(.read_write).init(repo.core.db.rootCursor()); 95 try history.appendContext(.{ .slot = try history.getSlot(-1) }, Ctx{ .repo = repo, .io = io, .arena = &arena, .id = id, .patch = patch, .expected_patch = expected_patch, .author = author, .checks = &checks, .first_parent = first_parent }); 96 } 97 } 98 } 99 100 // write one branch patch's revision into a transaction the caller owns. the 101 // undo record is the caller's to write, since the transaction may be theirs. 102 // git repos never reach here: they write through the local event database 103 pub fn writeBranchPatchInTransaction( 104 comptime repo_opts: rp.RepoOpts(.xit), 105 state: rp.Repo(.xit, repo_opts).State(.read_write), 106 moment: *evt.EventDB(repo_opts.hash).HashMap(.read_write), 107 io: std.Io, 108 arena: *std.heap.ArenaAllocator, 109 id: [evt.event_id_size * 2]u8, 110 patch: evt.Patch, 111 expected_patch: ?evt.Patch, 112 author: evt.CommitAuthor, 113 first_parent: ?[1][hash.hexLen(repo_opts.hash)]u8, 114 checks: *MergeCheckInputs(repo_opts), 115 ) !void { 116 const DB = evt.EventDB(repo_opts.hash); 117 118 // recheck the expected patch under the repository lock 119 if (expected_patch) |expected| { 120 const events_moment = try evt.currentMomentFromRepoMoment(repo_opts.hash, moment.readOnly()); 121 const current = (try evt.Patch.readById(DB, repo_opts.hash, events_moment, arena, &try evt.parseEventId(&id))) orelse return error.PatchOutOfDate; 122 if (current.removed or !evt.fieldEqual(evt.Patch, current.event, expected)) return error.PatchOutOfDate; 123 } 124 125 // capture and consume the branch revision 126 const events = try branchEvents(.xit, repo_opts, state, io, arena, id, patch, author); 127 { 128 const parent = if (try rf.readRecur(.xit, repo_opts, state.readOnly(), io, .{ .ref = evt.events_ref }) == null) first_parent else null; 129 try evt.commitEvents(.xit, repo_opts, state, io, arena.child_allocator, evt.events_ref, &events, parent); 130 if (!try evt.consumeInTransaction(.repo, .xit, repo_opts, state, &state.core.db, moment, io, arena.child_allocator, evt.events_ref)) return error.CancelTransaction; 131 } 132 133 // save mergeability before finishing the patch transaction 134 _ = try checks.update(state, io, arena.child_allocator); 135 } 136 137 // continue from a remote event history when the local ref is absent, so a 138 // fresh clone's first event does not start a history of its own 139 fn eventsFirstParent( 140 comptime repo_kind: rp.RepoKind, 141 comptime repo_opts: rp.RepoOpts(repo_kind), 142 io: std.Io, 143 allocator: std.mem.Allocator, 144 repo: *rp.Repo(repo_kind, repo_opts), 145 ) !?[1][hash.hexLen(repo_opts.hash)]u8 { 146 if (try repo.readRef(io, evt.events_ref) != null) return null; 147 var remotes = try repo.listRemotes(io, allocator); 148 defer remotes.deinit(); 149 for (remotes.sections.keys()) |name| { 150 if (try repo.readRef(io, .{ .kind = .{ .remote = name }, .name = evt.events_ref.name })) |oid| return .{oid}; 151 } 152 return null; 153 } 154 155 fn branchEvents( 156 comptime repo_kind: rp.RepoKind, 157 comptime repo_opts: rp.RepoOpts(repo_kind), 158 state: rp.Repo(repo_kind, repo_opts).State(.read_write), 159 io: std.Io, 160 arena: *std.heap.ArenaAllocator, 161 id: [evt.event_id_size * 2]u8, 162 patch: evt.Patch, 163 author: evt.CommitAuthor, 164 ) ![2]evt.EventWithId { 165 // validate the patch fields and branch names 166 const branch = patch.source_branch orelse return error.InvalidSourceBranch; 167 if (!evt.Patch.fieldsValid(patch.title, patch.labels)) return error.InvalidFields; 168 if (!evt.Patch.branchValid(branch)) return error.InvalidSourceBranch; 169 if (!evt.Patch.branchValid(patch.target_branch)) return error.InvalidTargetBranch; 170 171 // resolve both tips and their common ancestor 172 const source = (try rf.readRecur(repo_kind, repo_opts, state.readOnly(), io, .{ .ref = .{ .kind = .head, .name = branch } })) orelse return error.InvalidSourceBranch; 173 const target = (try rf.readRecur(repo_kind, repo_opts, state.readOnly(), io, .{ .ref = .{ .kind = .head, .name = patch.target_branch } })) orelse return error.InvalidTargetBranch; 174 if (std.mem.eql(u8, branch, patch.target_branch)) return error.SameBranch; 175 const base = mrg.commonAncestor(repo_kind, repo_opts, state.readOnly(), io, arena.allocator(), &target, &source) catch |err| switch (err) { 176 error.NoCommonAncestor => return error.UnrelatedBranches, 177 else => return err, 178 }; 179 180 // prepare the revision and attach it to the patch event 181 const timestamp: u64 = @intCast(std.Io.Timestamp.now(io, .real).toSeconds()); 182 const prepared = try evt.PatchRev.prepare(repo_kind, repo_opts, state, io, arena, &base, &source, patch.title, author, timestamp); 183 var updated = patch; 184 updated.revision = prepared.revision; 185 return .{ 186 prepared.event, 187 .{ .id = id, .author = author, .timestamp = timestamp, .event = .{ .patch = updated } }, 188 }; 189 } 190 191 // the open patches whose source branch has moved past the revision they 192 // stored, mapped to the record the refresh rewrites. `updates` limits the 193 // search to the branches one push changed 194 fn collectOutdatedBranchPatches( 195 comptime repo_kind: rp.RepoKind, 196 comptime repo_opts: rp.RepoOpts(repo_kind), 197 io: std.Io, 198 allocator: std.mem.Allocator, 199 arena: *std.heap.ArenaAllocator, 200 state: rp.Repo(repo_kind, repo_opts).State(.read_only), 201 moment: evt.EventDB(repo_opts.hash).HashMap(.read_only), 202 updates: ?[]const xit.net_server_receive_pack.AppliedRefUpdate, 203 host_kind: evt.HostKind, 204 patches: *std.AutoArrayHashMapUnmanaged([evt.event_id_size]u8, evt.Patch.Record), 205 ) !void { 206 const DB = evt.EventDB(repo_opts.hash); 207 // find tracked source branches and skip conflicting patches 208 const source_cursor = try moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.source_to_id_set_key)) orelse return; 209 const sources = try DB.SortedMap(.read_only).init(source_cursor); 210 const conflicts = if (try moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.conflicts_key))) |cursor| try DB.SortedMap(.read_only).init(cursor) else null; 211 var iter = try sources.iterator(); 212 while (try iter.next()) |cursor| { 213 const pair = try cursor.readKeyValuePair(); 214 const branch = try pair.key_cursor.readBytesAlloc(arena.allocator(), null); 215 216 // limit source refreshes to branches changed by this push 217 if (updates) |changed| if (!branchUpdated(changed, branch)) continue; 218 219 // read the source tip before comparing stored revisions 220 const source = (try rf.readRecur(repo_kind, repo_opts, state, io, .{ .ref = .{ .kind = .head, .name = branch } })) orelse { 221 if (host_kind == .server) std.log.warn("patch source branch missing: {s}", .{branch}); 222 continue; 223 }; 224 225 // collect open patches whose stored source tip is outdated 226 const ids = try DB.CountedHashSet(.read_only).init(pair.value_cursor); 227 var ids_iter = try ids.iterator(); 228 while (try ids_iter.next()) |id_cursor| { 229 const id_pair = try id_cursor.readKeyValuePair(); 230 var id: [evt.event_id_size]u8 = undefined; 231 if ((try id_pair.key_cursor.readBytes(&id)).len != id.len) return error.InvalidPatch; 232 const record = (try evt.Patch.readById(DB, repo_opts.hash, moment, arena, &id)) orelse continue; 233 if (record.removed or record.event.status.kind() != .open) continue; 234 if (conflicts) |map| if (try map.getCursor(&evt.orderKeyDesc(record.created_order, &id)) != null) continue; 235 if (record.event.revision) |revision| if (std.mem.eql(u8, revision.source_oid, &source)) continue; 236 try patches.put(allocator, id, record); 237 } 238 } 239 } 240 241 // refresh the patches their source branch has outrun, inside the caller's 242 // transaction, so a push and the revisions it causes land together. reports 243 // whether any revision was written, so a caller that owns an otherwise empty 244 // transaction can cancel it. mergeability is only saved for branch patches: 245 // a fork's lock has to be taken before this transaction opened 246 pub fn refreshBranchesInTransaction( 247 host_kind: evt.HostKind, 248 comptime repo_opts: rp.RepoOpts(.xit), 249 state: rp.Repo(.xit, repo_opts).State(.read_write), 250 moment: *evt.EventDB(repo_opts.hash).HashMap(.read_write), 251 io: std.Io, 252 allocator: std.mem.Allocator, 253 updates: ?[]const xit.net_server_receive_pack.AppliedRefUpdate, 254 first_parent: ?[1][hash.hexLen(repo_opts.hash)]u8, 255 progress_ctx_maybe: ?repo_opts.ProgressCtx, 256 ) !bool { 257 var arena = std.heap.ArenaAllocator.init(allocator); 258 defer arena.deinit(); 259 var patches: std.AutoArrayHashMapUnmanaged([evt.event_id_size]u8, evt.Patch.Record) = .empty; 260 defer patches.deinit(allocator); 261 262 const events_moment = evt.currentMomentFromRepoMoment(repo_opts.hash, moment.readOnly()) catch |err| switch (err) { 263 error.NotFound => return false, 264 else => return err, 265 }; 266 try collectOutdatedBranchPatches(.xit, repo_opts, io, allocator, &arena, state.readOnly(), events_moment, updates, host_kind, &patches); 267 268 const total = patches.count(); 269 if (total > 0) { 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| { 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) = .{}; 280 defer checks.deinit(io, allocator); 281 if (host_kind == .server) try checks.add(io, allocator, state.core.work_path, id, record.event); 282 283 const author = evt.CommitAuthor{ .name = "haxy", .email = record.author_email orelse "user@haxy" }; 284 writeBranchPatchInTransaction(repo_opts, state, moment, io, &arena, std.fmt.bytesToHex(id, .lower), record.event, record.event, author, first_parent, &checks) catch |err| { 285 std.log.warn("failed to refresh branch patch: {s}", .{@errorName(err)}); 286 continue; 287 }; 288 refreshed = true; 289 } 290 if (total > 0) progress.report(repo_opts, io, progress_ctx_maybe, .{ .end = .writing_patch }); 291 return refreshed; 292 } 293 294 // refresh open patches' tracked branches and, on the server, their 295 // mergeability. this runs after the caller's transaction, and on xit writes 296 // every revision in one transaction of its own 297 pub fn refreshBranches( 298 host_kind: evt.HostKind, 299 comptime repo_kind: rp.RepoKind, 300 comptime repo_opts: rp.RepoOpts(repo_kind), 301 io: std.Io, 302 allocator: std.mem.Allocator, 303 repo: *rp.Repo(repo_kind, repo_opts), 304 updates: ?[]const xit.net_server_receive_pack.AppliedRefUpdate, 305 progress_ctx_maybe: ?repo_opts.ProgressCtx, 306 ) !void { 307 if (repo_kind == .xit) { 308 const DB = evt.EventDB(repo_opts.hash); 309 310 // every revision shares one transaction, so the refresh is a single 311 // undo entry. the transaction collects the patches itself, and is 312 // cancelled when none of them moved 313 { 314 const Ctx = struct { 315 core: *rp.Repo(.xit, repo_opts).Core, 316 io: std.Io, 317 allocator: std.mem.Allocator, 318 host_kind: evt.HostKind, 319 updates: ?[]const xit.net_server_receive_pack.AppliedRefUpdate, 320 first_parent: ?[1][hash.hexLen(repo_opts.hash)]u8, 321 progress_ctx_maybe: ?repo_opts.ProgressCtx, 322 323 pub fn run(ctx: @This(), cursor: *DB.Cursor(.read_write)) !void { 324 var moment = try DB.HashMap(.read_write).init(cursor.*); 325 const state = rp.Repo(.xit, repo_opts).State(.read_write){ .core = ctx.core, .extra = .{ .moment = &moment } }; 326 if (!try refreshBranchesInTransaction(ctx.host_kind, repo_opts, state, &moment, ctx.io, ctx.allocator, ctx.updates, ctx.first_parent, ctx.progress_ctx_maybe)) return error.CancelTransaction; 327 328 // record the user action for undo 329 try xit.undo.write(repo_opts, state, std.Io.Timestamp.now(ctx.io, .real).toSeconds(), .{ .custom = .{ .action_kind = evt.undo_action } }); 330 } 331 }; 332 333 const first_parent = try eventsFirstParent(repo_kind, repo_opts, io, allocator, repo); 334 335 try repo.core.db_file.lock(io, .exclusive); 336 defer repo.core.db_file.unlock(io); 337 338 const history = try DB.ArrayList(.read_write).init(repo.core.db.rootCursor()); 339 history.appendContext(.{ .slot = try history.getSlot(-1) }, Ctx{ 340 .core = &repo.core, 341 .io = io, 342 .allocator = allocator, 343 .host_kind = host_kind, 344 .updates = updates, 345 .first_parent = first_parent, 346 .progress_ctx_maybe = progress_ctx_maybe, 347 }) catch |err| switch (err) { 348 error.CancelTransaction => {}, 349 else => return err, 350 }; 351 } 352 353 // every open patch is checked after the transaction, since a fork's 354 // lock has to be taken before the target's 355 if (host_kind == .server) refreshOpenMergeability(repo_opts, io, allocator, repo, updates, progress_ctx_maybe); 356 return; 357 } 358 359 // git repos have no transaction to share, so each revision is written on 360 // its own through the local event database. they report no progress, 361 // since only a push has a progress context to report to 362 var arena = std.heap.ArenaAllocator.init(allocator); 363 defer arena.deinit(); 364 var patches: std.AutoArrayHashMapUnmanaged([evt.event_id_size]u8, evt.Patch.Record) = .empty; 365 defer patches.deinit(allocator); 366 367 collect: { 368 var local_db = (try evt.LocalEventDB(repo_opts.hash).openReadOnly(io, allocator, repo.core.repo_dir)) orelse break :collect; 369 defer local_db.deinit(io, allocator); 370 const moment = evt.currentMomentFromDb(repo_opts.hash, local_db.db) catch |err| switch (err) { 371 error.NotFound => break :collect, 372 else => return err, 373 }; 374 try collectOutdatedBranchPatches(repo_kind, repo_opts, io, allocator, &arena, .{ .core = &repo.core, .extra = .{} }, moment, updates, host_kind, &patches); 375 } 376 377 for (patches.keys(), patches.values()) |id, record| { 378 const author = evt.CommitAuthor{ .name = "haxy", .email = record.author_email orelse "user@haxy" }; 379 writeBranchPatch(host_kind, repo_kind, repo_opts, io, allocator, repo, std.fmt.bytesToHex(id, .lower), record.event, record.event, author) catch |err| { 380 if (host_kind == .server) std.log.warn("failed to refresh branch patch: {s}", .{@errorName(err)}); 381 }; 382 } 383 } 384 385 pub const PublishInput = struct { 386 id: [evt.event_id_size * 2]u8, 387 user_id: [evt.event_id_size]u8, 388 repo_id: [evt.event_id_size]u8, 389 author: evt.CommitAuthor, 390 timestamp: u64, 391 }; 392 393 pub const EditDraftInput = struct { 394 id: [evt.event_id_size * 2]u8, 395 user_id: [evt.event_id_size]u8, 396 repo_id: [evt.event_id_size]u8, 397 title: []const u8, 398 labels: []const u8, 399 description: []const u8, 400 target_branch: []const u8, 401 author: evt.CommitAuthor, 402 timestamp: u64, 403 }; 404 405 pub const Mergeability = struct { 406 pub const Status = enum { clean, conflict, unknown }; 407 408 source: Status = .unknown, 409 squash: Status = .unknown, 410 411 pub fn get(self: Mergeability, revision: evt.Patch.MergeRevision) Status { 412 return switch (revision) { 413 .source => self.source, 414 .squash => self.squash, 415 }; 416 } 417 418 pub fn status(self: Mergeability) Status { 419 if (self.source == .clean or self.squash == .clean) return .clean; 420 if (self.source == .conflict and self.squash == .conflict) return .conflict; 421 return .unknown; 422 } 423 }; 424 425 const MergeCheck = struct { 426 revision: evt.Patch.Revision, 427 target_branch: []const u8, 428 target_oid: []const u8, 429 result: Mergeability = .{}, 430 431 fn matches(self: MergeCheck, patch: evt.Patch, target_oid: []const u8) bool { 432 return evt.fieldEqual(?evt.Patch.Revision, self.revision, patch.revision) and 433 std.mem.eql(u8, self.target_branch, patch.target_branch) and 434 std.mem.eql(u8, self.target_oid, target_oid); 435 } 436 }; 437 438 fn readMergeCheck( 439 comptime repo_opts: rp.RepoOpts(.xit), 440 haxy_moment: evt.EventDB(repo_opts.hash).HashMap(.read_only), 441 arena: *std.heap.ArenaAllocator, 442 id: *const [evt.event_id_size]u8, 443 ) !?MergeCheck { 444 const DB = evt.EventDB(repo_opts.hash); 445 446 // find the cached check for this patch 447 const map_cursor = try haxy_moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.patch_id_to_mergeability_key)) orelse return null; 448 const map = try DB.HashMap(.read_only).init(map_cursor); 449 const cursor = try map.getCursor(hash.hashInt(repo_opts.hash, id)) orelse return null; 450 451 // treat unrecognized cached statuses as a cache miss 452 return evt.read(MergeCheck, DB, repo_opts.hash, arena, try DB.HashMap(.read_only).init(cursor)) catch |err| switch (err) { 453 error.InvalidEnumTag => return null, 454 else => return err, 455 }; 456 } 457 458 // reads never run a merge or refresh the cache 459 pub fn readMergeability( 460 comptime repo_opts: rp.RepoOpts(.xit), 461 state: rp.Repo(.xit, repo_opts).State(.read_only), 462 io: std.Io, 463 arena: *std.heap.ArenaAllocator, 464 id: *const [evt.event_id_size]u8, 465 patch: evt.Patch, 466 ) !Mergeability { 467 // reject checks for an outdated source revision 468 if (patch.source_branch != null and !try branchCurrent(repo_opts, state, io, arena, patch)) return .{}; 469 470 // use the cached result only when the target still matches 471 const target_oid = try rf.readRecur(.xit, repo_opts, state, io, .{ .ref = .{ .kind = .head, .name = patch.target_branch } }) orelse return .{}; 472 const haxy_moment = evt.currentMomentFromRepoMoment(repo_opts.hash, state.extra.moment.*) catch |err| switch (err) { 473 error.NotFound => return .{}, 474 else => return err, 475 }; 476 const cached = try readMergeCheck(repo_opts, haxy_moment, arena, id) orelse return .{}; 477 return if (cached.matches(patch, &target_oid)) cached.result else .{}; 478 } 479 480 // refresh after the caller's transaction and locks have finished. a check 481 // failure must not turn an accepted push or event into a failed operation. 482 pub fn refreshMergeability( 483 comptime repo_opts: rp.RepoOpts(.xit), 484 io: std.Io, 485 allocator: std.mem.Allocator, 486 target_repo: *rp.Repo(.xit, repo_opts), 487 id: [evt.event_id_size]u8, 488 ) void { 489 refreshMergeCheck(repo_opts, io, allocator, target_repo, &id) catch |err| { 490 std.log.warn("failed to refresh mergeability: {s}", .{@errorName(err)}); 491 }; 492 } 493 494 // check the open patches a push could have invalidated, reporting progress as 495 // each one finishes. `updates` limits them to the branches it moved 496 pub fn refreshOpenMergeability( 497 comptime repo_opts: rp.RepoOpts(.xit), 498 io: std.Io, 499 allocator: std.mem.Allocator, 500 target_repo: *rp.Repo(.xit, repo_opts), 501 updates: ?[]const xit.net_server_receive_pack.AppliedRefUpdate, 502 progress_ctx_maybe: ?repo_opts.ProgressCtx, 503 ) void { 504 refreshOpenMergeChecks(repo_opts, io, allocator, target_repo, updates, progress_ctx_maybe) catch |err| { 505 std.log.warn("failed to refresh mergeability: {s}", .{@errorName(err)}); 506 }; 507 } 508 509 fn refreshOpenMergeChecks( 510 comptime repo_opts: rp.RepoOpts(.xit), 511 io: std.Io, 512 allocator: std.mem.Allocator, 513 target_repo: *rp.Repo(.xit, repo_opts), 514 updates: ?[]const xit.net_server_receive_pack.AppliedRefUpdate, 515 progress_ctx_maybe: ?repo_opts.ProgressCtx, 516 ) !void { 517 // collect open patch ids before any refresh changes the database 518 const DB = evt.EventDB(repo_opts.hash); 519 var arena = std.heap.ArenaAllocator.init(allocator); 520 defer arena.deinit(); 521 var ids: std.ArrayList([evt.event_id_size]u8) = .empty; 522 defer ids.deinit(allocator); 523 collect: { 524 const moment = evt.currentMoment(repo_opts, target_repo) catch |err| switch (err) { 525 error.NotFound => break :collect, 526 else => return err, 527 }; 528 const statuses_cursor = try moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.status_to_id_set_key)) orelse break :collect; 529 const statuses = try DB.SortedMap(.read_only).init(statuses_cursor); 530 const open_cursor = try statuses.getCursor("open") orelse break :collect; 531 const open = try DB.SortedSet(.read_only).init(open_cursor); 532 var iter = try open.iteratorFromIndex(0); 533 while (try iter.next()) |cursor| { 534 const id = try evt.readOrderKeyId(DB, cursor); 535 536 // a saved check only goes stale when the patch's revision or its 537 // target tip moves, so a push can skip the branches it left alone 538 if (updates) |changed| { 539 const record = (try evt.Patch.readById(DB, repo_opts.hash, moment, &arena, &id)) orelse continue; 540 const source_moved = if (record.event.source_branch) |branch| branchUpdated(changed, branch) else false; 541 if (!source_moved and !branchUpdated(changed, record.event.target_branch)) continue; 542 } 543 try ids.append(allocator, id); 544 } 545 } 546 547 // start progress reporting after the patch count is known 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); 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 558 progress.report(repo_opts, io, progress_ctx_maybe, .{ .end = .writing_patch }); 559 } 560 561 fn refreshMergeCheck( 562 comptime repo_opts: rp.RepoOpts(.xit), 563 io: std.Io, 564 allocator: std.mem.Allocator, 565 target_repo: *rp.Repo(.xit, repo_opts), 566 id: *const [evt.event_id_size]u8, 567 ) !void { 568 const Repo = rp.Repo(.xit, repo_opts); 569 const DB = Repo.DB; 570 var arena = std.heap.ArenaAllocator.init(allocator); 571 defer arena.deinit(); 572 573 // skip patches that no longer need mergeability checks 574 const initial = (try evt.readFromRepo(evt.Patch, .xit, repo_opts, io, allocator, &arena, target_repo, id)) orelse return; 575 if (initial.removed or initial.event.status.kind() != .open) return; 576 577 // acquire fork locks before the target repository lock 578 var checks: MergeCheckInputs(repo_opts) = .{}; 579 defer checks.deinit(io, allocator); 580 try checks.add(io, allocator, target_repo.core.work_path, id.*, initial.event); 581 582 // cancel the cache transaction when the result is unchanged 583 { 584 const Ctx = struct { 585 core: *Repo.Core, 586 checks: *MergeCheckInputs(repo_opts), 587 io: std.Io, 588 allocator: std.mem.Allocator, 589 590 pub fn run(ctx: @This(), cursor: *DB.Cursor(.read_write)) !void { 591 var moment = try DB.HashMap(.read_write).init(cursor.*); 592 const state = Repo.State(.read_write){ .core = ctx.core, .extra = .{ .moment = &moment } }; 593 if (!try ctx.checks.update(state, ctx.io, ctx.allocator)) return error.CancelTransaction; 594 595 // name the transaction, which no user action owns 596 try xit.undo.write(repo_opts, state, std.Io.Timestamp.now(ctx.io, .real).toSeconds(), .{ .custom = .{ .action_kind = mergeability_undo_action } }); 597 } 598 }; 599 600 try target_repo.core.db_file.lock(io, .exclusive); 601 defer target_repo.core.db_file.unlock(io); 602 603 const history = try DB.ArrayList(.read_write).init(target_repo.core.db.rootCursor()); 604 history.appendContext(.{ .slot = try history.getSlot(-1) }, Ctx{ 605 .core = &target_repo.core, 606 .checks = &checks, 607 .io = io, 608 .allocator = allocator, 609 }) catch |err| switch (err) { 610 error.CancelTransaction => {}, 611 else => return err, 612 }; 613 } 614 } 615 616 // prepare fork handles before taking the target lock. this preserves the 617 // fork-before-target lock order used by publishing and merge operations. 618 pub fn MergeCheckInputs(comptime repo_opts: rp.RepoOpts(.xit)) type { 619 const Repo = rp.Repo(.xit, repo_opts); 620 return struct { 621 forks: std.AutoArrayHashMapUnmanaged([evt.event_id_size]u8, ?Repo) = .empty, 622 const Self = @This(); 623 624 pub fn prepare(self: *Self, io: std.Io, allocator: std.mem.Allocator, repo: *Repo, events: []const evt.EventWithId) !void { 625 for (events) |event| { 626 if (event.event != .patch) continue; 627 const patch = event.event.patch orelse continue; 628 try self.add(io, allocator, repo.core.work_path, try evt.parseEventId(&event.id), patch); 629 } 630 } 631 632 fn add(self: *Self, io: std.Io, allocator: std.mem.Allocator, work_path: []const u8, id: [evt.event_id_size]u8, patch: evt.Patch) !void { 633 // track each open patch once, including branch-backed patches 634 if (patch.status.kind() != .open) return; 635 const entry = try self.forks.getOrPut(allocator, id); 636 if (entry.found_existing) return; 637 entry.value_ptr.* = null; 638 if (patch.source_branch != null) return; 639 640 // open the fork before acquiring its shared lock 641 const path = try fork.forkPath(allocator, std.fs.path.dirname(work_path) orelse ".", &std.fmt.bytesToHex(id, .lower)); 642 defer allocator.free(path); 643 var opened = Repo.open(io, allocator, .{ .path = path, .require_repo_root = true }) catch |err| { 644 std.log.warn("mergeability fork unavailable: {s}", .{@errorName(err)}); 645 return; 646 }; 647 648 // transfer the locked fork to the collection for cleanup 649 errdefer opened.deinit(io, allocator); 650 try opened.core.db_file.lock(io, .shared); 651 entry.value_ptr.* = opened; 652 } 653 654 pub fn deinit(self: *Self, io: std.Io, allocator: std.mem.Allocator) void { 655 for (self.forks.values()) |*value| if (value.*) |*repo| { 656 repo.core.db_file.unlock(io); 657 repo.deinit(io, allocator); 658 }; 659 self.forks.deinit(allocator); 660 } 661 662 // optional checks may fail without rejecting a patch, but a failed 663 // restoration must abort the transaction so trial writes cannot be 664 // committed. reports whether any cached result changed. 665 pub fn update(self: *Self, state: Repo.State(.read_write), io: std.Io, allocator: std.mem.Allocator) !bool { 666 var arena = std.heap.ArenaAllocator.init(allocator); 667 defer arena.deinit(); 668 var changed = false; 669 for (self.forks.keys(), self.forks.values()) |id, *repo| { 670 const saved = updateMergeCheck(repo_opts, state, io, &arena, &id, if (repo.*) |*value| value else null) catch |err| switch (err) { 671 error.MergeCheckRestoreFailed => return err, 672 else => { 673 std.log.warn("failed to refresh mergeability: {s}", .{@errorName(err)}); 674 continue; 675 }, 676 }; 677 if (saved) changed = true; 678 } 679 return changed; 680 } 681 }; 682 } 683 684 // the caller holds the target's exclusive lock, and any fork's shared lock. 685 // this only saves the cache; it never creates a top-level history transaction. 686 fn updateMergeCheck( 687 comptime repo_opts: rp.RepoOpts(.xit), 688 state: rp.Repo(.xit, repo_opts).State(.read_write), 689 io: std.Io, 690 arena: *std.heap.ArenaAllocator, 691 id: *const [evt.event_id_size]u8, 692 fork_repo: ?*rp.Repo(.xit, repo_opts), 693 ) !bool { 694 const DB = rp.Repo(.xit, repo_opts).DB; 695 696 // read the patch from the current transaction 697 const target_events = evt.currentMomentFromRepoMoment(repo_opts.hash, state.extra.moment.readOnly()) catch |err| switch (err) { 698 error.NotFound => return false, 699 else => return err, 700 }; 701 const patch_record = (try evt.Patch.readById(DB, repo_opts.hash, target_events, arena, id)) orelse return false; 702 if (patch_record.removed or patch_record.event.status.kind() != .open) return false; 703 704 // find the newest fork revision when the patch uses a fork 705 var newest: ?evt.PatchRev.WithId = null; 706 if (fork_repo) |repo| { 707 if (evt.currentMoment(repo_opts, repo)) |events| { 708 newest = evt.PatchRev.readNewest(DB, repo_opts.hash, events, arena) catch |err| blk: { 709 std.log.warn("mergeability revision unavailable: {s}", .{@errorName(err)}); 710 break :blk null; 711 }; 712 } else |err| std.log.warn("mergeability revision unavailable: {s}", .{@errorName(err)}); 713 } 714 715 // compare the selected revision and target against the cache 716 const patch = patch_record.event; 717 const revision = patch.revision orelse return false; 718 const target_oid = try rf.readRecur(.xit, repo_opts, state.readOnly(), io, .{ .ref = .{ .kind = .head, .name = patch.target_branch } }); 719 var check = MergeCheck{ .revision = revision, .target_branch = patch.target_branch, .target_oid = if (target_oid) |*oid| oid else "" }; 720 const cached = try readMergeCheck(repo_opts, target_events, arena, id); 721 const current = if (patch.source_branch != null) 722 try branchCurrent(repo_opts, state.readOnly(), io, arena, patch) 723 else if (newest) |latest| 724 std.mem.eql(u8, &std.fmt.bytesToHex(latest.id, .lower), &revision.id) and revision.matches(latest.record) 725 else 726 false; 727 728 // run trial merges only for a current revision with an unresolved check 729 if (current and target_oid != null) { 730 if (cached) |value| if (value.matches(patch, check.target_oid) and value.result.source != .unknown and value.result.squash != .unknown) return false; 731 check.result = try trialMergeCheck(repo_opts, state, io, arena.child_allocator, &check, fork_repo); 732 } 733 734 // persist the result only when it differs from the cache 735 if (cached) |value| if (evt.fieldEqual(MergeCheck, value, check)) return false; 736 try saveMergeCheck(repo_opts, state.extra.moment.*, id, check); 737 return true; 738 } 739 740 fn trialMergeCheck( 741 comptime repo_opts: rp.RepoOpts(.xit), 742 state: rp.Repo(.xit, repo_opts).State(.read_write), 743 io: std.Io, 744 allocator: std.mem.Allocator, 745 check: *const MergeCheck, 746 fork_repo: ?*rp.Repo(.xit, repo_opts), 747 ) !Mergeability { 748 // freeze the parent state so trial writes copy its nodes 749 const moment = state.extra.moment; 750 const snapshot = moment.slot(); 751 // TODO: use an xitdb savepoint to also reclaim trial bytes on rollback. 752 // restoring the root leaves the appended data unused until gc. 753 try state.core.db.freeze(); 754 moment.* = rp.Repo(.xit, repo_opts).DB.HashMap(.read_write).init(moment.cursor) catch return error.MergeCheckRestoreFailed; 755 756 // keep the trial result in memory while discarding its state changes 757 const result = calculateMergeCheck(repo_opts, state, io, allocator, check, fork_repo); 758 759 // restore the parent state before handling any trial error 760 moment.cursor.write(.{ .slot = snapshot }) catch return error.MergeCheckRestoreFailed; 761 moment.* = rp.Repo(.xit, repo_opts).DB.HashMap(.read_write).init(moment.cursor) catch return error.MergeCheckRestoreFailed; 762 763 // report failed trials as unknown after the parent state is restored 764 return result catch |err| { 765 std.log.warn("mergeability check failed: {s}", .{@errorName(err)}); 766 return .{}; 767 }; 768 } 769 770 fn calculateMergeCheck( 771 comptime repo_opts: rp.RepoOpts(.xit), 772 state: rp.Repo(.xit, repo_opts).State(.read_write), 773 io: std.Io, 774 allocator: std.mem.Allocator, 775 check: *const MergeCheck, 776 fork_repo: ?*rp.Repo(.xit, repo_opts), 777 ) !Mergeability { 778 const source = try oidArray(repo_opts.hash, check.revision.source_oid); 779 const squash = try oidArray(repo_opts.hash, check.revision.squash_oid); 780 781 // import fork objects into the temporary trial state 782 if (fork_repo) |repo| { 783 var fork_moment = try repo.core.latestMoment(); 784 const fork_state = rp.Repo(.xit, repo_opts).State(.read_only){ .core = &repo.core, .extra = .{ .moment = &fork_moment } }; 785 var objects = try obj.ObjectIterator(.xit, repo_opts).init(fork_state, io, allocator, .{ .kind = .all }); 786 defer objects.deinit(); 787 try objects.include(&source); 788 try objects.include(&squash); 789 try obj.copyFromObjectIterator(.xit, repo_opts, state, .xit, repo_opts, &objects, io, null); 790 } 791 792 // check source and squash merges against the same target 793 const target = rf.Ref{ .kind = .head, .name = check.target_branch }; 794 return .{ 795 .source = checkCommit(repo_opts, state, io, allocator, &source, target), 796 .squash = checkCommit(repo_opts, state, io, allocator, &squash, target), 797 }; 798 } 799 800 fn saveMergeCheck(comptime repo_opts: rp.RepoOpts(.xit), moment: rp.Repo(.xit, repo_opts).DB.HashMap(.read_write), id: *const [evt.event_id_size]u8, check: MergeCheck) !void { 801 const DB = rp.Repo(.xit, repo_opts).DB; 802 803 // store the check under the current event history moment 804 const last_object_id_cursor = try moment.getCursor(hash.hashInt(repo_opts.hash, evt.last_object_id_key)) orelse return error.NotFound; 805 var last_object_id: [hash.byteLen(repo_opts.hash)]u8 = undefined; 806 _ = try last_object_id_cursor.readBytes(&last_object_id); 807 const haxy_history = try DB.ArrayList(.read_write).init(try moment.putCursor(hash.hashInt(repo_opts.hash, evt.history_key))); 808 const haxy_moments = try DB.HashMap(.read_write).init(try haxy_history.putCursor(-1)); 809 const haxy_moment = try DB.HashMap(.read_write).init(try haxy_moments.putCursor(hash.bytesToInt(repo_opts.hash, &last_object_id))); 810 const map = try DB.HashMap(.read_write).init(try haxy_moment.putCursor(hash.hashInt(repo_opts.hash, evt.Patch.patch_id_to_mergeability_key))); 811 const entry = try DB.HashMap(.read_write).init(try map.putCursor(hash.hashInt(repo_opts.hash, id))); 812 try evt.upsert(MergeCheck, DB, repo_opts.hash, entry, check); 813 } 814 815 fn branchCurrent(comptime repo_opts: rp.RepoOpts(.xit), state: rp.Repo(.xit, repo_opts).State(.read_only), io: std.Io, arena: *std.heap.ArenaAllocator, patch: evt.Patch) !bool { 816 // check that the source branch still points to the selected commit 817 const branch = patch.source_branch orelse return false; 818 const selected = patch.revision orelse return false; 819 const oid = (try rf.readRecur(.xit, repo_opts, state, io, .{ .ref = .{ .kind = .head, .name = branch } })) orelse return false; 820 if (!std.mem.eql(u8, &oid, selected.source_oid)) return false; 821 822 // verify that the stored revision metadata also matches 823 const events = try evt.currentMomentFromRepoMoment(repo_opts.hash, state.extra.moment.*); 824 const revision = (try evt.PatchRev.readById(evt.EventDB(repo_opts.hash), repo_opts.hash, events, arena, &try evt.parseEventId(&selected.id))) orelse return false; 825 return selected.matches(revision); 826 } 827 828 fn oidArray(comptime hash_kind: hash.HashKind, oid: []const u8) ![hash.hexLen(hash_kind)]u8 { 829 try evt.PatchRev.validateOid(hash_kind, oid); 830 var result: [hash.hexLen(hash_kind)]u8 = undefined; 831 @memcpy(&result, oid); 832 return result; 833 } 834 835 fn checkCommit( 836 comptime repo_opts: rp.RepoOpts(.xit), 837 state: rp.Repo(.xit, repo_opts).State(.read_write), 838 io: std.Io, 839 allocator: std.mem.Allocator, 840 oid: *const [hash.hexLen(repo_opts.hash)]u8, 841 target: rf.Ref, 842 ) Mergeability.Status { 843 var result = mrg.Merge(.xit, repo_opts).init(state, io, allocator, .{ 844 .kind = .full, 845 .action = .{ .new = .{ .source = &.{.{ .oid = oid }}, .algo = .patch } }, 846 .dry_run = true, 847 }, target, null) catch |err| { 848 std.log.warn("mergeability check failed: {s}", .{@errorName(err)}); 849 return .unknown; 850 }; 851 defer result.deinit(); 852 853 // translate the dry-run outcome into a cached status 854 return switch (result.result) { 855 .conflict => .conflict, 856 .clean, .success, .nothing, .fast_forward => .clean, 857 }; 858 } 859 860 pub const MergeInput = struct { 861 id: [evt.event_id_size * 2]u8, 862 revision: evt.Patch.MergeRevision, 863 author: evt.CommitAuthor, 864 timestamp: u64, 865 }; 866 867 pub fn publish( 868 comptime repo_opts: rp.RepoOpts(.xit), 869 io: std.Io, 870 allocator: std.mem.Allocator, 871 admin_repo: *rp.Repo(.xit, evt.admin_repo_opts), 872 target_repo: *rp.Repo(.xit, repo_opts), 873 fork_path: []const u8, 874 input: PublishInput, 875 ) !void { 876 const patch_id = try evt.parseEventId(&input.id); 877 var arena = std.heap.ArenaAllocator.init(allocator); 878 defer arena.deinit(); 879 880 // validate the fork ownership and publishing identity 881 const admin_moment = try evt.currentMoment(evt.admin_repo_opts, admin_repo); 882 const fork_record = (try evt.Fork.readById(evt.AdminDB, evt.admin_repo_opts.hash, admin_moment, &arena, &patch_id)) orelse return error.InvalidPatchDraft; 883 if (fork_record.removed or 884 !std.mem.eql(u8, fork_record.event.user_id, &input.user_id) or 885 !std.mem.eql(u8, fork_record.event.repo_id, &input.repo_id)) return error.InvalidPatchDraft; 886 const user = (try evt.User.readById(evt.AdminDB, evt.admin_repo_opts.hash, admin_moment, &arena, &input.user_id)) orelse return error.InvalidPatchDraft; 887 if (user.removed or 888 !std.mem.eql(u8, user.event.name, input.author.name) or 889 !std.mem.eql(u8, user.event.email, input.author.email)) return error.InvalidPatchDraft; 890 891 // read the patch staged in the fork 892 var fork_repo = rp.Repo(.xit, repo_opts).open(io, allocator, .{ .path = fork_path }) catch return error.PatchDataUnavailable; 893 defer fork_repo.deinit(io, allocator); 894 const fork_moment = evt.currentMoment(repo_opts, &fork_repo) catch return error.PatchDataUnavailable; 895 const local_patch = (try evt.Patch.readById(evt.EventDB(repo_opts.hash), repo_opts.hash, fork_moment, &arena, &patch_id)) orelse return error.PatchDataUnavailable; 896 897 // check whether this patch has already been published 898 const target_moment = evt.currentMoment(repo_opts, target_repo) catch |err| switch (err) { 899 error.NotFound => null, 900 else => |other| return other, 901 }; 902 const existing = if (target_moment) |moment| 903 try evt.Patch.readById(evt.EventDB(repo_opts.hash), repo_opts.hash, moment, &arena, &patch_id) 904 else 905 null; 906 if (existing) |record| { 907 if (record.removed or !std.mem.eql(u8, record.author_email orelse "", input.author.email)) return error.InvalidPatch; 908 } 909 910 // publish the selected revision unless the draft was already consumed 911 if (local_patch.removed) { 912 if (existing == null) return error.PatchDataUnavailable; 913 } else { 914 var patch = (existing orelse local_patch).event; 915 if (local_patch.event.revision) |selected| { 916 const revision_id = try evt.parseEventId(&selected.id); 917 const revision = (try evt.PatchRev.readById(evt.EventDB(repo_opts.hash), repo_opts.hash, fork_moment, &arena, &revision_id)) orelse return error.PatchNotPushed; 918 if (!selected.matches(revision)) return error.PatchNotPushed; 919 patch.revision = selected; 920 } 921 if (existing == null) patch.status = .open; 922 923 // write the published patch to the target repository 924 try evt.consume(.server, .repo, .xit, repo_opts, io, allocator, target_repo, evt.events_ref, &.{.{ 925 .id = input.id, 926 .timestamp = input.timestamp, 927 .author = input.author, 928 .event = .{ .patch = patch }, 929 }}); 930 931 // remove the consumed draft from the fork 932 try evt.consume(.server, .fork, .xit, repo_opts, io, allocator, &fork_repo, evt.events_ref, &.{.{ 933 .id = input.id, 934 .timestamp = input.timestamp, 935 .author = input.author, 936 .event = .{ .patch = null }, 937 }}); 938 } 939 940 // mark the fork as published in the administration repository 941 if (fork_record.event.stage == .draft) { 942 var published = fork_record.event; 943 published.stage = .publish; 944 try evt.consume(.server, .admin, .xit, evt.admin_repo_opts, io, allocator, admin_repo, evt.events_ref, &.{.{ 945 .id = input.id, 946 .timestamp = input.timestamp, 947 .author = input.author, 948 .event = .{ .fork = published }, 949 }}); 950 } 951 } 952 953 pub fn editDraft( 954 comptime repo_opts: rp.RepoOpts(.xit), 955 io: std.Io, 956 allocator: std.mem.Allocator, 957 admin_repo: *rp.Repo(.xit, evt.admin_repo_opts), 958 fork_path: []const u8, 959 input: EditDraftInput, 960 ) !bool { 961 // validate the submitted fields before opening repositories 962 if (!evt.Patch.fieldsValid(input.title, input.labels)) return error.InvalidFields; 963 if (!evt.Patch.branchValid(input.target_branch)) return error.InvalidTargetBranch; 964 const patch_id = try evt.parseEventId(&input.id); 965 var arena = std.heap.ArenaAllocator.init(allocator); 966 defer arena.deinit(); 967 968 // validate the draft ownership and editing identity 969 { 970 const admin_moment = try evt.currentMoment(evt.admin_repo_opts, admin_repo); 971 const fork_record = (try evt.Fork.readById(evt.AdminDB, evt.admin_repo_opts.hash, admin_moment, &arena, &patch_id)) orelse return false; 972 if (fork_record.event.stage != .draft) return false; 973 if (fork_record.removed or 974 !std.mem.eql(u8, fork_record.event.user_id, &input.user_id) or 975 !std.mem.eql(u8, fork_record.event.repo_id, &input.repo_id)) return error.InvalidPatchDraft; 976 const user = (try evt.User.readById(evt.AdminDB, evt.admin_repo_opts.hash, admin_moment, &arena, &input.user_id)) orelse return error.InvalidPatchDraft; 977 if (user.removed or 978 !std.mem.eql(u8, user.event.name, input.author.name) or 979 !std.mem.eql(u8, user.event.email, input.author.email)) return error.InvalidPatchDraft; 980 } 981 982 // read the draft patch from its fork 983 var fork_repo = rp.Repo(.xit, repo_opts).open(io, allocator, .{ .path = fork_path, .require_repo_root = true }) catch return error.PatchDataUnavailable; 984 defer fork_repo.deinit(io, allocator); 985 const fork_moment = evt.currentMoment(repo_opts, &fork_repo) catch return error.PatchDataUnavailable; 986 const record = (try evt.Patch.readById(evt.EventDB(repo_opts.hash), repo_opts.hash, fork_moment, &arena, &patch_id)) orelse return error.PatchDataUnavailable; 987 if (record.removed) return error.PatchDataUnavailable; 988 989 // apply the edits and invalidate a revision targeting another branch 990 var patch = record.event; 991 patch.title = input.title; 992 patch.labels = input.labels; 993 patch.description = input.description; 994 if (!std.mem.eql(u8, patch.target_branch, input.target_branch)) patch.revision = null; 995 patch.target_branch = input.target_branch; 996 997 // commit the updated draft metadata 998 try evt.consume(.server, .fork, .xit, repo_opts, io, allocator, &fork_repo, evt.events_ref, &.{.{ 999 .id = input.id, 1000 .timestamp = input.timestamp, 1001 .author = input.author, 1002 .event = .{ .patch = patch }, 1003 }}); 1004 return true; 1005 } 1006 1007 // merge the selected patch revision into its target branch 1008 pub fn merge( 1009 comptime repo_opts: rp.RepoOpts(.xit), 1010 io: std.Io, 1011 allocator: std.mem.Allocator, 1012 repo_root_path: []const u8, 1013 target_repo: *rp.Repo(.xit, repo_opts), 1014 input: MergeInput, 1015 ) !void { 1016 const patch_id = try evt.parseEventId(&input.id); 1017 errdefer |err| { 1018 if (err == error.PatchDataUnavailable or err == error.PatchOutOfDate) { 1019 refreshMergeability(repo_opts, io, allocator, target_repo, patch_id); 1020 } 1021 } 1022 var arena = std.heap.ArenaAllocator.init(allocator); 1023 defer arena.deinit(); 1024 1025 // validate the target patch 1026 const target_moment = try evt.currentMoment(repo_opts, target_repo); 1027 const patch_record = (try evt.Patch.readById(evt.EventDB(repo_opts.hash), repo_opts.hash, target_moment, &arena, &patch_id)) orelse return error.InvalidPatch; 1028 if (patch_record.removed) return error.InvalidPatch; 1029 switch (patch_record.event.status) { 1030 .open => {}, 1031 .closed => return error.PatchClosed, 1032 .merged => return error.PatchAlreadyMerged, 1033 } 1034 const selected = patch_record.event.revision orelse return error.PatchNotPushed; 1035 const target_ref = rf.Ref{ .kind = .head, .name = patch_record.event.target_branch }; 1036 1037 // open the fork 1038 const fork_path = try fork.forkPath(arena.allocator(), repo_root_path, &input.id); 1039 var fork_repo_maybe: ?rp.Repo(.xit, repo_opts) = if (patch_record.event.source_branch != null) null else rp.Repo(.xit, repo_opts).open(io, allocator, .{ .path = fork_path, .require_repo_root = true }) catch return error.PatchDataUnavailable; 1040 defer if (fork_repo_maybe) |*repo| repo.deinit(io, allocator); 1041 1042 // select the commit and merge identity 1043 const selected_oid = oidArray(repo_opts.hash, switch (input.revision) { 1044 .squash => selected.squash_oid, 1045 .source => selected.source_oid, 1046 }) catch return error.InvalidPatch; 1047 const identity = try std.fmt.allocPrint(arena.allocator(), "{s} <{s}>", .{ input.author.name, input.author.email }); 1048 1049 // merge the code and events in one target transaction 1050 { 1051 const DB = rp.Repo(.xit, repo_opts).DB; 1052 const State = rp.Repo(.xit, repo_opts).State; 1053 const Ctx = struct { 1054 core: *rp.Repo(.xit, repo_opts).Core, 1055 fork_repo: ?*rp.Repo(.xit, repo_opts), 1056 io: std.Io, 1057 allocator: std.mem.Allocator, 1058 patch_id: [evt.event_id_size]u8, 1059 expected_patch: evt.Patch, 1060 target_ref: rf.Ref, 1061 selected_oid: [hash.hexLen(repo_opts.hash)]u8, 1062 revision: evt.Patch.MergeRevision, 1063 identity: []const u8, 1064 author: evt.CommitAuthor, 1065 timestamp: u64, 1066 1067 pub fn run(ctx: @This(), cursor: *DB.Cursor(.read_write)) !void { 1068 var moment = try DB.HashMap(.read_write).init(cursor.*); 1069 const state = State(.read_write){ .core = ctx.core, .extra = .{ .moment = &moment } }; 1070 1071 var check_arena = std.heap.ArenaAllocator.init(ctx.allocator); 1072 defer check_arena.deinit(); 1073 1074 // require the fork's newest revision while both repos are locked 1075 const selected_revision = ctx.expected_patch.revision orelse unreachable; 1076 const revision_id = try evt.parseEventId(&selected_revision.id); 1077 if (ctx.fork_repo) |repo| { 1078 const fork_moment = try evt.currentMoment(repo_opts, repo); 1079 const newest = (try evt.PatchRev.readNewest(evt.EventDB(repo_opts.hash), repo_opts.hash, fork_moment, &check_arena)) orelse return error.PatchDataUnavailable; 1080 if (!std.mem.eql(u8, &newest.id, &revision_id) or !selected_revision.matches(newest.record)) return error.PatchOutOfDate; 1081 } else if (!try branchCurrent(repo_opts, state.readOnly(), ctx.io, &check_arena, ctx.expected_patch)) return error.PatchOutOfDate; 1082 1083 // require a clean cached result for the selected merge style. 1084 { 1085 const availability = try readMergeability(repo_opts, state.readOnly(), ctx.io, &check_arena, &ctx.patch_id, ctx.expected_patch); 1086 switch (availability.get(ctx.revision)) { 1087 .clean => {}, 1088 .conflict => return error.MergeConflict, 1089 .unknown => return error.MergeCheckUnavailable, 1090 } 1091 } 1092 1093 // copy the selected commit and its dependencies 1094 if (ctx.fork_repo) |repo| { 1095 var fork_repo_moment = try repo.core.latestMoment(); 1096 const fork_state = State(.read_only){ .core = &repo.core, .extra = .{ .moment = &fork_repo_moment } }; 1097 var objects = try obj.ObjectIterator(.xit, repo_opts).init(fork_state, ctx.io, ctx.allocator, .{ .kind = .all }); 1098 defer objects.deinit(); 1099 try objects.include(&ctx.selected_oid); 1100 try obj.copyFromObjectIterator(.xit, repo_opts, state, .xit, repo_opts, &objects, ctx.io, null); 1101 } 1102 1103 // merge the selected commit 1104 const before_oid = (try rf.readRecur(.xit, repo_opts, state.readOnly(), ctx.io, .{ .ref = ctx.target_ref })) orelse return error.InvalidTargetBranch; 1105 { 1106 var merge_result = try mrg.Merge(.xit, repo_opts).init(state, ctx.io, ctx.allocator, .{ 1107 .kind = .full, 1108 .action = .{ .new = .{ .source = &.{.{ .oid = &ctx.selected_oid }}, .algo = .patch } }, 1109 .commit_metadata = .{ 1110 .author = ctx.identity, 1111 .committer = ctx.identity, 1112 .message = ctx.expected_patch.title, 1113 .timestamp = ctx.timestamp, 1114 }, 1115 }, ctx.target_ref, null); 1116 defer merge_result.deinit(); 1117 switch (merge_result.result) { 1118 .conflict => return error.MergeConflict, 1119 .success, .fast_forward, .nothing => {}, 1120 .clean => unreachable, 1121 } 1122 } 1123 const after_oid = (try rf.readRecur(.xit, repo_opts, state.readOnly(), ctx.io, .{ .ref = ctx.target_ref })) orelse return error.InvalidTargetBranch; 1124 1125 // retain the submitted revision and snapshot the merge result 1126 if (!try importMergedRevision(repo_opts, state, &ctx.core.db, &moment, ctx.io, ctx.allocator, ctx.fork_repo, &ctx.patch_id, .{ .revision = ctx.revision, .before_oid = &before_oid, .after_oid = &after_oid }, ctx.expected_patch, ctx.author, ctx.timestamp)) return error.PatchOutOfDate; 1127 1128 // the merge moved the target branch, so its indexes follow, 1129 // the commit index deriving from the old tip's version 1130 _ = try find.refreshInTransaction(repo_opts, state, &moment, ctx.io, ctx.allocator, null); 1131 _ = try srch_cmmt.refreshInTransaction(repo_opts, state, &moment, ctx.io, ctx.allocator, &.{.{ .old_oid = &before_oid, .new_oid = &after_oid }}, null); 1132 1133 // record the merge as one undoable action. 1134 try xit.undo.write(repo_opts, state, std.Io.Timestamp.now(ctx.io, .real).toSeconds(), .{ .custom = .{ .action_kind = merge_undo_action } }); 1135 } 1136 }; 1137 1138 // lock the fork before the target for the full merge transaction. 1139 if (fork_repo_maybe) |*repo| try repo.core.db_file.lock(io, .shared); 1140 defer if (fork_repo_maybe) |*repo| repo.core.db_file.unlock(io); 1141 try target_repo.core.db_file.lock(io, .exclusive); 1142 defer target_repo.core.db_file.unlock(io); 1143 1144 const history = try DB.ArrayList(.read_write).init(target_repo.core.db.rootCursor()); 1145 try history.appendContext(.{ .slot = try history.getSlot(-1) }, Ctx{ 1146 .core = &target_repo.core, 1147 .fork_repo = if (fork_repo_maybe) |*repo| repo else null, 1148 .io = io, 1149 .allocator = allocator, 1150 .patch_id = patch_id, 1151 .expected_patch = patch_record.event, 1152 .target_ref = target_ref, 1153 .selected_oid = selected_oid, 1154 .revision = input.revision, 1155 .identity = identity, 1156 .author = input.author, 1157 .timestamp = input.timestamp, 1158 }); 1159 } 1160 1161 // refresh other patches affected by the updated target branch. 1162 refreshOpenMergeability(repo_opts, io, allocator, target_repo, null, null); 1163 } 1164 1165 // merge a published patch and remove its fork 1166 pub fn mergeAndRemoveFork( 1167 comptime repo_opts: rp.RepoOpts(.xit), 1168 io: std.Io, 1169 allocator: std.mem.Allocator, 1170 repo_root_path: []const u8, 1171 admin_repo: *rp.Repo(.xit, evt.admin_repo_opts), 1172 target_repo: *rp.Repo(.xit, repo_opts), 1173 input: MergeInput, 1174 ) !void { 1175 try merge(repo_opts, io, allocator, repo_root_path, target_repo, input); 1176 var arena = std.heap.ArenaAllocator.init(allocator); 1177 defer arena.deinit(); 1178 1179 // remove fork data only for patches backed by a fork. 1180 const record = (try evt.readFromRepo(evt.Patch, .xit, repo_opts, io, allocator, &arena, target_repo, &try evt.parseEventId(&input.id))) orelse return error.InvalidPatch; 1181 if (record.event.source_branch == null) try fork.remove(io, allocator, repo_root_path, admin_repo, &input.id, null, input.author); 1182 } 1183 1184 fn commitAuthor(line: []const u8) !evt.CommitAuthor { 1185 const open = std.mem.lastIndexOfScalar(u8, line, '<') orelse return error.AuthorNotFound; 1186 const close = std.mem.indexOfScalarPos(u8, line, open + 1, '>') orelse return error.AuthorNotFound; 1187 const name = std.mem.trimEnd(u8, line[0..open], " "); 1188 if (name.len == 0 or close == open + 1) return error.AuthorNotFound; 1189 return .{ .name = name, .email = line[open + 1 .. close] }; 1190 } 1191 1192 // import a revision after detecting a client-side merge 1193 fn importMerged( 1194 comptime repo_opts: rp.RepoOpts(.xit), 1195 state: rp.Repo(.xit, repo_opts).State(.read_write), 1196 db: *evt.EventDB(repo_opts.hash), 1197 moment: *evt.EventDB(repo_opts.hash).HashMap(.read_write), 1198 io: std.Io, 1199 allocator: std.mem.Allocator, 1200 repo_root_path: []const u8, 1201 patch_id: *const [evt.event_id_size]u8, 1202 matched_oid: *const [hash.hexLen(repo_opts.hash)]u8, 1203 before_oid: *const [hash.hexLen(repo_opts.hash)]u8, 1204 after_oid: *const [hash.hexLen(repo_opts.hash)]u8, 1205 ) !void { 1206 var arena = std.heap.ArenaAllocator.init(allocator); 1207 defer arena.deinit(); 1208 1209 // identify which selected revision was merged by the client. 1210 const patch_hex = std.fmt.bytesToHex(patch_id.*, .lower); 1211 const fork_path = try fork.forkPath(arena.allocator(), repo_root_path, &patch_hex); 1212 const events = try evt.currentMomentFromRepoMoment(repo_opts.hash, moment.readOnly()); 1213 const record = (try evt.Patch.readById(evt.EventDB(repo_opts.hash), repo_opts.hash, events, &arena, patch_id)) orelse return; 1214 const selected = record.event.revision orelse return; 1215 const revision: evt.Patch.MergeRevision = if (std.mem.eql(u8, matched_oid, selected.source_oid)) .source else if (std.mem.eql(u8, matched_oid, selected.squash_oid)) .squash else return; 1216 1217 // open the fork when the revision is not stored in the target repository. 1218 var fork_repo_maybe: ?rp.Repo(.xit, repo_opts) = if (record.event.source_branch != null) null else try rp.Repo(.xit, repo_opts).open(io, allocator, .{ .path = fork_path, .require_repo_root = true }); 1219 defer if (fork_repo_maybe) |*repo| repo.deinit(io, allocator); 1220 1221 // import the revision and record the client-side merge. 1222 _ = try importMergedRevision(repo_opts, state, db, moment, io, allocator, if (fork_repo_maybe) |*repo| repo else null, patch_id, .{ .revision = revision, .before_oid = before_oid, .after_oid = after_oid }, null, null, 0); 1223 } 1224 1225 // import the revision and mark its patch merged in the current transaction 1226 fn importMergedRevision( 1227 comptime repo_opts: rp.RepoOpts(.xit), 1228 state: rp.Repo(.xit, repo_opts).State(.read_write), 1229 db: *evt.EventDB(repo_opts.hash), 1230 moment: *evt.EventDB(repo_opts.hash).HashMap(.read_write), 1231 io: std.Io, 1232 allocator: std.mem.Allocator, 1233 fork_repo: ?*rp.Repo(.xit, repo_opts), 1234 patch_id: *const [evt.event_id_size]u8, 1235 merged: struct { 1236 revision: evt.Patch.MergeRevision, 1237 before_oid: *const [hash.hexLen(repo_opts.hash)]u8, 1238 after_oid: *const [hash.hexLen(repo_opts.hash)]u8, 1239 }, 1240 expected_patch: ?evt.Patch, 1241 merged_author: ?evt.CommitAuthor, 1242 merged_timestamp: u64, 1243 ) !bool { 1244 const DB = evt.EventDB(repo_opts.hash); 1245 var arena = std.heap.ArenaAllocator.init(allocator); 1246 defer arena.deinit(); 1247 1248 // read the patch and reject outdated or conflicting merge requests. 1249 const haxy_moment = try evt.currentMomentFromRepoMoment(repo_opts.hash, moment.readOnly()); 1250 const patch_record = (try evt.Patch.readById(DB, repo_opts.hash, haxy_moment, &arena, patch_id)) orelse return false; 1251 const selected = patch_record.event.revision orelse return false; 1252 if (patch_record.removed or patch_record.event.status.kind() == .merged) return false; 1253 if (expected_patch) |expected| { 1254 if (!evt.fieldEqual(evt.Patch, expected, patch_record.event)) return false; 1255 if (try haxy_moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.conflicts_key))) |cursor| { 1256 const conflicts = try DB.SortedMap(.read_only).init(cursor); 1257 if (try conflicts.getCursor(&evt.orderKeyDesc(patch_record.created_order, patch_id)) != null) return false; 1258 } 1259 } 1260 const revision_id = try evt.parseEventId(&selected.id); 1261 1262 // resolve the selected revision from the target or its fork. 1263 const current_revision = try evt.PatchRev.readById(DB, repo_opts.hash, haxy_moment, &arena, &revision_id); 1264 const revision = (if (fork_repo) |repo| 1265 try evt.PatchRev.readById(DB, repo_opts.hash, try evt.currentMoment(repo_opts, repo), &arena, &revision_id) 1266 else 1267 current_revision) orelse return false; 1268 if (!selected.matches(revision)) return false; 1269 1270 // read the original revision commit and author. 1271 var fork_repo_moment = if (fork_repo) |repo| try repo.core.latestMoment() else moment.readOnly(); 1272 const fork_state = rp.Repo(.xit, repo_opts).State(.read_only){ .core = if (fork_repo) |repo| &repo.core else state.core, .extra = .{ .moment = &fork_repo_moment } }; 1273 var event_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 1274 if (revision.event_oid.len != event_oid.len) return false; 1275 @memcpy(&event_oid, revision.event_oid); 1276 var event_object = try obj.Object(.xit, repo_opts).initCommit(fork_state, io, allocator, &event_oid); 1277 defer event_object.deinit(); 1278 const original_author = try commitAuthor(event_object.content.commit.metadata.author orelse return false); 1279 1280 // retain the submitted revision if the target has not imported it yet. 1281 var events_buffer: [3]evt.EventWithId = undefined; 1282 var events: std.ArrayList(evt.EventWithId) = .initBuffer(&events_buffer); 1283 var tree_entries: [2]evt.EventTreeEntry = undefined; 1284 const needs_import = if (current_revision) |existing| existing.removed else true; 1285 if (needs_import) { 1286 tree_entries = .{ 1287 .{ .tree = .{ .name = "base", .oid = revision.base_tree_oid } }, 1288 .{ .tree = .{ .name = "head", .oid = revision.head_tree_oid } }, 1289 }; 1290 events.appendAssumeCapacity(.{ 1291 .id = selected.id, 1292 .timestamp = event_object.content.commit.metadata.timestamp, 1293 .author = original_author, 1294 .tree_entries = &tree_entries, 1295 .event = .{ .patchrev = revision.event }, 1296 }); 1297 } else { 1298 const existing = current_revision orelse unreachable; 1299 if (!selected.matches(existing)) return error.InvalidPatch; 1300 } 1301 1302 // snapshot the merge result and mark the patch as merged. 1303 { 1304 const author = merged_author orelse original_author; 1305 const timestamp = if (merged_author != null) merged_timestamp else @as(u64, @intCast(std.Io.Timestamp.now(io, .real).toSeconds())); 1306 var patch = patch_record.event; 1307 const result = try evt.PatchRev.prepare(.xit, repo_opts, state, io, &arena, merged.before_oid, merged.after_oid, patch.title, author, timestamp); 1308 events.appendAssumeCapacity(result.event); 1309 patch.status = .{ .merged = .{ .revision = merged.revision, .patchrev_id = result.event.id } }; 1310 events.appendAssumeCapacity(.{ 1311 .id = std.fmt.bytesToHex(patch_id.*, .lower), 1312 .timestamp = timestamp, 1313 .author = author, 1314 .event = .{ .patch = patch }, 1315 }); 1316 } 1317 1318 // commit and consume the revision and patch events together. 1319 try evt.commitEvents(.xit, repo_opts, state, io, allocator, evt.events_ref, events.items, null); 1320 if (!try evt.consumeInTransaction(.repo, .xit, repo_opts, state, db, moment, io, allocator, evt.events_ref)) return error.CancelTransaction; 1321 return true; 1322 } 1323 1324 // find patches merged by commits received in a push 1325 pub fn detectMerged( 1326 comptime repo_opts: rp.RepoOpts(.xit), 1327 state: rp.Repo(.xit, repo_opts).State(.read_write), 1328 db: *evt.EventDB(repo_opts.hash), 1329 moment: *evt.EventDB(repo_opts.hash).HashMap(.read_write), 1330 io: std.Io, 1331 allocator: std.mem.Allocator, 1332 repo_root_path: []const u8, 1333 updates: []const xit.net_server_receive_pack.AppliedRefUpdate, 1334 error_writer: *std.Io.Writer, 1335 ) !void { 1336 const DB = evt.EventDB(repo_opts.hash); 1337 var arena = std.heap.ArenaAllocator.init(allocator); 1338 defer arena.deinit(); 1339 1340 // read the revision index used to identify merged patches. 1341 const haxy_moment = try evt.currentMomentFromRepoMoment(repo_opts.hash, moment.readOnly()); 1342 const revisions_cursor = try haxy_moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.revision_to_id_set_key)) orelse return; 1343 const revisions = try DB.HashMap(.read_only).init(revisions_cursor); 1344 1345 // ignore event refs and inspect only changed branch tips. 1346 var events_ref_buffer: [rf.MAX_REF_CONTENT_SIZE]u8 = undefined; 1347 const events_ref_path = try evt.events_ref.toPath(&events_ref_buffer); 1348 const heads_prefix = "refs/heads/"; 1349 for (updates) |update| { 1350 if (!std.mem.startsWith(u8, update.ref_name, heads_prefix) or 1351 std.mem.eql(u8, update.ref_name, events_ref_path) or 1352 std.mem.eql(u8, update.old_oid, update.new_oid)) continue; 1353 1354 // validate the ref tips and skip branch deletions. 1355 if (update.old_oid.len != hash.hexLen(repo_opts.hash) or 1356 update.new_oid.len != hash.hexLen(repo_opts.hash)) return error.InvalidOid; 1357 var old_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 1358 var new_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 1359 @memcpy(&old_oid, update.old_oid); 1360 @memcpy(&new_oid, update.new_oid); 1361 if (std.mem.allEqual(u8, &new_oid, '0')) continue; 1362 1363 // traverse commits introduced by this branch update. 1364 var commits = try obj.ObjectIterator(.xit, repo_opts).init(state.readOnly(), io, arena.allocator(), .{ .kind = .commit }); 1365 defer commits.deinit(); 1366 if (!std.mem.allEqual(u8, &old_oid, '0')) try commits.exclude(&old_oid); 1367 var targets: std.ArrayList(struct { 1368 before_oid: [hash.hexLen(repo_opts.hash)]u8, 1369 after_oid: [hash.hexLen(repo_opts.hash)]u8, 1370 }) = .empty; 1371 1372 // collect merge boundaries along the target's first-parent history. 1373 { 1374 var first_parents = try obj.ObjectIterator(.xit, repo_opts).init(state.readOnly(), io, arena.allocator(), .{ .kind = .commit, .first_parent = true }); 1375 defer first_parents.deinit(); 1376 if (!std.mem.allEqual(u8, &old_oid, '0')) try first_parents.exclude(&old_oid); 1377 try first_parents.include(&new_oid); 1378 while (try first_parents.next(arena.allocator())) |commit| { 1379 defer commit.deinit(); 1380 try targets.append(arena.allocator(), .{ 1381 .before_oid = (commit.content.commit.metadata.firstParent() orelse &old_oid).*, 1382 .after_oid = commit.oid, 1383 }); 1384 } 1385 } 1386 1387 // visit target commits oldest first, attributing each revision to the 1388 // commit that introduced it; the shared iterator visits each ancestor once 1389 var revision_key_buffer: [rf.MAX_REF_CONTENT_SIZE + 1 + hash.hexLen(repo_opts.hash)]u8 = undefined; 1390 while (targets.pop()) |target| { 1391 try commits.include(&target.after_oid); 1392 while (try commits.next(arena.allocator())) |commit| { 1393 defer commit.deinit(); 1394 1395 // find patches whose selected revision matches this commit. 1396 const key = try std.fmt.bufPrint(&revision_key_buffer, "{s}\x00{s}", .{ update.ref_name[heads_prefix.len..], &commit.oid }); 1397 const ids_cursor = try revisions.getCursor(hash.hashInt(repo_opts.hash, key)) orelse continue; 1398 const ids = try DB.CountedHashSet(.read_only).init(ids_cursor); 1399 var ids_iter = try ids.iterator(); 1400 while (try ids_iter.next()) |cursor| { 1401 const pair = try cursor.readKeyValuePair(); 1402 var patch_id: [evt.event_id_size]u8 = undefined; 1403 if ((try pair.key_cursor.readBytes(&patch_id)).len != patch_id.len) return error.InvalidPatch; 1404 const patch_hex = std.fmt.bytesToHex(patch_id, .lower); 1405 1406 // a fast-forward has no recorded merge boundary; use the old ref tip 1407 const before_oid = if (std.mem.eql(u8, &commit.oid, &target.after_oid)) &old_oid else &target.before_oid; 1408 importMerged(repo_opts, state, db, moment, io, allocator, repo_root_path, &patch_id, &commit.oid, before_oid, &target.after_oid) catch |err| { 1409 serve_common.logError(io, error_writer, "failed to mark patch {s} as merged: {s}\n", .{ &patch_hex, @errorName(err) }); 1410 continue; 1411 }; 1412 } 1413 } 1414 } 1415 } 1416 } 1417