╭─────────────╮ │scroll to top│ ╰─────────────╯ ╭ try.zig ──────────────────────────────────────────────────────╮ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ╰───────────────────────────────────────────────────────────────╯
🬐 🬠 🬞🬂🬏 🬟 🬑 🬟 🬑 ╭21441416..╮ 21441416.. see-em: 🬋🬋🬋 🬋🬋🬋 🬋 🬋 │files │ commits refs discuss issues new login 🬐 🬠 🬐 🬠 🬑 🬟 🬰 ╰──────────╯ (519) user
╭────╮ ╭ clone ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ╮ │http│ ssh │ │ ╰────╯ ╰ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ╯
.. embed/ event/ test/ ui/ command.zig diff3.zig event.zig find.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
780 var discussion_events: [discussion_data.len]evt.EventWithId = undefined; 781 for (discussion_data, 0..) |discussion, i| { 782 discussion_events[i] = .{ 783 .id = std.fmt.bytesToHex(evt.EventWithId.randomId(prng.random()), .lower), 784 .timestamp = @intCast(300 + i), 785 .author = .{ .name = user_data[i % user_data.len].name, .email = user_data[i % user_data.len].email }, 786 .event = .{ .discuss = .{ 787 .title = discussion.title, 788 .description = discussion.description, 789 .tags = discussion.tags, 790 } }, 791 }; 792 } 793 try evt.consume(.local, .repo, .xit, .{}, io, allocator, &template_repo, evt.events_ref, &discussion_events); 794 795 var discussion_comment_ids: [discussion_data.len][3][evt.event_id_size]u8 = undefined; 796 for (&discussion_comment_ids) |*ids| { 797 for (ids) |*id| id.* = evt.EventWithId.randomId(prng.random()); 798 } 799 var discussion_comment_events: [discussion_data.len * 3]evt.EventWithId = undefined; 800 for (&discussion_comment_events, 0..) |*event, i| { 801 const discussion_index = i / 3; 802 const comment_index = i % 3; 803 event.* = .{ 804 .id = std.fmt.bytesToHex(discussion_comment_ids[discussion_index][comment_index], .lower), 805 .timestamp = @intCast(400 + i), 806 .author = .{ .name = user_data[(i + 1) % user_data.len].name, .email = user_data[(i + 1) % user_data.len].email }, 807 .event = .{ .comment = .{ 808 .thread_id = discussion_events[discussion_index].id, 809 .parent_id = if (comment_index < 2) 810 discussion_events[discussion_index].id 811 else 812 std.fmt.bytesToHex(discussion_comment_ids[discussion_index][0], .lower), 813 .body = switch (comment_index) { 814 0 => "My preference is to start with the smallest useful version and expand it after we have real usage to learn from.", 815 1 => "It would help to write down the tradeoffs we are accepting so the decision is easy to revisit later.", 816 2 => "Agreed. A narrow first version should also make it easier to keep the implementation understandable.", 817 else => unreachable, 818 }, 819 } }, 820 }; 821 } 822 try evt.consume(.local, .repo, .xit, .{}, io, allocator, &template_repo, evt.events_ref, &discussion_comment_events); 823 try template_repo.patchAll(io, allocator, null); 824 try template_repo.addConfig(io, allocator, .{ .name = "core.bare", .value = "true" }); 825 // fixtures commit directly, so index the branch tips by hand 826 try find.refresh(.{}, io, allocator, &template_repo); 827 } 828 829 // copy the template to each repo's on-disk location, named by its 830 // hex-encoded event id. the template repo is deinitialized above, so its 831 // db file is fully written before we copy it. 832 { 833 var template_dir = try cwd.openDir(io, template_path, .{}); 834 defer template_dir.close(io); 835 var template_repo_dir = try template_dir.openDir(io, ".xit", .{ .iterate = true }); 836 defer template_repo_dir.close(io); 837 838 for (repo_event_ids, 0..) |id_bytes, repo_index| { 839 const repo_id = std.fmt.bytesToHex(id_bytes, .lower); 840 const repo_path = try std.fs.path.join(arena.allocator(), &.{ server_path, "repos", &repo_id }); 841 { 842 var dest_dir = try cwd.createDirPathOpen(io, repo_path, .{}); 843 defer dest_dir.close(io); 844 var dest_repo_dir = try dest_dir.createDirPathOpen(io, ".xit", .{}); 845 defer dest_repo_dir.close(io); 846 try copyDir(io, template_repo_dir, dest_repo_dir); 847 } 848 849 if (repo_index + 1 == repo_data.len) { 850 var target_repo = try rp.Repo(.xit, .{}).open(io, allocator, .{ .path = repo_path, .require_repo_root = true }); 851 defer target_repo.deinit(io, allocator); 852 try seedPatches(io, allocator, server_path, &repo, &target_repo, &repo_event_ids[repo_index], &admin_user_id, prng.random()); 853 } 854 } 855 } 856 857 break :blk try ui.Session.init(&session_arena, &repo, .{ .user_id = &admin_user_id }); 858 }; 859 session.is_terminal = true; 860 session.data.git_ssh_prefix = git_ssh_prefix; 861 862 // start the server 863 864 // let the native TUI's page builders open the on-disk repos for the file tree 865 session.io = io; 866 session.repos_dir = try std.fs.path.join(session_arena.allocator(), &.{ server_path, "repos" }); 867 868 // leave a one-shot session for the first browser to hit the web ui, so it 869 // starts logged in as admin 870 { 871 var data_dir = try cwd.createDirPathOpen(io, server_path, .{}); 872 defer data_dir.close(io); 873 const store = try hx.web.SessionStore.init(io, data_dir); 874 defer store.deinit(); 875 const token = try store.create(&admin_user_id); 876 try store.offerAutoLogin(&token); 877 } 878 879 if (cli) { 880 var stdout_writer = std.Io.File.stdout().writer(io, &.{}); 881 var stderr_writer = std.Io.File.stderr().writer(io, &.{}); 882 const run_opts = hx.main.RunOpts{ .out = &stdout_writer.interface, .err = &stderr_writer.interface }; 883 884 const Runnable = struct { 885 io: std.Io, 886 key_path: []const u8, 887 888 pub fn run(self: @This(), web_port: u16, http_port: ?u16, ssh_port_maybe: ?u16) !void { 889 _ = web_port; 890 _ = http_port; 891 const ssh_port = ssh_port_maybe orelse return error.SshDisabled; 892 std.debug.print( 893 \\ 894 \\connect to the TUI with: 895 \\ ssh -p {d} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null localhost 896 \\ 897 \\create a git repo and push over SSH: 898 \\ mkdir -p temp-try/client/test 899 \\ cd temp-try/client/test 900 \\ git init 901 \\ echo "hello" > hello.txt 902 \\ git add hello.txt 903 \\ git commit -m "let there be light" 904 \\ GIT_SSH_COMMAND='ssh -p {d} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -i {s}' git push localhost:admin/test HEAD:master 905 \\ 906 \\to quit, press enter. 907 \\ 908 , .{ ssh_port, ssh_port, self.key_path }); 909 // portable stdin read via std.Io — equivalent to the 910 // std.posix.read(STDIN_FILENO, ...) that doesn't compile 911 // on windows. 912 var buf: [1]u8 = undefined; 913 var stdin_reader = std.Io.File.stdin().reader(self.io, &buf); 914 _ = stdin_reader.interface.takeByte() catch {}; 915 } 916 }; 917 918 try srv.run(.xit, .{}, io, allocator, cwd_path, serve_options, run_opts.err, Runnable{ .io = io, .key_path = key_path }); 919 } else { 920 var null_writer = std.Io.Writer.Discarding.init(&.{}); 921 const run_opts = hx.main.RunOpts{ .out = &null_writer.writer, .err = &null_writer.writer }; 922 923 const Runnable = struct { 924 io: std.Io, 925 allocator: std.mem.Allocator, 926 session: *ui.Session, 927 repo: *Repo, 928 929 pub fn run(self: @This(), web_port: u16, http_port: ?u16, ssh_port: ?u16) !void { 930 // launch the TUI; the footer points at whatever port was bound 931 self.session.web_port = web_port; 932 self.session.data.git_http_port = http_port; 933 self.session.data.git_ssh_port = ssh_port; 934 try hx.ui.run(self.io, self.allocator, self.session, self.repo); 935 } 936 }; 937 938 try srv.run(.xit, .{}, io, allocator, cwd_path, serve_options, run_opts.err, Runnable{ .io = io, .allocator = allocator, .session = &session, .repo = &repo }); 939 } 940 } 941 942 // words cycled through to pad generated lines into prose-like content 943 const scatter_words = [_][]const u8{ 944 "lorem", "ipsum", "dolor", "sit", "amet", "consectetur", 945 "quantum", "vector", "matrix", "buffer", "kernel", "socket", 946 "falcon", "otter", "badger", "walrus", "ferret", "marmot", 947 "scatter", "gather", "encode", "decode", "render", "commit", 948 }; 949 950 fn longDescription(allocator: std.mem.Allocator, initial: []const u8) ![]u8 { 951 var writer = std.Io.Writer.Allocating.init(allocator); 952 defer writer.deinit(); 953 try writer.writer.print("{s}", .{initial}); 954 for (0..ui.detail_preview_lines) |line| 955 try writer.writer.print("\n{d} {s}", .{ line, scatter_words[line % scatter_words.len] }); 956 return writer.toOwnedSlice(); 957 } 958 959 // write `path` as 40 lines of mostly-stable filler. revision `c` and file 960 // index `fi` shift which lines change and the words used, so each (c, fi) 961 // yields a distinct multi-hunk diff against the previous revision. untouched 962 // lines stay byte-identical across revisions, so a bump in `c` is a scatter of 963 // small hunks rather than a full rewrite. 964 fn writeScatterFile(io: std.Io, allocator: std.mem.Allocator, repo_dir: std.Io.Dir, path: []const u8, fi: usize, c: usize) !void { 965 const content = try scatterContent(allocator, fi, c, null); 966 defer allocator.free(content); 967 const file = try repo_dir.createFile(io, path, .{}); 968 defer file.close(io); 969 try file.writeStreamingAll(io, content); 970 } 971 972 const ScatterEdit = struct { line: usize, text: []const u8 }; 973 974 fn scatterContent(allocator: std.mem.Allocator, fi: usize, c: usize, replacement: ?ScatterEdit) ![]u8 { 975 var writer = std.Io.Writer.Allocating.init(allocator); 976 defer writer.deinit(); 977 for (0..40) |line| { 978 if (replacement) |edit| if (line == edit.line) { 979 try writer.writer.print("{s}\n", .{edit.text}); 980 continue; 981 }; 982 const start = writer.written().len; 983 if ((line + fi + c) % 8 == 0) { 984 const tag = scatter_words[(line + fi + c * 3) % scatter_words.len]; 985 try writer.writer.print("rev {d} {s}", .{ c, tag }); 986 } 987 const target = 40 + (line * 17 + fi * 23) % 70; 988 var w = line + fi; 989 while (true) : (w += 1) { 990 const word = scatter_words[w % scatter_words.len]; 991 const len = writer.written().len - start; 992 if (len >= target or len + 1 + word.len > 120) break; 993 if (len == 0) 994 try writer.writer.print("{s}", .{word}) 995 else 996 try writer.writer.print(" {s}", .{word}); 997 } 998 try writer.writer.writeByte('\n'); 999 } 1000 return writer.toOwnedSlice(); 1001 } 1002 1003 // tag the current HEAD as the next sequential version: v1, v2, and so on 1004 fn addNextTag(repo: *rp.Repo(.xit, .{}), io: std.Io, allocator: std.mem.Allocator, n: *usize) !void { 1005 var buf: [16]u8 = undefined; 1006 const name = try std.fmt.bufPrint(&buf, "v{d}", .{n.*}); 1007 _ = try repo.addTag(io, allocator, .{ .name = name }); 1008 n.* += 1; 1009 } 1010 1011 fn commitTree( 1012 io: std.Io, 1013 allocator: std.mem.Allocator, 1014 repo: *rp.Repo(.xit, .{}), 1015 oid: *const [hash.hexLen(.sha1)]u8, 1016 ) ![hash.hexLen(.sha1)]u8 { 1017 var moment = try repo.core.latestMoment(); 1018 const state = rp.Repo(.xit, .{}).State(.read_only){ .core = &repo.core, .extra = .{ .moment = &moment } }; 1019 var object = try obj.Object(.xit, .{}).init(state, io, allocator, oid); 1020 defer object.deinit(); 1021 return switch (object.content) { 1022 .commit => |commit| commit.tree, 1023 else => error.InvalidObject, 1024 }; 1025 } 1026 1027 fn seedPatchRevision( 1028 io: std.Io, 1029 allocator: std.mem.Allocator, 1030 repos_path: []const u8, 1031 patch_id: *const [evt.event_id_size]u8, 1032 title: []const u8, 1033 author: evt.CommitAuthor, 1034 timestamp: u64, 1035 random: std.Random, 1036 base_oid: [hash.hexLen(.sha1)]u8, 1037 path: []const u8, 1038 contents: []const []const u8, 1039 ) !void { 1040 const patch_hex = std.fmt.bytesToHex(patch_id.*, .lower); 1041 const fork_path = try fork.forkPath(allocator, repos_path, &patch_hex); 1042 defer allocator.free(fork_path); 1043 var fork_repo = try rp.Repo(.xit, .{}).open(io, allocator, .{ .path = fork_path, .require_repo_root = true }); 1044 defer fork_repo.deinit(io, allocator); 1045 1046 try fork_repo.addConfig(io, allocator, .{ .name = "core.bare", .value = "false" }); 1047 { 1048 var reset = try fork_repo.reset(io, allocator, .{ .target = .{ .oid = &base_oid } }); 1049 defer reset.deinit(); 1050 } 1051 const base_tree_oid = try commitTree(io, allocator, &fork_repo, &base_oid); 1052 var source_oid = base_oid; 1053 var fork_dir = try std.Io.Dir.cwd().openDir(io, fork_path, .{}); 1054 defer fork_dir.close(io); 1055 var writer = std.Io.Writer.Allocating.init(allocator); 1056 defer writer.deinit(); 1057 if (std.fs.path.dirname(path)) |dir| try fork_dir.createDirPath(io, dir); 1058 for (contents, 0..) |content, i| { 1059 { 1060 const file = try fork_dir.createFile(io, path, .{}); 1061 defer file.close(io); 1062 try file.writeStreamingAll(io, content); 1063 } 1064 try fork_repo.add(io, allocator, &.{path}); 1065 writer.clearRetainingCapacity(); 1066 try writer.writer.print("{s} ({d}/{d})", .{ title, i + 1, contents.len }); 1067 source_oid = try fork_repo.commit(io, allocator, .{ .message = writer.written(), .timestamp = timestamp + i }); 1068 } 1069 try fork_repo.patchAll(io, allocator, null); 1070 try fork_repo.addConfig(io, allocator, .{ .name = "core.bare", .value = "true" }); 1071 // the commits above skipped the push path, so index the patch branch by hand 1072 try find.refresh(.{}, io, allocator, &fork_repo); 1073 try fork_dir.deleteFile(io, path); 1074 const revision_id = evt.EventWithId.randomId(random); 1075 const head_tree_oid = try commitTree(io, allocator, &fork_repo, &source_oid); 1076 const revision: evt.PatchRev = .{ 1077 .base_oid = &base_oid, 1078 .source_oid = &source_oid, 1079 .message = title, 1080 }; 1081 const revision_timestamp = timestamp + 3; 1082 const tree_entries = [_]evt.EventTreeEntry{ 1083 .{ .tree = .{ .name = "base", .oid = &base_tree_oid } }, 1084 .{ .tree = .{ .name = "head", .oid = &head_tree_oid } }, 1085 }; 1086 try evt.consume(.server, .fork, .xit, .{}, io, allocator, &fork_repo, evt.events_ref, &.{.{ 1087 .id = std.fmt.bytesToHex(revision_id, .lower), 1088 .timestamp = revision_timestamp, 1089 .author = author, 1090 .tree_entries = &tree_entries, 1091 .event = .{ .patchrev = revision }, 1092 }}); 1093 1094 var arena = std.heap.ArenaAllocator.init(allocator); 1095 defer arena.deinit(); 1096 const moment = try evt.currentMoment(.{}, &fork_repo); 1097 const revision_record = (try evt.PatchRev.readById(evt.EventDB(.sha1), .sha1, moment, &arena, &revision_id)) orelse return error.NotFound; 1098 const patch_record = (try evt.Patch.readById(evt.EventDB(.sha1), .sha1, moment, &arena, patch_id)) orelse return error.NotFound; 1099 var patch = patch_record.event; 1100 patch.revision = evt.Patch.Revision.fromRecord(revision_id, revision_record); 1101 try evt.consume(.server, .fork, .xit, .{}, io, allocator, &fork_repo, evt.events_ref, &.{.{ 1102 .id = patch_hex, 1103 .timestamp = revision_timestamp + 1, 1104 .author = author, 1105 .event = .{ .patch = patch }, 1106 }}); 1107 } 1108 1109 fn seedPatches( 1110 io: std.Io, 1111 allocator: std.mem.Allocator, 1112 server_path: []const u8, 1113 admin_repo: *rp.Repo(.xit, evt.admin_repo_opts), 1114 target_repo: *rp.Repo(.xit, .{}), 1115 repo_id: *const [evt.event_id_size]u8, 1116 user_id: *const [evt.event_id_size]u8, 1117 random: std.Random, 1118 ) !void { 1119 const patch_data = [_]struct { 1120 title: []const u8, 1121 description: []const u8, 1122 tags: []const u8, 1123 status: ?evt.Patch.StatusKind, 1124 alpha_edit: ?ScatterEdit = null, 1125 }{ 1126 .{ 1127 .title = "Draft a faster dependency scanner", 1128 .description = "Rework dependency discovery so a large workspace can be scanned without repeatedly opening the same manifests.", 1129 .tags = "performance build", 1130 .status = null, 1131 }, 1132 .{ 1133 .title = "Remove the legacy configuration loader", 1134 .description = "Delete the compatibility loader now that the replacement format has shipped and the migration warning has been available for a full release.", 1135 .tags = "cleanup config", 1136 .status = .merged, 1137 }, 1138 .{ 1139 .title = "Cache parsed manifests between commands", 1140 .description = "Keep parsed manifests in the command context so consecutive operations do not repeat identical filesystem and parsing work.", 1141 .tags = "performance cache", 1142 .status = .closed, 1143 }, 1144 .{ 1145 .title = "Add structured output to the inspect command", 1146 .description = "Add a stable JSON representation of inspect results for scripts and editor integrations.", 1147 .tags = "enhancement cli", 1148 .status = .open, 1149 }, 1150 .{ 1151 .title = "Edit an adjacent line in alpha.txt", 1152 .description = "This patch can be cleanly merged by haxy, while git throws a merge conflict!", 1153 .tags = "merge", 1154 .status = .open, 1155 .alpha_edit = .{ .line = 2, .text = "adjust alpha beside the latest scatter edit" }, 1156 }, 1157 .{ 1158 .title = "Edit a conflicting line in alpha.txt", 1159 .description = "Both source and squash merges conflict with a different edit to the same line on master.", 1160 .tags = "merge", 1161 .status = .open, 1162 .alpha_edit = .{ .line = 3, .text = "replace alpha with a conflicting edit" }, 1163 }, 1164 }; 1165 1166 const repos_path = try std.fs.path.join(allocator, &.{ server_path, "repos" }); 1167 defer allocator.free(repos_path); 1168 const patch_author = evt.CommitAuthor{ .name = "admin", .email = "admin@example.test" }; 1169 var patch_ids: [patch_data.len][evt.event_id_size]u8 = undefined; 1170 for (patch_data, 0..) |patch, i| { 1171 const timestamp: u64 = @intCast(500 + i * 10); 1172 patch_ids[i] = evt.EventWithId.randomId(random); 1173 const patch_hex = std.fmt.bytesToHex(patch_ids[i], .lower); 1174 const path = try fork.create(.{}, io, allocator, repos_path, admin_repo, .{ 1175 .id = patch_hex, 1176 .user_id = user_id.*, 1177 .repo_id = repo_id.*, 1178 .title = patch.title, 1179 .description = patch.description, 1180 .tags = patch.tags, 1181 .target_branch = "master", 1182 .author = patch_author, 1183 .timestamp = timestamp, 1184 }); 1185 allocator.free(path); 1186 1187 // prepare the patch's base and file contents, then seed its commits and revision 1188 { 1189 var arena = std.heap.ArenaAllocator.init(allocator); 1190 defer arena.deinit(); 1191 const aa = arena.allocator(); 1192 var base_oid = (try target_repo.readRef(io, .{ .kind = .head, .name = "master" })) orelse return error.NotFound; 1193 var contents: [3][]const u8 = undefined; 1194 const file_path: []const u8, const count: usize = if (patch.alpha_edit) |edit| blk: { 1195 // v30 precedes the last scatter commit, even after the sample merge 1196 const tag_oid = (try target_repo.readRef(io, .{ .kind = .tag, .name = "v30" })) orelse return error.NotFound; 1197 var moment = try target_repo.core.latestMoment(); 1198 const state = rp.Repo(.xit, .{}).State(.read_only){ .core = &target_repo.core, .extra = .{ .moment = &moment } }; 1199 var tag = try obj.Object(.xit, .{}).init(state, io, allocator, &tag_oid); 1200 defer tag.deinit(); 1201 base_oid = switch (tag.content) { 1202 .tag => |value| value.target, 1203 else => return error.InvalidObject, 1204 }; 1205 // rev 29 first changes line 4; edit that line or the one above it 1206 contents[0] = try scatterContent(aa, 0, 28, edit); 1207 break :blk .{ "src/alpha.txt", 1 }; 1208 } else blk: { 1209 var writer = std.Io.Writer.Allocating.init(allocator); 1210 defer writer.deinit(); 1211 for (&contents, 0..) |*content, part| { 1212 try writer.writer.print("{s}: part {d}\n", .{ patch.title, part + 1 }); 1213 content.* = try aa.dupe(u8, writer.written()); 1214 } 1215 break :blk .{ "patch.txt", contents.len }; 1216 }; 1217 try seedPatchRevision(io, allocator, repos_path, &patch_ids[i], patch.title, patch_author, timestamp + 1, random, base_oid, file_path, contents[0..count]); 1218 } 1219 const status = patch.status orelse continue; 1220 const fork_path = try fork.forkPath(allocator, repos_path, &patch_hex); 1221 defer allocator.free(fork_path); 1222 try pch.publish(.{}, io, allocator, admin_repo, target_repo, fork_path, .{ 1223 .id = patch_hex, 1224 .user_id = user_id.*, 1225 .repo_id = repo_id.*, 1226 .author = patch_author, 1227 .timestamp = timestamp + 6, 1228 }); 1229 1230 if (status == .merged) { 1231 try pch.mergeAndRemoveFork(.{}, io, allocator, repos_path, admin_repo, target_repo, .{ 1232 .id = patch_hex, 1233 .revision = .source, 1234 .author = patch_author, 1235 .timestamp = timestamp + 7, 1236 }); 1237 } else if (status != .open) { 1238 try evt.Patch.update(.server, .xit, .{}, io, allocator, target_repo, &patch_ids[i], .{ .status = status }, patch_author); 1239 } 1240 } 1241 1242 // seed a small comment tree on the newest patch 1243 var comment_ids: [5][evt.event_id_size]u8 = undefined; 1244 for (&comment_ids) |*id| id.* = evt.EventWithId.randomId(random); 1245 const comment_bodies = [_][]const u8{ 1246 "This also needs to preserve the executable bit for files nested inside generated directories.", 1247 "I tested the archive path and the direct-copy path; both currently lose the mode.", 1248 "The archive writer is the right place to centralize it, since every exporter already goes through that layer.", 1249 "Please include a regression fixture with a mix of executable and ordinary files.", 1250 "I'll add that fixture and cover both supported archive formats.", 1251 }; 1252 var comments: [comment_ids.len]evt.EventWithId = undefined; 1253 for (&comments, 0..) |*comment, i| { 1254 comment.* = .{ 1255 .id = std.fmt.bytesToHex(comment_ids[i], .lower), 1256 .timestamp = @intCast(700 + i), 1257 .author = .{ .name = if (i % 2 == 0) "alice" else "bob", .email = if (i % 2 == 0) "alice@example.test" else "bob@example.test" }, 1258 .event = .{ .comment = .{ 1259 .thread_id = std.fmt.bytesToHex(patch_ids[patch_ids.len - 1], .lower), 1260 .parent_id = switch (i) { 1261 0, 1 => std.fmt.bytesToHex(patch_ids[patch_ids.len - 1], .lower), 1262 2, 4 => std.fmt.bytesToHex(comment_ids[0], .lower), 1263 3 => std.fmt.bytesToHex(comment_ids[2], .lower), 1264 else => unreachable, 1265 }, 1266 .body = comment_bodies[i], 1267 } }, 1268 }; 1269 } 1270 try evt.consume(.server, .repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &comments); 1271 1272 // create divergent metadata edits on the next three patches 1273 var patch_arena = std.heap.ArenaAllocator.init(allocator); 1274 defer patch_arena.deinit(); 1275 const moment = try evt.currentMoment(.{}, target_repo); 1276 var values: [3]evt.Patch = undefined; 1277 for (1..4) |i| { 1278 const record = (try evt.Patch.readById(evt.EventDB(.sha1), .sha1, moment, &patch_arena, &patch_ids[i])) orelse return error.NotFound; 1279 values[i - 1] = record.event; 1280 } 1281 var ours_values = values; 1282 ours_values[0].title = "Drop the legacy configuration loader"; 1283 ours_values[0].tags = "cleanup config breaking"; 1284 const closed_description = try longDescription( 1285 patch_arena.allocator(), 1286 "Cache parsed manifests for the lifetime of a command invocation and invalidate entries when their files change.", 1287 ); 1288 ours_values[1].description = closed_description; 1289 ours_values[2].description = "Add JSON output to inspect with versioned field names and deterministic object ordering."; 1290 var theirs_values = values; 1291 theirs_values[0].title = "Delete compatibility configuration support"; 1292 theirs_values[0].tags = "config maintenance"; 1293 theirs_values[1].description = "Keep a process-wide manifest cache shared by every command and refresh it after writes."; 1294 theirs_values[2].description = "Expose inspect results as newline-delimited JSON so callers can stream large repositories."; 1295 1296 const seed_tip = (try target_repo.readRef(io, evt.events_ref)) orelse return error.NotFound; 1297 const other_ref = xit.ref.Ref{ .kind = .head, .name = "haxy/patch-other" }; 1298 var ours = [_]evt.EventWithId{ 1299 .{ 1300 .id = std.fmt.bytesToHex(patch_ids[1], .lower), 1301 .timestamp = 800, 1302 .author = .{ .name = "alice", .email = "alice@example.test" }, 1303 .event = .{ .patch = ours_values[0] }, 1304 }, 1305 .{ 1306 .id = std.fmt.bytesToHex(patch_ids[2], .lower), 1307 .timestamp = 801, 1308 .author = .{ .name = "alice", .email = "alice@example.test" }, 1309 .event = .{ .patch = ours_values[1] }, 1310 }, 1311 .{ 1312 .id = std.fmt.bytesToHex(patch_ids[3], .lower), 1313 .timestamp = 802, 1314 .author = .{ .name = "alice", .email = "alice@example.test" }, 1315 .event = .{ .patch = ours_values[2] }, 1316 }, 1317 }; 1318 1319 var theirs = ours; 1320 theirs[0].timestamp = 810; 1321 theirs[0].author = .{ .name = "bob", .email = "bob@example.test" }; 1322 theirs[0].event.patch = theirs_values[0]; 1323 theirs[1].timestamp = 811; 1324 theirs[1].author = .{ .name = "bob", .email = "bob@example.test" }; 1325 theirs[1].event.patch = theirs_values[1]; 1326 theirs[2].timestamp = 812; 1327 theirs[2].author = .{ .name = "bob", .email = "bob@example.test" }; 1328 theirs[2].event.patch = theirs_values[2]; 1329 1330 try evt.consume(.server, .repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &ours); 1331 var json: std.Io.Writer.Allocating = .init(allocator); 1332 defer json.deinit(); 1333 for (theirs, 0..) |event, i| { 1334 json.clearRetainingCapacity(); 1335 try std.json.Stringify.value(event, .{}, &json.writer); 1336 const author = try std.fmt.allocPrint(allocator, "{s} <{s}>", .{ event.author.name, event.author.email }); 1337 defer allocator.free(author); 1338 _ = try target_repo.commitAtRef(io, allocator, .{ 1339 .author = author, 1340 .message = json.written(), 1341 .timestamp = event.timestamp, 1342 .parent_oids = if (i == 0) &.{seed_tip} else null, 1343 }, null, other_ref); 1344 } 1345 { 1346 var merge = try target_repo.mergeAtRef(io, allocator, .{ .kind = .full, .action = .{ .new = .{ .source = &.{.{ .ref = other_ref }} } } }, evt.events_ref, null); 1347 defer merge.deinit(); 1348 if (merge.result != .success) return error.MergeFailed; 1349 } 1350 try target_repo.removeBranch(io, .{ .name = other_ref.name }); 1351 try evt.consume(.server, .repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &.{}); 1352 try pch.writeBranchPatch(.server, .xit, .{}, io, allocator, target_repo, std.fmt.bytesToHex(evt.EventWithId.randomId(random), .lower), .{ 1353 .title = "Merge the existing feature branch", 1354 .description = "This patch tracks the feature branch in this repo without creating a fork.", 1355 .tags = "feature", 1356 .source_branch = "feature", 1357 .target_branch = "master", 1358 }, null, patch_author); 1359 } 1360 1361 // recursively copy the contents of src_dir into dest_dir 1362 fn copyDir(io: std.Io, src_dir: std.Io.Dir, dest_dir: std.Io.Dir) !void { 1363 var iter = src_dir.iterate(); 1364 while (try iter.next(io)) |entry| { 1365 switch (entry.kind) { 1366 .file => try src_dir.copyFile(entry.name, dest_dir, entry.name, io, .{}), 1367 .directory => { 1368 try dest_dir.createDirPath(io, entry.name); 1369 var dest_entry_dir = try dest_dir.openDir(io, entry.name, .{ .access_sub_paths = true, .iterate = true, .follow_symlinks = false }); 1370 defer dest_entry_dir.close(io); 1371 var src_entry_dir = try src_dir.openDir(io, entry.name, .{ .access_sub_paths = true, .iterate = true, .follow_symlinks = false }); 1372 defer src_entry_dir.close(io); 1373 try copyDir(io, src_entry_dir, dest_entry_dir); 1374 }, 1375 else => {}, 1376 } 1377 } 1378 } 1379