HAXY

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

╭─────────────╮ │scroll to top│ ╰─────────────╯ ╭ patch.zig ────────────────────────────────────────────────────╮ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ╰───────────────────────────────────────────────────────────────╯

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

.. embed/ event/ test/ ui/ command.zig diff3.zig event.zig fork.zig lib.zig main.zig main_wasm.zig ╭─────────────────────────────────╮ │patch.zig │ ╰─────────────────────────────────╯ push.zig serve.zig serve_common.zig serve_http.zig serve_ssh.zig serve_ssh_protocol.zig test.zig testnet.zig try.zig ui.zig web.zig

802 // import the revision and mark its patch merged in the current transaction 803 fn importMergedRevision( 804 comptime repo_opts: rp.RepoOpts(.xit), 805 state: rp.Repo(.xit, repo_opts).State(.read_write), 806 db: *evt.EventDB(repo_opts.hash), 807 moment: *evt.EventDB(repo_opts.hash).HashMap(.read_write), 808 io: std.Io, 809 allocator: std.mem.Allocator, 810 fork_repo: ?*rp.Repo(.xit, repo_opts), 811 patch_id: *const [evt.event_id_size]u8, 812 merged: evt.Patch.Status.Merged, 813 expected_patch: ?evt.Patch, 814 merged_author: ?evt.CommitAuthor, 815 merged_timestamp: u64, 816 ) !bool { 817 const DB = evt.EventDB(repo_opts.hash); 818 var arena = std.heap.ArenaAllocator.init(allocator); 819 defer arena.deinit(); 820 821 const haxy_moment = try evt.currentMomentFromRepoMoment(repo_opts.hash, moment.readOnly()); 822 const patch_record = (try evt.Patch.readById(DB, repo_opts.hash, haxy_moment, &arena, patch_id)) orelse return false; 823 const selected = patch_record.event.revision orelse return false; 824 if (patch_record.removed or patch_record.event.status.kind() == .merged) return false; 825 if (expected_patch) |expected| { 826 if (!evt.fieldEqual(evt.Patch, expected, patch_record.event)) return false; 827 if (try haxy_moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.conflicts_key))) |cursor| { 828 const conflicts = try DB.SortedMap(.read_only).init(cursor); 829 if (try conflicts.getCursor(&evt.orderKeyDesc(patch_record.created_order, patch_id)) != null) return false; 830 } 831 } 832 const revision_id = try evt.parseEventId(&selected.id); 833 834 const current_revision = try evt.PatchRev.readById(DB, repo_opts.hash, haxy_moment, &arena, &revision_id); 835 const revision = (if (fork_repo) |repo| 836 try evt.PatchRev.readById(DB, repo_opts.hash, try evt.currentMoment(repo_opts, repo), &arena, &revision_id) 837 else 838 current_revision) orelse return false; 839 if (!selected.matches(revision)) return false; 840 841 var fork_repo_moment = if (fork_repo) |repo| try repo.core.latestMoment() else moment.readOnly(); 842 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 } }; 843 var event_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 844 if (revision.event_oid.len != event_oid.len) return false; 845 @memcpy(&event_oid, revision.event_oid); 846 var event_object = try obj.Object(.xit, repo_opts).initCommit(fork_state, io, allocator, &event_oid); 847 defer event_object.deinit(); 848 const original_author = try commitAuthor(event_object.content.commit.metadata.author orelse return false); 849 850 var events: [2]evt.EventWithId = undefined; 851 var event_count: usize = 0; 852 var tree_entries: [2]evt.EventTreeEntry = undefined; 853 const needs_import = if (current_revision) |existing| existing.removed else true; 854 if (needs_import) { 855 tree_entries = .{ 856 .{ .tree = .{ .name = "base", .oid = revision.base_tree_oid } }, 857 .{ .tree = .{ .name = "head", .oid = revision.head_tree_oid } }, 858 }; 859 events[event_count] = .{ 860 .id = selected.id, 861 .timestamp = event_object.content.commit.metadata.timestamp, 862 .author = original_author, 863 .tree_entries = &tree_entries, 864 .event = .{ .patchrev = revision.event }, 865 }; 866 event_count += 1; 867 } else { 868 const existing = current_revision orelse unreachable; 869 if (!selected.matches(existing)) return error.InvalidPatch; 870 } 871 872 var patch = patch_record.event; 873 patch.status = .{ .merged = merged }; 874 events[event_count] = .{ 875 .id = std.fmt.bytesToHex(patch_id.*, .lower), 876 .timestamp = if (merged_author != null) merged_timestamp else @intCast(std.Io.Timestamp.now(io, .real).toSeconds()), 877 .author = merged_author orelse original_author, 878 .event = .{ .patch = patch }, 879 }; 880 event_count += 1; 881 882 try evt.commitEvents(.xit, repo_opts, state, io, allocator, evt.events_ref, events[0..event_count], null); 883 if (!try evt.consumeInTransaction(.repo, .xit, repo_opts, state, db, moment, io, allocator, evt.events_ref)) return error.CancelTransaction; 884 return true; 885 } 886 887 // find patches merged by commits received in a push 888 pub fn detectMerged( 889 comptime repo_opts: rp.RepoOpts(.xit), 890 state: rp.Repo(.xit, repo_opts).State(.read_write), 891 db: *evt.EventDB(repo_opts.hash), 892 moment: *evt.EventDB(repo_opts.hash).HashMap(.read_write), 893 io: std.Io, 894 allocator: std.mem.Allocator, 895 repo_root_path: []const u8, 896 updates: []const xit.net_server_receive_pack.AppliedRefUpdate, 897 error_writer: *std.Io.Writer, 898 ) !void { 899 const DB = evt.EventDB(repo_opts.hash); 900 var arena = std.heap.ArenaAllocator.init(allocator); 901 defer arena.deinit(); 902 903 const haxy_moment = try evt.currentMomentFromRepoMoment(repo_opts.hash, moment.readOnly()); 904 const revisions_cursor = try haxy_moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.revision_to_id_set_key)) orelse return; 905 const revisions = try DB.HashMap(.read_only).init(revisions_cursor); 906 var events_ref_buffer: [rf.MAX_REF_CONTENT_SIZE]u8 = undefined; 907 const events_ref_path = try evt.events_ref.toPath(&events_ref_buffer); 908 const heads_prefix = "refs/heads/"; 909 for (updates) |update| { 910 if (!std.mem.startsWith(u8, update.ref_name, heads_prefix) or 911 std.mem.eql(u8, update.ref_name, events_ref_path) or 912 std.mem.eql(u8, update.old_oid, update.new_oid)) continue; 913 if (update.old_oid.len != hash.hexLen(repo_opts.hash) or 914 update.new_oid.len != hash.hexLen(repo_opts.hash)) return error.InvalidOid; 915 var old_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 916 var new_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 917 @memcpy(&old_oid, update.old_oid); 918 @memcpy(&new_oid, update.new_oid); 919 if (std.mem.allEqual(u8, &new_oid, '0')) continue; 920 921 var commits = try obj.ObjectIterator(.xit, repo_opts).init(state.readOnly(), io, arena.allocator(), .{ .kind = .commit }); 922 defer commits.deinit(); 923 if (!std.mem.allEqual(u8, &old_oid, '0')) try commits.exclude(&old_oid); 924 var targets: std.ArrayList(struct { 925 before_oid: [hash.hexLen(repo_opts.hash)]u8, 926 after_oid: [hash.hexLen(repo_opts.hash)]u8, 927 }) = .empty; 928 { 929 var first_parents = try obj.ObjectIterator(.xit, repo_opts).init(state.readOnly(), io, arena.allocator(), .{ .kind = .commit, .first_parent = true }); 930 defer first_parents.deinit(); 931 if (!std.mem.allEqual(u8, &old_oid, '0')) try first_parents.exclude(&old_oid); 932 try first_parents.include(&new_oid); 933 while (try first_parents.next(arena.allocator())) |commit| { 934 defer commit.deinit(); 935 try targets.append(arena.allocator(), .{ 936 .before_oid = (commit.content.commit.metadata.firstParent() orelse &old_oid).*, 937 .after_oid = commit.oid, 938 }); 939 } 940 } 941 942 // visit target commits oldest first, attributing each revision to the 943 // commit that introduced it; the shared iterator visits each ancestor once 944 var revision_key_buffer: [rf.MAX_REF_CONTENT_SIZE + 1 + hash.hexLen(repo_opts.hash)]u8 = undefined; 945 while (targets.pop()) |target| { 946 try commits.include(&target.after_oid); 947 while (try commits.next(arena.allocator())) |commit| { 948 defer commit.deinit(); 949 const key = try std.fmt.bufPrint(&revision_key_buffer, "{s}\x00{s}", .{ update.ref_name[heads_prefix.len..], &commit.oid }); 950 const ids_cursor = try revisions.getCursor(hash.hashInt(repo_opts.hash, key)) orelse continue; 951 const ids = try DB.CountedHashSet(.read_only).init(ids_cursor); 952 var ids_iter = try ids.iterator(); 953 while (try ids_iter.next()) |cursor| { 954 const pair = try cursor.readKeyValuePair(); 955 var patch_id: [evt.event_id_size]u8 = undefined; 956 if ((try pair.key_cursor.readBytes(&patch_id)).len != patch_id.len) return error.InvalidPatch; 957 const patch_hex = std.fmt.bytesToHex(patch_id, .lower); 958 // a fast-forward has no recorded merge boundary; use the old ref tip 959 const before_oid = if (std.mem.eql(u8, &commit.oid, &target.after_oid)) &old_oid else &target.before_oid; 960 importMerged(repo_opts, state, db, moment, io, allocator, repo_root_path, &patch_id, &commit.oid, before_oid, &target.after_oid) catch |err| { 961 serve_common.logError(io, error_writer, "failed to mark patch {s} as merged: {s}\n", .{ &patch_hex, @errorName(err) }); 962 continue; 963 }; 964 } 965 } 966 } 967 } 968 } 969