╭─────────────╮ │scroll to top│ ╰─────────────╯ ╭ patch.zig ────────────────────────────────────────────────────╮ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ╰───────────────────────────────────────────────────────────────╯
🬐 🬠 🬞🬂🬏 🬟 🬑 🬟 🬑 ╭ddbf673f..╮ ddbf673f.. see-em: 🬋🬋🬋 🬋🬋🬋 🬋 🬋 │files │ commits refs discuss issues new login 🬐 🬠 🬐 🬠 🬑 🬟 🬰 ╰──────────╯ (480) user
╭────╮ ╭ clone ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ╮ │http│ ssh │ │ ╰────╯ ╰ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ╯
.. admin.zig ╭─────────────────────────────────╮ │patch.zig │ ╰─────────────────────────────────╯
837 try std.testing.expect(try pch.editDraft(repo_opts, io, allocator, &admin, draft_path, .{ 838 .id = patch_id_hex, 839 .user_id = user_id, 840 .repo_id = repo_id, 841 .title = "explain the answer", 842 .tags = "enhancement documentation", 843 .description = "adds and explains a reusable answer constant", 844 .target_branch = "master", 845 .author = author, 846 .timestamp = 4, 847 })); 848 849 // 850 // publish the metadata and revision pointer 851 // 852 853 try pch.publish(repo_opts, io, allocator, &admin, &target, draft_path, .{ 854 .id = patch_id_hex, 855 .user_id = user_id, 856 .repo_id = repo_id, 857 .author = author, 858 .timestamp = 5, 859 }); 860 try pch.publish(repo_opts, io, allocator, &admin, &target, draft_path, .{ 861 .id = patch_id_hex, 862 .user_id = user_id, 863 .repo_id = repo_id, 864 .author = author, 865 .timestamp = 6, 866 }); 867 868 var arena = std.heap.ArenaAllocator.init(allocator); 869 defer arena.deinit(); 870 const moment = try evt.currentMoment(repo_opts, &target); 871 const patch = (try evt.Patch.readById(Repo.DB, repo_opts.hash, moment, &arena, &patch_id)) orelse return error.NotFound; 872 try std.testing.expectEqualStrings("explain the answer", patch.event.title); 873 try std.testing.expectEqualStrings(&first_patchrev_hex, &(patch.event.revision orelse return error.NotFound).id); 874 try std.testing.expectEqual(.open, patch.event.status); 875 try std.testing.expectEqual(null, try evt.PatchRev.readById(Repo.DB, repo_opts.hash, moment, &arena, &first_patchrev_id)); 876 877 _ = arena.reset(.retain_capacity); 878 const admin_moment = try evt.currentMoment(evt.admin_repo_opts, &admin); 879 const published_fork = (try evt.Fork.readById(evt.AdminDB, evt.admin_repo_opts.hash, admin_moment, &arena, &patch_id)) orelse return error.NotFound; 880 try std.testing.expect(!published_fork.removed); 881 try std.testing.expectEqual(.publish, published_fork.event.stage); 882 const draft_key = evt.Fork.draftKey(&repo_id, &user_id); 883 try std.testing.expectEqual(0, try indexedForkCount(admin_moment, evt.Fork.repo_user_to_draft_id_set_key, &draft_key)); 884 try std.testing.expectEqual(2, try indexedForkCount(admin_moment, evt.Fork.user_id_to_fork_id_set_key, &user_id)); 885 var squash_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 886 { 887 var draft = try Repo.open(io, allocator, .{ .path = draft_path }); 888 defer draft.deinit(io, allocator); 889 _ = arena.reset(.retain_capacity); 890 const draft_moment = try evt.currentMoment(repo_opts, &draft); 891 const removed = (try evt.Patch.readById(Repo.DB, repo_opts.hash, draft_moment, &arena, &patch_id)) orelse return error.NotFound; 892 try std.testing.expect(removed.removed); 893 const revision = (try evt.PatchRev.readById(Repo.DB, repo_opts.hash, draft_moment, &arena, &first_patchrev_id)) orelse return error.NotFound; 894 @memcpy(&squash_oid, revision.patch_oid); 895 try std.testing.expectEqualStrings("master", removed.event.target_branch); 896 try std.testing.expectEqual(hash.hexLen(repo_opts.hash), revision.event_oid.len); 897 var event_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 898 @memcpy(&event_oid, revision.event_oid); 899 var repo_moment = try draft.core.latestMoment(); 900 const state = Repo.State(.read_only){ .core = &draft.core, .extra = .{ .moment = &repo_moment } }; 901 var event_object = try obj.Object(.xit, repo_opts).initCommit(state, io, allocator, &event_oid); 902 defer event_object.deinit(); 903 const trees = try evt.PatchRev.readTrees(.xit, repo_opts, state, io, allocator, &event_object.content.commit.tree); 904 try std.testing.expectEqualStrings(revision.base_tree_oid, &trees.base); 905 try std.testing.expectEqualStrings(revision.head_tree_oid, &trees.head); 906 } 907 908 // 909 // merge the selected revision into the target 910 // 911 912 try evt.Patch.update(.local, .xit, repo_opts, io, allocator, &target, &patch_id, .{ .status = .closed }, author); 913 try std.testing.expectError(error.PatchClosed, pch.merge(repo_opts, io, allocator, repos_dir, &target, .{ 914 .id = patch_id_hex, 915 .revision = merge_revision, 916 .author = author, 917 .timestamp = 5, 918 })); 919 try evt.Patch.update(.local, .xit, repo_opts, io, allocator, &target, &patch_id, .{ .status = .open }, author); 920 921 // run the cache scenario once; both lifecycle runs still perform a merge 922 if (merge_revision == .source) { 923 try testMergeability(&target, io, allocator, repos_dir, &patch_id, &base_oid, &source_oid); 924 } 925 926 const selected_oid = switch (merge_revision) { 927 .squash => squash_oid, 928 .source => source_oid, 929 }; 930 try pch.mergeAndRemoveFork(repo_opts, io, allocator, repos_dir, &admin, &target, .{ 931 .id = patch_id_hex, 932 .revision = merge_revision, 933 .author = author, 934 .timestamp = 5, 935 }); 936 const target_oid = (try target.readRef(io, .{ .kind = .head, .name = "master" })) orelse return error.NotFound; 937 try std.testing.expectEqualStrings(&selected_oid, &target_oid); 938 939 _ = arena.reset(.retain_capacity); 940 const merged_moment = try evt.currentMoment(repo_opts, &target); 941 const merged = (try evt.Patch.readById(Repo.DB, repo_opts.hash, merged_moment, &arena, &patch_id)) orelse return error.NotFound; 942 try std.testing.expectEqual(.merged, merged.event.status.kind()); 943 const merged_oid = switch (merged.event.status) { 944 .merged => |oid| oid, 945 else => return error.InvalidPatch, 946 }; 947 try std.testing.expectEqualStrings(&selected_oid, merged_oid); 948 try std.testing.expect(null != try evt.PatchRev.readById(Repo.DB, repo_opts.hash, merged_moment, &arena, &first_patchrev_id)); 949 950 _ = arena.reset(.retain_capacity); 951 const removed_fork = (try evt.Fork.readById(evt.AdminDB, evt.admin_repo_opts.hash, try evt.currentMoment(evt.admin_repo_opts, &admin), &arena, &patch_id)) orelse return error.NotFound; 952 try std.testing.expect(removed_fork.removed); 953 } 954 955 fn indexedForkCount( 956 moment: evt.AdminDB.HashMap(.read_only), 957 index_key: []const u8, 958 parent_id: []const u8, 959 ) !u64 { 960 const index_cursor = try moment.getCursor(hash.hashInt(evt.admin_repo_opts.hash, index_key)) orelse return 0; 961 const index = try evt.AdminDB.HashMap(.read_only).init(index_cursor); 962 const ids_cursor = try index.getCursor(hash.hashInt(evt.admin_repo_opts.hash, parent_id)) orelse return 0; 963 const ids = try evt.AdminDB.SortedSet(.read_only).init(ids_cursor); 964 return try ids.count(); 965 } 966 967 fn patchStatusCount(moment: Repo.DB.HashMap(.read_only), status: evt.Patch.StatusKind) !u64 { 968 const statuses_cursor = try moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.status_to_id_set_key)) orelse return 0; 969 const statuses = try Repo.DB.SortedMap(.read_only).init(statuses_cursor); 970 const ids_cursor = try statuses.getCursor(@tagName(status)) orelse return 0; 971 const ids = try Repo.DB.SortedSet(.read_only).init(ids_cursor); 972 return try ids.count(); 973 } 974 975 fn patchTagStatusCount(moment: Repo.DB.HashMap(.read_only), tag: []const u8, status: evt.Patch.StatusKind) !u64 { 976 const tags_cursor = try moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.tag_status_to_id_set_key)) orelse return 0; 977 const tags = try Repo.DB.SortedMap(.read_only).init(tags_cursor); 978 var key_buffer: evt.Patch.TagStatusKey = undefined; 979 const ids_cursor = try tags.getCursor(try evt.Patch.tagStatusKey(&key_buffer, tag, status)) orelse return 0; 980 const ids = try Repo.DB.SortedSet(.read_only).init(ids_cursor); 981 return try ids.count(); 982 } 983 984 fn readMergeability(repo: *Repo, io: std.Io, allocator: std.mem.Allocator, id: *const [evt.event_id_size]u8, patch: evt.Patch) !pch.Mergeability { 985 var arena = std.heap.ArenaAllocator.init(allocator); 986 defer arena.deinit(); 987 var moment = try repo.core.latestMoment(); 988 return pch.readMergeability(repo_opts, .{ .core = &repo.core, .extra = .{ .moment = &moment } }, io, &arena, id, patch); 989 } 990 991 fn expectMergeabilityShortBytes(moment: Repo.DB.HashMap(.read_only), id: *const [evt.event_id_size]u8) !void { 992 const checks = try Repo.DB.HashMap(.read_only).init((try moment.getCursor(hash.hashInt(repo_opts.hash, "patch-id->mergeability"))) orelse return error.NotFound); 993 const entry = try Repo.DB.HashMap(.read_only).init((try checks.getCursor(hash.hashInt(repo_opts.hash, id))) orelse return error.NotFound); 994 const result = try Repo.DB.HashMap(.read_only).init((try entry.getCursor(hash.hashInt(repo_opts.hash, "result"))) orelse return error.NotFound); 995 for ([_][]const u8{ "source", "squash" }) |field| { 996 const cursor = (try result.getCursor(hash.hashInt(repo_opts.hash, field))) orelse return error.NotFound; 997 try std.testing.expectEqual(.short_bytes, cursor.slot().tag); 998 } 999 } 1000 1001 fn testMergeability( 1002 target: *Repo, 1003 io: std.Io, 1004 allocator: std.mem.Allocator, 1005 repos_dir: []const u8, 1006 id: *const [evt.event_id_size]u8, 1007 base: *const [hash.hexLen(repo_opts.hash)]u8, 1008 source: *const [hash.hexLen(repo_opts.hash)]u8, 1009 ) !void { 1010 var arena = std.heap.ArenaAllocator.init(allocator); 1011 defer arena.deinit(); 1012 const events = try evt.currentMoment(repo_opts, target); 1013 const record = (try evt.Patch.readById(Repo.DB, repo_opts.hash, events, &arena, id)) orelse return error.NotFound; 1014 const patch = record.event; 1015 1016 // publication checks both methods, and reads and cache hits do no work 1017 const clean = pch.Mergeability{ .source = .clean, .squash = .clean }; 1018 try std.testing.expectEqualDeep(clean, try readMergeability(target, io, allocator, id, patch)); 1019 try expectMergeabilityShortBytes(try target.core.latestMoment(), id); 1020 const before = (try target.core.latestMoment()).cursor.slot(); 1021 pch.refreshMergeability(repo_opts, io, allocator, target, id.*); 1022 try std.testing.expectEqualDeep(before, (try target.core.latestMoment()).cursor.slot()); 1023 { 1024 var moment = try target.core.latestMoment(); 1025 const state = Repo.State(.read_only){ .core = &target.core, .extra = .{ .moment = &moment } }; 1026 try std.testing.expectError(error.ObjectNotFound, obj.Object(.xit, repo_opts).initCommit(state, io, allocator, source)); 1027 } 1028 1029 // a target update invalidates the old result before refresh 1030 { 1031 const file = try target.core.work_dir.createFile(io, "feature.zig", .{ .truncate = true }); 1032 defer file.close(io); 1033 try file.writeStreamingAll(io, "pub const answer = 99;\n"); 1034 } 1035 try target.add(io, allocator, &.{"feature.zig"}); 1036 const conflicting_target = try target.commit(io, allocator, .{ .message = "different answer", .timestamp = 20 }); 1037 const input = pch.MergeInput{ .id = std.fmt.bytesToHex(id.*, .lower), .revision = .source, .author = author, .timestamp = 21 }; 1038 var squash_input = input; 1039 squash_input.revision = .squash; 1040 try std.testing.expectEqualDeep(pch.Mergeability{}, try readMergeability(target, io, allocator, id, patch)); 1041 try std.testing.expectError(error.MergeCheckUnavailable, pch.merge(repo_opts, io, allocator, repos_dir, target, input)); 1042 try std.testing.expectError(error.MergeCheckUnavailable, pch.merge(repo_opts, io, allocator, repos_dir, target, squash_input)); 1043 1044 // local edits and server comments leave checks alone 1045 var edit = evt.Patch.Update{ .fields = .{ 1046 .title = "edit the answer", 1047 .tags = patch.tags, 1048 .description = patch.description, 1049 .target_branch = patch.target_branch, 1050 } }; 1051 try evt.Patch.update(.local, .xit, repo_opts, io, allocator, target, id, edit, author); 1052 try std.testing.expectEqualDeep(pch.Mergeability{}, try readMergeability(target, io, allocator, id, patch)); 1053 _ = try evt.Comment.create(.server, .xit, repo_opts, io, allocator, target, &input.id, &input.id, "reviewing the answer", author); 1054 try std.testing.expectEqualDeep(pch.Mergeability{}, try readMergeability(target, io, allocator, id, patch)); 1055 1056 // a server patch edit refreshes its mergeability 1057 edit.fields.title = patch.title; 1058 try evt.Patch.update(.server, .xit, repo_opts, io, allocator, target, id, edit, author); 1059 const events_before = try target.readRef(io, evt.events_ref); 1060 try std.testing.expectEqualDeep(pch.Mergeability{ .source = .conflict, .squash = .conflict }, try readMergeability(target, io, allocator, id, patch)); 1061 try expectMergeabilityShortBytes(try target.core.latestMoment(), id); 1062 try std.testing.expectError(error.MergeConflict, pch.merge(repo_opts, io, allocator, repos_dir, target, input)); 1063 try std.testing.expectError(error.MergeConflict, pch.merge(repo_opts, io, allocator, repos_dir, target, squash_input)); 1064 try std.testing.expectEqual(events_before, try target.readRef(io, evt.events_ref)); 1065 try std.testing.expectEqual(conflicting_target, (try target.readRef(io, .{ .kind = .head, .name = "master" })).?); 1066 try std.testing.expectEqual(null, try target.readRef(io, .{ .kind = .none, .name = "MERGE_HEAD" })); 1067 1068 // deleting and restoring the target cannot reuse the conflict result 1069 { 1070 var detached = try target.switchDir(io, allocator, .{ .target = .{ .oid = base } }); 1071 defer detached.deinit(); 1072 } 1073 try target.removeBranch(io, .{ .name = "master" }); 1074 pch.refreshMergeability(repo_opts, io, allocator, target, null); 1075 try std.testing.expectEqualDeep(pch.Mergeability{}, try readMergeability(target, io, allocator, id, patch)); 1076 try expectMergeabilityShortBytes(try target.core.latestMoment(), id); 1077 try target.addBranch(io, .{ .name = "master" }); 1078 { 1079 var restored = try target.switchDir(io, allocator, .{ .target = .{ .ref = .{ .kind = .head, .name = "master" } } }); 1080 defer restored.deinit(); 1081 } 1082 pch.refreshMergeability(repo_opts, io, allocator, target, null); 1083 try std.testing.expectEqualDeep(clean, try readMergeability(target, io, allocator, id, patch)); 1084 1085 // a missing fork disables merging without changing the accepted events 1086 const draft_path = try fork.forkPath(allocator, repos_dir, &std.fmt.bytesToHex(id.*, .lower)); 1087 defer allocator.free(draft_path); 1088 const away_path = try std.fmt.allocPrint(allocator, "{s}.away", .{draft_path}); 1089 defer allocator.free(away_path); 1090 { 1091 try std.Io.Dir.renameAbsolute(draft_path, away_path, io); 1092 defer std.Io.Dir.renameAbsolute(away_path, draft_path, io) catch {}; 1093 try std.testing.expectError(error.PatchDataUnavailable, pch.merge(repo_opts, io, allocator, repos_dir, target, input)); 1094 try std.testing.expectEqualDeep(pch.Mergeability{}, try readMergeability(target, io, allocator, id, patch)); 1095 try std.testing.expectEqual(events_before, try target.readRef(io, evt.events_ref)); 1096 } 1097 pch.refreshMergeability(repo_opts, io, allocator, target, id.*); 1098 try std.testing.expectEqualDeep(clean, try readMergeability(target, io, allocator, id, patch)); 1099 1100 // a changed revision is unknown even if its target has not moved 1101 var changed = patch; 1102 changed.revision.?.id[0] = if (changed.revision.?.id[0] == 'a') 'b' else 'a'; 1103 try std.testing.expectEqualDeep(pch.Mergeability{}, try readMergeability(target, io, allocator, id, changed)); 1104 } 1105