╭─────────────╮ │scroll to top│ ╰─────────────╯ ╭ patch.zig ────────────────────────────────────────────────────╮ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ╰───────────────────────────────────────────────────────────────╯
🬐 🬠 🬞🬂🬏 🬟 🬑 🬟 🬑 ╭03aedad0..╮ 03aedad0.. haxy: 🬋🬋🬋 🬋🬋🬋 🬋 🬋 │files │ commits refs discuss issues patches new login 🬐 🬠 🬐 🬠 🬑 🬟 🬰 ╰──────────╯ (701) user
╭────╮ ╭ clone ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─╮ │http│ ssh │ │ ╰────╯ ╰ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─╯
.. admin.zig notify.zig ╭─────────────────────────────────╮ │patch.zig │ ╰─────────────────────────────────╯
602 .{ .tree = .{ .name = "base", .oid = &base_tree_oid } }, 603 .{ .tree = .{ .name = "head", .oid = &source_a_tree } }, 604 }; 605 var target_patch = updated_patch; 606 target_patch.status = .closed; 607 { 608 try consumePatchWithRevision(.repo, io, allocator, &target, evt.events_ref, patchrev_a_id, .{ 609 .base_oid = &base_oid, 610 .source_oid = &source_a_oid, 611 .message = updated_patch.title, 612 }, &target_entries, 8, patch_id, target_patch, 9); 613 } 614 615 // 616 // select the second revision on the side branch 617 // 618 619 const patchrev_b_id = evt.EventWithId.randomId(prng.random()); 620 const parent_entries = [_]evt.EventTreeEntry{ 621 .{ .tree = .{ .name = "base", .oid = &base_tree_oid } }, 622 .{ .tree = .{ .name = "head", .oid = &source_b_tree } }, 623 }; 624 var parent_patch = updated_patch; 625 parent_patch.status = .{ .merged = .{ .revision = .source, .patchrev_id = std.fmt.bytesToHex(patchrev_b_id, .lower) } }; 626 { 627 try consumePatchWithRevision(.repo, io, allocator, &target, side_events_ref, patchrev_b_id, .{ 628 .base_oid = &base_oid, 629 .source_oid = &source_b_oid, 630 .message = updated_patch.title, 631 }, &parent_entries, 10, patch_id, parent_patch, 11); 632 } 633 634 // 635 // merge the competing patch revisions 636 // 637 638 { 639 try evt.mergeEvents(.xit, repo_opts, io, allocator, &target, side_events_ref); 640 try evt.consume(.local, .repo, .xit, repo_opts, io, allocator, &target, evt.events_ref, &.{}); 641 } 642 643 // 644 // check the selected revision and conflict 645 // 646 647 _ = arena.reset(.retain_capacity); 648 const merged_moment = try evt.currentMoment(repo_opts, &target); 649 const merged = (try evt.Patch.readById(Repo.DB, repo_opts.hash, merged_moment, &arena, &patch_id)) orelse return error.NotFound; 650 try std.testing.expectEqualStrings(&std.fmt.bytesToHex(patchrev_a_id, .lower), &(merged.event.revision orelse return error.NotFound).id); 651 const merged_patchrev = (try evt.PatchRev.readById(Repo.DB, repo_opts.hash, merged_moment, &arena, &patchrev_a_id)) orelse return error.NotFound; 652 try std.testing.expectEqualStrings(&source_a_oid, merged_patchrev.event.source_oid); 653 try std.testing.expectEqualStrings(&source_a_tree, merged_patchrev.head_tree_oid); 654 655 const conflicts_cursor = try merged_moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.conflicts_key)) orelse return error.NotFound; 656 const conflicts = try Repo.DB.SortedMap(.read_only).init(conflicts_cursor); 657 const conflict_cursor = try conflicts.getCursor(&evt.orderKeyDesc(merged.created_order, &patch_id)) orelse return error.NotFound; 658 const conflict = try Repo.DB.HashMap(.read_only).init(conflict_cursor); 659 const fields_cursor = try conflict.getCursor(hash.hashInt(repo_opts.hash, evt.conflicted_fields_key)) orelse return error.NotFound; 660 try std.testing.expectEqualStrings("revision status", try fields_cursor.readBytesAlloc(arena.allocator(), null)); 661 const their_cursor = try conflict.getCursor(hash.hashInt(repo_opts.hash, evt.their_record_key)) orelse return error.NotFound; 662 const theirs = try evt.read(evt.Patch.Record, Repo.DB, repo_opts.hash, &arena, try Repo.DB.HashMap(.read_only).init(their_cursor)); 663 try std.testing.expectEqualStrings(&std.fmt.bytesToHex(patchrev_b_id, .lower), &(theirs.event.revision orelse return error.NotFound).id); 664 665 // 666 // create a patch stacked on the selected revision 667 // 668 669 const child_patchrev_id = evt.EventWithId.randomId(prng.random()); 670 const child_id = evt.EventWithId.randomId(prng.random()); 671 const child_entries = [_]evt.EventTreeEntry{ 672 .{ .tree = .{ .name = "base", .oid = merged_patchrev.head_tree_oid } }, 673 .{ .tree = .{ .name = "head", .oid = &source_b_tree } }, 674 }; 675 { 676 try consumePatchWithRevision(.repo, io, allocator, &target, evt.events_ref, child_patchrev_id, .{ 677 .base_oid = merged_patchrev.patch_oid, 678 .source_oid = &source_b_oid, 679 .message = "stack another answer change", 680 }, &child_entries, 12, child_id, .{ 681 .title = "stack another answer change", 682 .description = "depends on the first patch", 683 .labels = "enhancement", 684 .target_branch = "master", 685 .target_patch_id = std.fmt.bytesToHex(patch_id, .lower), 686 }, 13); 687 } 688 689 // 690 // check the squash commit and reverse index 691 // 692 693 _ = arena.reset(.retain_capacity); 694 const stacked_moment = try evt.currentMoment(repo_opts, &target); 695 const child = (try evt.Patch.readById(Repo.DB, repo_opts.hash, stacked_moment, &arena, &child_id)) orelse return error.NotFound; 696 var selected_patchrev_id: [evt.event_id_size]u8 = undefined; 697 _ = try std.fmt.hexToBytes(&selected_patchrev_id, &(child.event.revision orelse return error.NotFound).id); 698 const child_patchrev = (try evt.PatchRev.readById(Repo.DB, repo_opts.hash, stacked_moment, &arena, &selected_patchrev_id)) orelse return error.NotFound; 699 var child_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 700 @memcpy(&child_oid, child_patchrev.patch_oid); 701 { 702 var child_repo_moment = try target.core.latestMoment(); 703 const child_state = Repo.State(.read_only){ .core = &target.core, .extra = .{ .moment = &child_repo_moment } }; 704 var child_object = try obj.Object(.xit, repo_opts).init(child_state, io, allocator, &child_oid); 705 defer child_object.deinit(); 706 const child_commit = switch (child_object.content) { 707 .commit => |commit| commit, 708 else => return error.InvalidObject, 709 }; 710 const child_parents = child_commit.metadata.parent_oids orelse return error.ParentOidsNotFound; 711 try std.testing.expectEqualStrings(child_patchrev.event.base_oid, &child_parents[0]); 712 } 713 714 const targets_cursor = try stacked_moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.target_patch_id_to_patch_id_set_key)) orelse return error.NotFound; 715 const targets = try Repo.DB.HashMap(.read_only).init(targets_cursor); 716 const children_cursor = try targets.getCursor(hash.hashInt(repo_opts.hash, &patch_id)) orelse return error.NotFound; 717 const children = try Repo.DB.SortedSet(.read_only).init(children_cursor); 718 try std.testing.expectEqual(1, try children.count()); 719 720 // 721 // close and merge the same revision concurrently 722 // 723 724 const status_side_ref: rf.Ref = .{ .kind = .head, .name = "haxy/patch-status-side" }; 725 { 726 var result = try target.switchDir(io, allocator, .{ .target = .{ .ref = evt.events_ref } }); 727 defer result.deinit(); 728 try target.addBranch(io, .{ .name = status_side_ref.name }); 729 } 730 var closed_child = child.event; 731 closed_child.status = .closed; 732 try evt.consume(.local, .repo, .xit, repo_opts, io, allocator, &target, evt.events_ref, &.{.{ 733 .id = std.fmt.bytesToHex(child_id, .lower), 734 .timestamp = 14, 735 .author = author, 736 .event = .{ .patch = closed_child }, 737 }}); 738 var merged_child = child.event; 739 merged_child.status = .{ .merged = .{ .revision = .source, .patchrev_id = (child.event.revision orelse return error.NotFound).id } }; 740 try evt.consume(.local, .repo, .xit, repo_opts, io, allocator, &target, status_side_ref, &.{.{ 741 .id = std.fmt.bytesToHex(child_id, .lower), 742 .timestamp = 15, 743 .author = author, 744 .event = .{ .patch = merged_child }, 745 }}); 746 try evt.mergeEvents(.xit, repo_opts, io, allocator, &target, status_side_ref); 747 try evt.consume(.local, .repo, .xit, repo_opts, io, allocator, &target, evt.events_ref, &.{}); 748 749 _ = arena.reset(.retain_capacity); 750 const status_moment = try evt.currentMoment(repo_opts, &target); 751 const merged_child_record = (try evt.Patch.readById(Repo.DB, repo_opts.hash, status_moment, &arena, &child_id)) orelse return error.NotFound; 752 try std.testing.expectEqual(.merged, merged_child_record.event.status.kind()); 753 try std.testing.expectEqual(0, try patchStatusCount(status_moment, .open)); 754 try std.testing.expectEqual(1, try patchStatusCount(status_moment, .closed)); 755 try std.testing.expectEqual(1, try patchStatusCount(status_moment, .merged)); 756 try std.testing.expectEqual(1, try patchLabelStatusCount(status_moment, "enhancement", .merged)); 757 const status_conflicts_cursor = try status_moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.conflicts_key)) orelse return error.NotFound; 758 const status_conflicts = try Repo.DB.SortedMap(.read_only).init(status_conflicts_cursor); 759 const child_conflict = try status_conflicts.getCursor(&evt.orderKeyDesc(merged_child_record.created_order, &child_id)); 760 try std.testing.expectEqual(null, child_conflict); 761 762 var reopened_child = merged_child_record.event; 763 reopened_child.status = .open; 764 try std.testing.expectError(error.PatchAlreadyMerged, evt.consume(.local, .repo, .xit, repo_opts, io, allocator, &target, evt.events_ref, &.{.{ 765 .id = std.fmt.bytesToHex(child_id, .lower), 766 .timestamp = 16, 767 .author = author, 768 .event = .{ .patch = reopened_child }, 769 }})); 770 771 const invalid_merged_id = evt.EventWithId.randomId(prng.random()); 772 try std.testing.expectError(error.InvalidPatch, evt.consume(.local, .repo, .xit, repo_opts, io, allocator, &target, evt.events_ref, &.{.{ 773 .id = std.fmt.bytesToHex(invalid_merged_id, .lower), 774 .timestamp = 16, 775 .author = author, 776 .event = .{ .patch = .{ 777 .title = "invalid merged patch", 778 .description = "has no revision", 779 .labels = "enhancement", 780 .target_branch = "master", 781 .status = .{ .merged = .{ .revision = .source, .patchrev_id = std.fmt.bytesToHex(invalid_merged_id, .lower) } }, 782 } }, 783 }})); 784 785 // 786 // retain the ref-free commits during garbage collection 787 // 788 789 { 790 const roots = try evt.PatchRev.gcRoots(Repo.DB, repo_opts.hash, allocator, stacked_moment); 791 defer allocator.free(roots); 792 try std.testing.expectEqual(4, roots.len); 793 _ = try target.garbageCollect(io, allocator, .{ .extra_roots = roots }, null); 794 795 var after_gc_moment = try target.core.latestMoment(); 796 const after_gc_state = Repo.State(.read_only){ .core = &target.core, .extra = .{ .moment = &after_gc_moment } }; 797 var retained = try obj.Object(.xit, repo_opts).init(after_gc_state, io, allocator, &roots[0]); 798 retained.deinit(); 799 } 800 } 801 802 test "patch lifecycle" { 803 try patchLifecycle(.squash); 804 try patchLifecycle(.source); 805 } 806 807 fn patchLifecycle(merge_revision: evt.Patch.MergeRevision) !void { 808 const io = std.testing.io; 809 const allocator = std.testing.allocator; 810 811 var temp = std.testing.tmpDir(.{}); 812 defer temp.cleanup(); 813 const temp_path = try temp.dir.realPathFileAlloc(io, ".", allocator); 814 defer allocator.free(temp_path); 815 816 const users_dir = try std.Io.Dir.path.join(allocator, &.{ temp_path, "users" }); 817 defer allocator.free(users_dir); 818 const admin_path = try std.Io.Dir.path.join(allocator, &.{ temp_path, "admin" }); 819 defer allocator.free(admin_path); 820 const upstream_path = try std.Io.Dir.path.join(allocator, &.{ temp_path, "upstream" }); 821 defer allocator.free(upstream_path); 822 const source_path = try std.Io.Dir.path.join(allocator, &.{ temp_path, "source" }); 823 defer allocator.free(source_path); 824 825 var prng = std.Random.DefaultPrng.init(std.testing.random_seed); 826 const user_id = evt.EventWithId.randomId(prng.random()); 827 const repo_id = evt.EventWithId.randomId(prng.random()); 828 const repo_id_hex = std.fmt.bytesToHex(repo_id, .lower); 829 const target_path = try evt.repoPath(allocator, users_dir, &user_id, &repo_id); 830 defer allocator.free(target_path); 831 832 var admin = try rp.Repo(.xit, evt.admin_repo_opts).init(io, allocator, .{ .path = admin_path }); 833 defer admin.deinit(io, allocator); 834 try evt.consume(.{ .server = .{ .users_dir = users_dir } }, .admin, .xit, evt.admin_repo_opts, io, allocator, &admin, evt.events_ref, &.{ 835 .{ 836 .id = std.fmt.bytesToHex(user_id, .lower), 837 .timestamp = 1, 838 .author = author, 839 .event = .{ .user = .{ 840 .name = author.name, 841 .email = author.email, 842 .password_hash = "", 843 } }, 844 }, 845 }); 846 const user_repo_path = try evt.userRepoPath(allocator, users_dir, &user_id); 847 defer allocator.free(user_repo_path); 848 var user_repo = try evt.initUserRepo(io, allocator, user_repo_path); 849 defer user_repo.deinit(io, allocator); 850 try evt.consume(.{ .server = .{ .users_dir = users_dir } }, .user, .xit, evt.user_repo_opts, io, allocator, &user_repo, evt.events_ref, &.{ 851 .{ 852 .id = repo_id_hex, 853 .timestamp = 1, 854 .author = author, 855 .event = .{ .repo = .{ 856 .user_id = std.fmt.bytesToHex(user_id, .lower), 857 .name = "repo", 858 .description = "", 859 .patch_role = .read, 860 } }, 861 }, 862 }); 863 864 // 865 // create the target repo 866 // 867 868 { 869 var upstream = try rp.Repo(.git, .{ .is_test = true }).init(io, allocator, .{ .path = upstream_path }); 870 defer upstream.deinit(io, allocator); 871 const file = try upstream.core.work_dir.createFile(io, "main.zig", .{ .truncate = true }); 872 defer file.close(io); 873 try file.writeStreamingAll(io, "pub fn main() void {}\n"); 874 try upstream.add(io, allocator, &.{"main.zig"}); 875 _ = try upstream.commit(io, allocator, .{ .author = "alice <alice@example.test>", .message = "initial code", .timestamp = 1 }); 876 } 877 var target = try Repo.clone(io, allocator, upstream_path, target_path, target_path, null, .{}); 878 defer target.deinit(io, allocator); 879 880 // 881 // create the patch draft in the fork 882 // 883 884 const patch_id = evt.EventWithId.randomId(prng.random()); 885 const patch_id_hex = std.fmt.bytesToHex(patch_id, .lower); 886 const draft_path = try fork.create(.{ .is_test = true }, io, allocator, users_dir, .{ 887 .target_branch = "master", 888 .id = patch_id_hex, 889 .user_id = user_id, 890 .repo_id = repo_id, 891 .repo_user_id = user_id, 892 .repo_name = "target", 893 .title = "add the answer", 894 .labels = "enhancement", 895 .description = "adds a reusable answer constant", 896 .author = author, 897 .timestamp = 2, 898 }); 899 defer allocator.free(draft_path); 900 901 // 902 // create and record the proposed revision in the fork 903 // 904 905 const base_oid = (try target.readRef(io, .{ .kind = .head, .name = "master" })) orelse return error.NotFound; 906 const base_tree_oid = try commitTree(io, allocator, &target, &base_oid); 907 var source = try Repo.clone(io, allocator, upstream_path, source_path, source_path, null, .{}); 908 defer source.deinit(io, allocator); 909 const source_oid = blk: { 910 const file = try source.core.work_dir.createFile(io, "feature.zig", .{ .truncate = true }); 911 defer file.close(io); 912 try file.writeStreamingAll(io, "pub const answer = 42;\n"); 913 try source.add(io, allocator, &.{"feature.zig"}); 914 break :blk try source.commit(io, allocator, .{ .author = "alice <alice@example.test>", .message = "add feature", .timestamp = 2 }); 915 }; 916 const head_tree_oid = try commitTree(io, allocator, &source, &source_oid); 917 const first_patchrev_id = evt.EventWithId.randomId(prng.random()); 918 const first_patchrev_hex = std.fmt.bytesToHex(first_patchrev_id, .lower); 919 const first_entries = [_]evt.EventTreeEntry{ 920 .{ .tree = .{ .name = "base", .oid = &base_tree_oid } }, 921 .{ .tree = .{ .name = "head", .oid = &head_tree_oid } }, 922 }; 923 { 924 var draft = try Repo.open(io, allocator, .{ .path = draft_path }); 925 defer draft.deinit(io, allocator); 926 var arena = std.heap.ArenaAllocator.init(allocator); 927 defer arena.deinit(); 928 929 const initial_moment = try evt.currentMoment(repo_opts, &draft); 930 const initial_patch = (try evt.Patch.readById(Repo.DB, repo_opts.hash, initial_moment, &arena, &patch_id)) orelse return error.NotFound; 931 try std.testing.expect(!initial_patch.removed); 932 try std.testing.expectEqualStrings("add the answer", initial_patch.event.title); 933 try std.testing.expectEqual(null, initial_patch.event.revision); 934 try std.testing.expectEqual(null, try evt.PatchRev.readNewest(Repo.DB, repo_opts.hash, initial_moment, &arena)); 935 936 var source_moment = try source.core.latestMoment(); 937 const source_state = Repo.State(.read_only){ .core = &source.core, .extra = .{ .moment = &source_moment } }; 938 var objects = try obj.ObjectIterator(.xit, repo_opts).init(source_state, io, allocator, .{ .kind = .all }); 939 defer objects.deinit(); 940 try objects.include(&source_oid); 941 try draft.copyObjects(.xit, repo_opts, &objects, io, null); 942 try consumePatchWithRevision(.fork, io, allocator, &draft, evt.events_ref, first_patchrev_id, .{ 943 .base_oid = &base_oid, 944 .source_oid = &source_oid, 945 .message = "add the answer", 946 }, &first_entries, 3, patch_id, .{ 947 .title = "add the answer", 948 .labels = "enhancement", 949 .description = "adds a reusable answer constant", 950 .target_branch = "master", 951 }, 3); 952 953 _ = arena.reset(.retain_capacity); 954 const moment = try evt.currentMoment(repo_opts, &draft); 955 const patch = (try evt.Patch.readById(Repo.DB, repo_opts.hash, moment, &arena, &patch_id)) orelse return error.NotFound; 956 try std.testing.expect(!patch.removed); 957 try std.testing.expectEqualStrings(&first_patchrev_hex, &(patch.event.revision orelse return error.NotFound).id); 958 try std.testing.expect(null != try evt.PatchRev.readById(Repo.DB, repo_opts.hash, moment, &arena, &first_patchrev_id)); 959 } 960 try std.testing.expectError(error.NotFound, evt.currentMoment(repo_opts, &target)); 961 962 // draft mergeability checks leave the target repo untouched 963 const before_draft_check = (try target.core.latestMoment()).cursor.slot(); 964 pch.refreshMergeability(repo_opts, io, allocator, &target, users_dir, patch_id); 965 try std.testing.expectEqualDeep(before_draft_check, (try target.core.latestMoment()).cursor.slot()); 966 967 // 968 // publish another draft before its first push 969 // 970 971 const unpushed_id = evt.EventWithId.randomId(prng.random()); 972 const unpushed_id_hex = std.fmt.bytesToHex(unpushed_id, .lower); 973 const unpushed_path = try fork.create(.{ .is_test = true }, io, allocator, users_dir, .{ 974 .id = unpushed_id_hex, 975 .user_id = user_id, 976 .repo_id = repo_id, 977 .repo_user_id = user_id, 978 .repo_name = "target", 979 .title = "explain the answer", 980 .labels = "documentation", 981 .description = "describes the existing answer", 982 .target_branch = "master", 983 .author = author, 984 .timestamp = 3, 985 }); 986 defer allocator.free(unpushed_path); 987 try pch.publish(repo_opts, io, allocator, .{ .users_dir = users_dir }, &admin, &target, .{ 988 .id = unpushed_id_hex, 989 .user_id = user_id, 990 .repo_id = repo_id, 991 .author = author, 992 .timestamp = 4, 993 }); 994 { 995 var verify_arena = std.heap.ArenaAllocator.init(allocator); 996 defer verify_arena.deinit(); 997 const target_moment = try evt.currentMoment(repo_opts, &target); 998 const unpushed = (try evt.Patch.readById(Repo.DB, repo_opts.hash, target_moment, &verify_arena, &unpushed_id)) orelse return error.NotFound; 999 try std.testing.expectEqual(null, unpushed.event.revision); 1000 1001 var unpushed_repo = try Repo.open(io, allocator, .{ .path = unpushed_path }); 1002 defer unpushed_repo.deinit(io, allocator); 1003 const fork_moment = try evt.currentMoment(repo_opts, &unpushed_repo); 1004 const removed = (try evt.Patch.readById(Repo.DB, repo_opts.hash, fork_moment, &verify_arena, &unpushed_id)) orelse return error.NotFound; 1005 try std.testing.expect(removed.removed); 1006 } 1007 1008 // 1009 // edit the patch metadata in the fork 1010 // 1011 1012 try std.testing.expect(try pch.editDraft(repo_opts, io, allocator, users_dir, &admin, .{ 1013 .id = patch_id_hex, 1014 .user_id = user_id, 1015 .repo_id = repo_id, 1016 .title = "explain the answer", 1017 .labels = "enhancement documentation", 1018 .description = "adds and explains a reusable answer constant", 1019 .target_branch = "master", 1020 .author = author, 1021 .timestamp = 4, 1022 })); 1023 1024 // 1025 // publish the metadata and revision pointer 1026 // 1027 1028 const before_publish = try target.core.db.rootCursor().count(); 1029 try pch.publish(repo_opts, io, allocator, .{ .users_dir = users_dir }, &admin, &target, .{ 1030 .id = patch_id_hex, 1031 .user_id = user_id, 1032 .repo_id = repo_id, 1033 .author = author, 1034 .timestamp = 5, 1035 }); 1036 try std.testing.expectEqual(before_publish + 1, try target.core.db.rootCursor().count()); 1037 try pch.publish(repo_opts, io, allocator, .{ .users_dir = users_dir }, &admin, &target, .{ 1038 .id = patch_id_hex, 1039 .user_id = user_id, 1040 .repo_id = repo_id, 1041 .author = author, 1042 .timestamp = 6, 1043 }); 1044 1045 var arena = std.heap.ArenaAllocator.init(allocator); 1046 defer arena.deinit(); 1047 const moment = try evt.currentMoment(repo_opts, &target); 1048 const patch = (try evt.Patch.readById(Repo.DB, repo_opts.hash, moment, &arena, &patch_id)) orelse return error.NotFound; 1049 try std.testing.expectEqualStrings("explain the answer", patch.event.title); 1050 try std.testing.expectEqualStrings(&first_patchrev_hex, &(patch.event.revision orelse return error.NotFound).id); 1051 try std.testing.expectEqual(.open, patch.event.status); 1052 try std.testing.expectEqual(null, try evt.PatchRev.readById(Repo.DB, repo_opts.hash, moment, &arena, &first_patchrev_id)); 1053 1054 _ = arena.reset(.retain_capacity); 1055 const user_moment = try evt.currentMoment(evt.user_repo_opts, &user_repo); 1056 const published_fork = (try evt.Fork.readById(evt.UserDB, evt.user_repo_opts.hash, user_moment, &arena, &patch_id)) orelse return error.NotFound; 1057 try std.testing.expect(!published_fork.removed); 1058 try std.testing.expectEqual(.publish, published_fork.event.stage); 1059 try std.testing.expectEqual(0, try draftForkCount(user_moment, &repo_id)); 1060 try std.testing.expectEqual(2, try activeForkCount(user_moment)); 1061 var squash_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 1062 { 1063 var draft = try Repo.open(io, allocator, .{ .path = draft_path }); 1064 defer draft.deinit(io, allocator); 1065 _ = arena.reset(.retain_capacity); 1066 const draft_moment = try evt.currentMoment(repo_opts, &draft); 1067 const removed = (try evt.Patch.readById(Repo.DB, repo_opts.hash, draft_moment, &arena, &patch_id)) orelse return error.NotFound; 1068 try std.testing.expect(removed.removed); 1069 const revision = (try evt.PatchRev.readById(Repo.DB, repo_opts.hash, draft_moment, &arena, &first_patchrev_id)) orelse return error.NotFound; 1070 @memcpy(&squash_oid, revision.patch_oid); 1071 try std.testing.expectEqualStrings("master", removed.event.target_branch); 1072 try std.testing.expectEqual(hash.hexLen(repo_opts.hash), revision.event_oid.len); 1073 var event_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 1074 @memcpy(&event_oid, revision.event_oid); 1075 var repo_moment = try draft.core.latestMoment(); 1076 const state = Repo.State(.read_only){ .core = &draft.core, .extra = .{ .moment = &repo_moment } }; 1077 var event_object = try obj.Object(.xit, repo_opts).initCommit(state, io, allocator, &event_oid); 1078 defer event_object.deinit(); 1079 const trees = try evt.PatchRev.readTrees(.xit, repo_opts, state, io, allocator, &event_object.content.commit.tree); 1080 try std.testing.expectEqualStrings(revision.base_tree_oid, &trees.base); 1081 try std.testing.expectEqualStrings(revision.head_tree_oid, &trees.head); 1082 } 1083 1084 // 1085 // merge the selected revision into the target 1086 // 1087 1088 try evt.Patch.update(.{ .server = .{ .users_dir = users_dir } }, .xit, repo_opts, io, allocator, &target, &patch_id, .{ .status = .closed }, author); 1089 try std.testing.expectError(error.PatchClosed, pch.merge(repo_opts, io, allocator, .{ .users_dir = users_dir }, &target, .{ 1090 .id = patch_id_hex, 1091 .revision = merge_revision, 1092 .author = author, 1093 .timestamp = 5, 1094 })); 1095 try evt.Patch.update(.{ .server = .{ .users_dir = users_dir } }, .xit, repo_opts, io, allocator, &target, &patch_id, .{ .status = .open }, author); 1096 1097 // run the cache scenario once; both lifecycle runs still perform a merge 1098 if (merge_revision == .source) { 1099 try testMergeability(&target, io, allocator, users_dir, &user_id, &patch_id, &base_oid, &source_oid); 1100 } 1101 1102 const selected_oid = switch (merge_revision) { 1103 .squash => squash_oid, 1104 .source => source_oid, 1105 }; 1106 try pch.mergeAndRemoveFork(repo_opts, io, allocator, .{ .users_dir = users_dir }, &target, .{ 1107 .id = patch_id_hex, 1108 .revision = merge_revision, 1109 .author = author, 1110 .timestamp = 5, 1111 }); 1112 const target_oid = (try target.readRef(io, .{ .kind = .head, .name = "master" })) orelse return error.NotFound; 1113 try std.testing.expectEqualStrings(&selected_oid, &target_oid); 1114 1115 _ = arena.reset(.retain_capacity); 1116 const merged_moment = try evt.currentMoment(repo_opts, &target); 1117 const merged = (try evt.Patch.readById(Repo.DB, repo_opts.hash, merged_moment, &arena, &patch_id)) orelse return error.NotFound; 1118 try std.testing.expectEqual(.merged, merged.event.status.kind()); 1119 const merged_status = switch (merged.event.status) { 1120 .merged => |value| value, 1121 else => return error.InvalidPatch, 1122 }; 1123 try std.testing.expectEqual(merge_revision, merged_status.revision); 1124 const result_id = try evt.parseEventId(&merged_status.patchrev_id); 1125 const result = (try evt.PatchRev.readById(Repo.DB, repo_opts.hash, merged_moment, &arena, &result_id)) orelse return error.NotFound; 1126 try std.testing.expectEqualStrings(&base_oid, result.event.base_oid); 1127 try std.testing.expectEqualStrings(&selected_oid, result.event.source_oid); 1128 try std.testing.expect(null != try evt.PatchRev.readById(Repo.DB, repo_opts.hash, merged_moment, &arena, &first_patchrev_id)); 1129 1130 _ = arena.reset(.retain_capacity); 1131 const removed_fork = (try evt.Fork.readById(evt.UserDB, evt.user_repo_opts.hash, try evt.currentMoment(evt.user_repo_opts, &user_repo), &arena, &patch_id)) orelse return error.NotFound; 1132 try std.testing.expect(removed_fork.removed); 1133 } 1134 1135 fn draftForkCount(moment: evt.UserDB.HashMap(.read_only), repo_id: []const u8) !u64 { 1136 const index_cursor = try moment.getCursor(hash.hashInt(evt.user_repo_opts.hash, evt.Fork.repo_to_draft_id_set_key)) orelse return 0; 1137 const index = try evt.UserDB.HashMap(.read_only).init(index_cursor); 1138 const ids_cursor = try index.getCursor(hash.hashInt(evt.user_repo_opts.hash, repo_id)) orelse return 0; 1139 const ids = try evt.UserDB.SortedSet(.read_only).init(ids_cursor); 1140 return try ids.count(); 1141 } 1142 1143 fn activeForkCount(moment: evt.UserDB.HashMap(.read_only)) !u64 { 1144 const ids_cursor = try moment.getCursor(hash.hashInt(evt.user_repo_opts.hash, evt.Fork.active_id_set_key)) orelse return 0; 1145 const ids = try evt.UserDB.SortedSet(.read_only).init(ids_cursor); 1146 return try ids.count(); 1147 } 1148 1149 fn patchStatusCount(moment: Repo.DB.HashMap(.read_only), status: evt.Patch.StatusKind) !u64 { 1150 const statuses_cursor = try moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.status_to_id_set_key)) orelse return 0; 1151 const statuses = try Repo.DB.SortedMap(.read_only).init(statuses_cursor); 1152 const ids_cursor = try statuses.getCursor(@tagName(status)) orelse return 0; 1153 const ids = try Repo.DB.SortedSet(.read_only).init(ids_cursor); 1154 return try ids.count(); 1155 } 1156 1157 fn patchLabelStatusCount(moment: Repo.DB.HashMap(.read_only), label: []const u8, status: evt.Patch.StatusKind) !u64 { 1158 const labels_cursor = try moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.label_status_to_id_set_key)) orelse return 0; 1159 const labels = try Repo.DB.SortedMap(.read_only).init(labels_cursor); 1160 var key_buffer: evt.Patch.LabelStatusKey = undefined; 1161 const ids_cursor = try labels.getCursor(try evt.Patch.labelStatusKey(&key_buffer, label, status)) orelse return 0; 1162 const ids = try Repo.DB.SortedSet(.read_only).init(ids_cursor); 1163 return try ids.count(); 1164 } 1165 1166 fn readMergeability(repo: *Repo, io: std.Io, allocator: std.mem.Allocator, id: *const [evt.event_id_size]u8, patch: evt.Patch) !pch.Mergeability { 1167 var arena = std.heap.ArenaAllocator.init(allocator); 1168 defer arena.deinit(); 1169 var moment = try repo.core.latestMoment(); 1170 return pch.readMergeability(repo_opts, .{ .core = &repo.core, .extra = .{ .moment = &moment } }, io, &arena, id, patch); 1171 } 1172 1173 fn expectMergeabilityShortBytes(moment: Repo.DB.HashMap(.read_only), id: *const [evt.event_id_size]u8) !void { 1174 try std.testing.expectEqual(null, try moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.patch_id_to_mergeability_key))); 1175 const haxy_moment = try evt.currentMomentFromRepoMoment(repo_opts.hash, moment); 1176 const checks = try Repo.DB.HashMap(.read_only).init((try haxy_moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.patch_id_to_mergeability_key))) orelse return error.NotFound); 1177 const entry = try Repo.DB.HashMap(.read_only).init((try checks.getCursor(hash.hashInt(repo_opts.hash, id))) orelse return error.NotFound); 1178 const result = try Repo.DB.HashMap(.read_only).init((try entry.getCursor(hash.hashInt(repo_opts.hash, "result"))) orelse return error.NotFound); 1179 for ([_][]const u8{ "source", "squash" }) |field| { 1180 const cursor = (try result.getCursor(hash.hashInt(repo_opts.hash, field))) orelse return error.NotFound; 1181 try std.testing.expectEqual(.short_bytes, cursor.slot().tag); 1182 } 1183 } 1184 1185 fn testMergeability( 1186 target: *Repo, 1187 io: std.Io, 1188 allocator: std.mem.Allocator, 1189 users_dir: []const u8, 1190 forker_id: *const [evt.event_id_size]u8, 1191 id: *const [evt.event_id_size]u8, 1192 base: *const [hash.hexLen(repo_opts.hash)]u8, 1193 source: *const [hash.hexLen(repo_opts.hash)]u8, 1194 ) !void { 1195 var arena = std.heap.ArenaAllocator.init(allocator); 1196 defer arena.deinit(); 1197 const events = try evt.currentMoment(repo_opts, target); 1198 const record = (try evt.Patch.readById(Repo.DB, repo_opts.hash, events, &arena, id)) orelse return error.NotFound; 1199 const patch = record.event; 1200 1201 // publication checks both methods, and reads and cache hits do no work 1202 const clean = pch.Mergeability{ .source = .clean, .squash = .clean }; 1203 try std.testing.expectEqualDeep(clean, try readMergeability(target, io, allocator, id, patch)); 1204 try expectMergeabilityShortBytes(try target.core.latestMoment(), id); 1205 const before = (try target.core.latestMoment()).cursor.slot(); 1206 pch.refreshMergeability(repo_opts, io, allocator, target, users_dir, id.*); 1207 try std.testing.expectEqualDeep(before, (try target.core.latestMoment()).cursor.slot()); 1208 { 1209 var moment = try target.core.latestMoment(); 1210 const state = Repo.State(.read_only){ .core = &target.core, .extra = .{ .moment = &moment } }; 1211 try std.testing.expectError(error.ObjectNotFound, obj.Object(.xit, repo_opts).initCommit(state, io, allocator, source)); 1212 } 1213 1214 // a target update invalidates the old result before refresh 1215 { 1216 const file = try target.core.work_dir.createFile(io, "feature.zig", .{ .truncate = true }); 1217 defer file.close(io); 1218 try file.writeStreamingAll(io, "pub const answer = 99;\n"); 1219 } 1220 try target.add(io, allocator, &.{"feature.zig"}); 1221 const conflicting_target = try target.commit(io, allocator, .{ .message = "different answer", .timestamp = 20 }); 1222 const input = pch.MergeInput{ .id = std.fmt.bytesToHex(id.*, .lower), .revision = .source, .author = author, .timestamp = 21 }; 1223 var squash_input = input; 1224 squash_input.revision = .squash; 1225 try std.testing.expectEqualDeep(pch.Mergeability{}, try readMergeability(target, io, allocator, id, patch)); 1226 try std.testing.expectError(error.MergeCheckUnavailable, pch.merge(repo_opts, io, allocator, .{ .users_dir = users_dir }, target, input)); 1227 try std.testing.expectError(error.MergeCheckUnavailable, pch.merge(repo_opts, io, allocator, .{ .users_dir = users_dir }, target, squash_input)); 1228 1229 // local edits and server comments leave checks alone 1230 var edit = evt.Patch.Update{ .fields = .{ 1231 .title = "edit the answer", 1232 .labels = patch.labels, 1233 .description = patch.description, 1234 .target_branch = patch.target_branch, 1235 } }; 1236 try evt.Patch.update(.local, .xit, repo_opts, io, allocator, target, id, edit, author); 1237 try std.testing.expectEqualDeep(pch.Mergeability{}, try readMergeability(target, io, allocator, id, patch)); 1238 _ = try evt.Comment.create(.{ .server = .{ .users_dir = users_dir } }, .xit, repo_opts, io, allocator, target, .patch, &input.id, &input.id, "reviewing the answer", author); 1239 try std.testing.expectEqualDeep(pch.Mergeability{}, try readMergeability(target, io, allocator, id, patch)); 1240 1241 // a server patch edit refreshes its mergeability 1242 edit.fields.title = patch.title; 1243 const before_edit = try target.core.db.rootCursor().count(); 1244 try evt.Patch.update(.{ .server = .{ .users_dir = users_dir } }, .xit, repo_opts, io, allocator, target, id, edit, author); 1245 try std.testing.expectEqual(before_edit + 1, try target.core.db.rootCursor().count()); 1246 const events_before = try target.readRef(io, evt.events_ref); 1247 try std.testing.expectEqualDeep(pch.Mergeability{ .source = .conflict, .squash = .conflict }, try readMergeability(target, io, allocator, id, patch)); 1248 try expectMergeabilityShortBytes(try target.core.latestMoment(), id); 1249 try std.testing.expectError(error.MergeConflict, pch.merge(repo_opts, io, allocator, .{ .users_dir = users_dir }, target, input)); 1250 try std.testing.expectError(error.MergeConflict, pch.merge(repo_opts, io, allocator, .{ .users_dir = users_dir }, target, squash_input)); 1251 try std.testing.expectEqual(events_before, try target.readRef(io, evt.events_ref)); 1252 try std.testing.expectEqual(conflicting_target, (try target.readRef(io, .{ .kind = .head, .name = "master" })).?); 1253 try std.testing.expectEqual(null, try target.readRef(io, .{ .kind = .none, .name = "MERGE_HEAD" })); 1254 1255 // deleting and restoring the target cannot reuse the conflict result 1256 { 1257 var detached = try target.switchDir(io, allocator, .{ .target = .{ .oid = base } }); 1258 defer detached.deinit(); 1259 } 1260 try target.removeBranch(io, .{ .name = "master" }); 1261 pch.refreshOpenMergeability(repo_opts, io, allocator, target, users_dir, null, null); 1262 try std.testing.expectEqualDeep(pch.Mergeability{}, try readMergeability(target, io, allocator, id, patch)); 1263 try expectMergeabilityShortBytes(try target.core.latestMoment(), id); 1264 try target.addBranch(io, .{ .name = "master" }); 1265 { 1266 var restored = try target.switchDir(io, allocator, .{ .target = .{ .ref = .{ .kind = .head, .name = "master" } } }); 1267 defer restored.deinit(); 1268 } 1269 pch.refreshOpenMergeability(repo_opts, io, allocator, target, users_dir, null, null); 1270 try std.testing.expectEqualDeep(clean, try readMergeability(target, io, allocator, id, patch)); 1271 1272 // a missing fork disables merging without changing the accepted events 1273 const draft_path = try fork.forkPath(allocator, users_dir, forker_id, id); 1274 defer allocator.free(draft_path); 1275 const away_path = try allocator.print("{s}.away", .{draft_path}); 1276 defer allocator.free(away_path); 1277 { 1278 try std.Io.Dir.renameAbsolute(draft_path, away_path, io); 1279 defer std.Io.Dir.renameAbsolute(away_path, draft_path, io) catch {}; 1280 { 1281 const log_level = std.testing.log_level; 1282 std.testing.log_level = .err; 1283 defer std.testing.log_level = log_level; 1284 try std.testing.expectError(error.PatchDataUnavailable, pch.merge(repo_opts, io, allocator, .{ .users_dir = users_dir }, target, input)); 1285 } 1286 try std.testing.expectEqualDeep(pch.Mergeability{}, try readMergeability(target, io, allocator, id, patch)); 1287 try std.testing.expectEqual(events_before, try target.readRef(io, evt.events_ref)); 1288 } 1289 pch.refreshMergeability(repo_opts, io, allocator, target, users_dir, id.*); 1290 try std.testing.expectEqualDeep(clean, try readMergeability(target, io, allocator, id, patch)); 1291 1292 // a changed revision is unknown even if its target has not moved 1293 var changed = patch; 1294 changed.revision.?.id[0] = if (changed.revision.?.id[0] == 'a') 'b' else 'a'; 1295 try std.testing.expectEqualDeep(pch.Mergeability{}, try readMergeability(target, io, allocator, id, changed)); 1296 } 1297