╭─────────────╮ │scroll to top│ ╰─────────────╯ ╭ try.zig ──────────────────────────────────────────────────────╮ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ╰───────────────────────────────────────────────────────────────╯
🬐 🬠 🬞🬂🬏 🬟 🬑 🬟 🬑 ╭01aaf7e7..╮ 01aaf7e7.. see-em: 🬋🬋🬋 🬋🬋🬋 🬋 🬋 │files │ commits refs discuss issues new login 🬐 🬠 🬐 🬠 🬑 🬟 🬰 ╰──────────╯ (556) 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 progress.zig push.zig search.zig search_commit.zig search_thread.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
970 971 fn scatterContent(allocator: std.mem.Allocator, fi: usize, c: usize, replacement: ?ScatterEdit) ![]u8 { 972 var writer = std.Io.Writer.Allocating.init(allocator); 973 defer writer.deinit(); 974 for (0..40) |line| { 975 if (replacement) |edit| if (line == edit.line) { 976 try writer.writer.print("{s}\n", .{edit.text}); 977 continue; 978 }; 979 const start = writer.written().len; 980 if ((line + fi + c) % 8 == 0) { 981 const tag = scatter_words[(line + fi + c * 3) % scatter_words.len]; 982 try writer.writer.print("rev {d} {s}", .{ c, tag }); 983 } 984 const target = 40 + (line * 17 + fi * 23) % 70; 985 var w = line + fi; 986 while (true) : (w += 1) { 987 const word = scatter_words[w % scatter_words.len]; 988 const len = writer.written().len - start; 989 if (len >= target or len + 1 + word.len > 120) break; 990 if (len == 0) 991 try writer.writer.print("{s}", .{word}) 992 else 993 try writer.writer.print(" {s}", .{word}); 994 } 995 try writer.writer.writeByte('\n'); 996 } 997 return writer.toOwnedSlice(); 998 } 999 1000 // tag the current HEAD as the next sequential version: v1, v2, and so on 1001 fn addNextTag(repo: *rp.Repo(.xit, .{}), io: std.Io, allocator: std.mem.Allocator, n: *usize) !void { 1002 var buf: [16]u8 = undefined; 1003 const name = try std.fmt.bufPrint(&buf, "v{d}", .{n.*}); 1004 _ = try repo.addTag(io, allocator, .{ .name = name }); 1005 n.* += 1; 1006 } 1007 1008 fn commitTree( 1009 io: std.Io, 1010 allocator: std.mem.Allocator, 1011 repo: *rp.Repo(.xit, .{}), 1012 oid: *const [hash.hexLen(.sha1)]u8, 1013 ) ![hash.hexLen(.sha1)]u8 { 1014 var moment = try repo.core.latestMoment(); 1015 const state = rp.Repo(.xit, .{}).State(.read_only){ .core = &repo.core, .extra = .{ .moment = &moment } }; 1016 var object = try obj.Object(.xit, .{}).init(state, io, allocator, oid); 1017 defer object.deinit(); 1018 return switch (object.content) { 1019 .commit => |commit| commit.tree, 1020 else => error.InvalidObject, 1021 }; 1022 } 1023 1024 fn seedPatchRevision( 1025 io: std.Io, 1026 allocator: std.mem.Allocator, 1027 repos_path: []const u8, 1028 patch_id: *const [evt.event_id_size]u8, 1029 title: []const u8, 1030 author: evt.CommitAuthor, 1031 timestamp: u64, 1032 random: std.Random, 1033 base_oid: [hash.hexLen(.sha1)]u8, 1034 path: []const u8, 1035 contents: []const []const u8, 1036 ) !void { 1037 const patch_hex = std.fmt.bytesToHex(patch_id.*, .lower); 1038 const fork_path = try fork.forkPath(allocator, repos_path, &patch_hex); 1039 defer allocator.free(fork_path); 1040 var fork_repo = try rp.Repo(.xit, .{}).open(io, allocator, .{ .path = fork_path, .require_repo_root = true }); 1041 defer fork_repo.deinit(io, allocator); 1042 1043 try fork_repo.addConfig(io, allocator, .{ .name = "core.bare", .value = "false" }); 1044 { 1045 var reset = try fork_repo.reset(io, allocator, .{ .target = .{ .oid = &base_oid } }); 1046 defer reset.deinit(); 1047 } 1048 const base_tree_oid = try commitTree(io, allocator, &fork_repo, &base_oid); 1049 var source_oid = base_oid; 1050 var fork_dir = try std.Io.Dir.cwd().openDir(io, fork_path, .{}); 1051 defer fork_dir.close(io); 1052 var writer = std.Io.Writer.Allocating.init(allocator); 1053 defer writer.deinit(); 1054 if (std.fs.path.dirname(path)) |dir| try fork_dir.createDirPath(io, dir); 1055 for (contents, 0..) |content, i| { 1056 { 1057 const file = try fork_dir.createFile(io, path, .{}); 1058 defer file.close(io); 1059 try file.writeStreamingAll(io, content); 1060 } 1061 try fork_repo.add(io, allocator, &.{path}); 1062 writer.clearRetainingCapacity(); 1063 try writer.writer.print("{s} ({d}/{d})", .{ title, i + 1, contents.len }); 1064 source_oid = try fork_repo.commit(io, allocator, .{ .message = writer.written(), .timestamp = timestamp + i }); 1065 } 1066 try fork_repo.patchAll(io, allocator, null); 1067 try fork_repo.addConfig(io, allocator, .{ .name = "core.bare", .value = "true" }); 1068 // the commits above skipped the push path, so index the patch branch by hand 1069 try find.refresh(.{}, io, allocator, &fork_repo); 1070 _ = try fork_repo.garbageCollect(io, allocator, .{}); 1071 try fork_dir.deleteFile(io, path); 1072 const revision_id = evt.EventWithId.randomId(random); 1073 const head_tree_oid = try commitTree(io, allocator, &fork_repo, &source_oid); 1074 const revision: evt.PatchRev = .{ 1075 .base_oid = &base_oid, 1076 .source_oid = &source_oid, 1077 .message = title, 1078 }; 1079 const revision_timestamp = timestamp + 3; 1080 const tree_entries = [_]evt.EventTreeEntry{ 1081 .{ .tree = .{ .name = "base", .oid = &base_tree_oid } }, 1082 .{ .tree = .{ .name = "head", .oid = &head_tree_oid } }, 1083 }; 1084 try evt.consume(.server, .fork, .xit, .{}, io, allocator, &fork_repo, evt.events_ref, &.{.{ 1085 .id = std.fmt.bytesToHex(revision_id, .lower), 1086 .timestamp = revision_timestamp, 1087 .author = author, 1088 .tree_entries = &tree_entries, 1089 .event = .{ .patchrev = revision }, 1090 }}); 1091 1092 var arena = std.heap.ArenaAllocator.init(allocator); 1093 defer arena.deinit(); 1094 const moment = try evt.currentMoment(.{}, &fork_repo); 1095 const revision_record = (try evt.PatchRev.readById(evt.EventDB(.sha1), .sha1, moment, &arena, &revision_id)) orelse return error.NotFound; 1096 const patch_record = (try evt.Patch.readById(evt.EventDB(.sha1), .sha1, moment, &arena, patch_id)) orelse return error.NotFound; 1097 var patch = patch_record.event; 1098 patch.revision = evt.Patch.Revision.fromRecord(revision_id, revision_record); 1099 try evt.consume(.server, .fork, .xit, .{}, io, allocator, &fork_repo, evt.events_ref, &.{.{ 1100 .id = patch_hex, 1101 .timestamp = revision_timestamp + 1, 1102 .author = author, 1103 .event = .{ .patch = patch }, 1104 }}); 1105 } 1106 1107 fn seedPatches( 1108 io: std.Io, 1109 allocator: std.mem.Allocator, 1110 server_path: []const u8, 1111 admin_repo: *rp.Repo(.xit, evt.admin_repo_opts), 1112 target_repo: *rp.Repo(.xit, .{}), 1113 repo_id: *const [evt.event_id_size]u8, 1114 user_id: *const [evt.event_id_size]u8, 1115 random: std.Random, 1116 ) !void { 1117 const patch_data = [_]struct { 1118 title: []const u8, 1119 description: []const u8, 1120 tags: []const u8, 1121 status: ?evt.Patch.StatusKind, 1122 alpha_edit: ?ScatterEdit = null, 1123 }{ 1124 .{ 1125 .title = "Draft a faster dependency scanner", 1126 .description = "Rework dependency discovery so a large workspace can be scanned without repeatedly opening the same manifests.", 1127 .tags = "performance build", 1128 .status = null, 1129 }, 1130 .{ 1131 .title = "Remove the legacy configuration loader", 1132 .description = "Delete the compatibility loader now that the replacement format has shipped and the migration warning has been available for a full release.", 1133 .tags = "cleanup config", 1134 .status = .merged, 1135 }, 1136 .{ 1137 .title = "Cache parsed manifests between commands", 1138 .description = "Keep parsed manifests in the command context so consecutive operations do not repeat identical filesystem and parsing work.", 1139 .tags = "performance cache", 1140 .status = .closed, 1141 }, 1142 .{ 1143 .title = "Add structured output to the inspect command", 1144 .description = "Add a stable JSON representation of inspect results for scripts and editor integrations.", 1145 .tags = "enhancement cli", 1146 .status = .open, 1147 }, 1148 .{ 1149 .title = "Edit an adjacent line in alpha.txt", 1150 .description = "This patch can be cleanly merged by haxy, while git throws a merge conflict!", 1151 .tags = "merge", 1152 .status = .open, 1153 .alpha_edit = .{ .line = 2, .text = "adjust alpha beside the latest scatter edit" }, 1154 }, 1155 .{ 1156 .title = "Edit a conflicting line in alpha.txt", 1157 .description = "Both source and squash merges conflict with a different edit to the same line on master.", 1158 .tags = "merge", 1159 .status = .open, 1160 .alpha_edit = .{ .line = 3, .text = "replace alpha with a conflicting edit" }, 1161 }, 1162 }; 1163 1164 const repos_path = try std.fs.path.join(allocator, &.{ server_path, "repos" }); 1165 defer allocator.free(repos_path); 1166 const patch_author = evt.CommitAuthor{ .name = "admin", .email = "admin@example.test" }; 1167 var patch_ids: [patch_data.len][evt.event_id_size]u8 = undefined; 1168 for (patch_data, 0..) |patch, i| { 1169 const timestamp: u64 = @intCast(500 + i * 10); 1170 patch_ids[i] = evt.EventWithId.randomId(random); 1171 const patch_hex = std.fmt.bytesToHex(patch_ids[i], .lower); 1172 const path = try fork.create(.{}, io, allocator, repos_path, admin_repo, .{ 1173 .id = patch_hex, 1174 .user_id = user_id.*, 1175 .repo_id = repo_id.*, 1176 .title = patch.title, 1177 .description = patch.description, 1178 .tags = patch.tags, 1179 .target_branch = "master", 1180 .author = patch_author, 1181 .timestamp = timestamp, 1182 }); 1183 allocator.free(path); 1184 1185 // prepare the patch's base and file contents, then seed its commits and revision 1186 { 1187 var arena = std.heap.ArenaAllocator.init(allocator); 1188 defer arena.deinit(); 1189 const aa = arena.allocator(); 1190 var base_oid = (try target_repo.readRef(io, .{ .kind = .head, .name = "master" })) orelse return error.NotFound; 1191 var contents: [3][]const u8 = undefined; 1192 const file_path: []const u8, const count: usize = if (patch.alpha_edit) |edit| blk: { 1193 // v30 precedes the last scatter commit, even after the sample merge 1194 const tag_oid = (try target_repo.readRef(io, .{ .kind = .tag, .name = "v30" })) orelse return error.NotFound; 1195 var moment = try target_repo.core.latestMoment(); 1196 const state = rp.Repo(.xit, .{}).State(.read_only){ .core = &target_repo.core, .extra = .{ .moment = &moment } }; 1197 var tag = try obj.Object(.xit, .{}).init(state, io, allocator, &tag_oid); 1198 defer tag.deinit(); 1199 base_oid = switch (tag.content) { 1200 .tag => |value| value.target, 1201 else => return error.InvalidObject, 1202 }; 1203 // rev 29 first changes line 4; edit that line or the one above it 1204 contents[0] = try scatterContent(aa, 0, 28, edit); 1205 break :blk .{ "src/alpha.txt", 1 }; 1206 } else blk: { 1207 var writer = std.Io.Writer.Allocating.init(allocator); 1208 defer writer.deinit(); 1209 for (&contents, 0..) |*content, part| { 1210 try writer.writer.print("{s}: part {d}\n", .{ patch.title, part + 1 }); 1211 content.* = try aa.dupe(u8, writer.written()); 1212 } 1213 break :blk .{ "patch.txt", contents.len }; 1214 }; 1215 try seedPatchRevision(io, allocator, repos_path, &patch_ids[i], patch.title, patch_author, timestamp + 1, random, base_oid, file_path, contents[0..count]); 1216 } 1217 const status = patch.status orelse continue; 1218 const fork_path = try fork.forkPath(allocator, repos_path, &patch_hex); 1219 defer allocator.free(fork_path); 1220 try pch.publish(.{}, io, allocator, admin_repo, target_repo, fork_path, .{ 1221 .id = patch_hex, 1222 .user_id = user_id.*, 1223 .repo_id = repo_id.*, 1224 .author = patch_author, 1225 .timestamp = timestamp + 6, 1226 }); 1227 1228 if (status == .merged) { 1229 try pch.mergeAndRemoveFork(.{}, io, allocator, repos_path, admin_repo, target_repo, .{ 1230 .id = patch_hex, 1231 .revision = .source, 1232 .author = patch_author, 1233 .timestamp = timestamp + 7, 1234 }); 1235 } else if (status != .open) { 1236 try evt.Patch.update(.server, .xit, .{}, io, allocator, target_repo, &patch_ids[i], .{ .status = status }, patch_author); 1237 } 1238 } 1239 1240 // seed a small comment tree on the newest patch 1241 var comment_ids: [5][evt.event_id_size]u8 = undefined; 1242 for (&comment_ids) |*id| id.* = evt.EventWithId.randomId(random); 1243 const comment_bodies = [_][]const u8{ 1244 "This also needs to preserve the executable bit for files nested inside generated directories.", 1245 "I tested the archive path and the direct-copy path; both currently lose the mode.", 1246 "The archive writer is the right place to centralize it, since every exporter already goes through that layer.", 1247 "Please include a regression fixture with a mix of executable and ordinary files.", 1248 "I'll add that fixture and cover both supported archive formats.", 1249 }; 1250 var comments: [comment_ids.len]evt.EventWithId = undefined; 1251 for (&comments, 0..) |*comment, i| { 1252 comment.* = .{ 1253 .id = std.fmt.bytesToHex(comment_ids[i], .lower), 1254 .timestamp = @intCast(700 + i), 1255 .author = .{ .name = if (i % 2 == 0) "alice" else "bob", .email = if (i % 2 == 0) "alice@example.test" else "bob@example.test" }, 1256 .event = .{ .comment = .{ 1257 .thread_id = std.fmt.bytesToHex(patch_ids[patch_ids.len - 1], .lower), 1258 .parent_id = switch (i) { 1259 0, 1 => std.fmt.bytesToHex(patch_ids[patch_ids.len - 1], .lower), 1260 2, 4 => std.fmt.bytesToHex(comment_ids[0], .lower), 1261 3 => std.fmt.bytesToHex(comment_ids[2], .lower), 1262 else => unreachable, 1263 }, 1264 .body = comment_bodies[i], 1265 } }, 1266 }; 1267 } 1268 try evt.consume(.server, .repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &comments); 1269 1270 // create divergent metadata edits on the next three patches 1271 var patch_arena = std.heap.ArenaAllocator.init(allocator); 1272 defer patch_arena.deinit(); 1273 const moment = try evt.currentMoment(.{}, target_repo); 1274 var values: [3]evt.Patch = undefined; 1275 for (1..4) |i| { 1276 const record = (try evt.Patch.readById(evt.EventDB(.sha1), .sha1, moment, &patch_arena, &patch_ids[i])) orelse return error.NotFound; 1277 values[i - 1] = record.event; 1278 } 1279 var ours_values = values; 1280 ours_values[0].title = "Drop the legacy configuration loader"; 1281 ours_values[0].tags = "cleanup config breaking"; 1282 const closed_description = try longDescription( 1283 patch_arena.allocator(), 1284 "Cache parsed manifests for the lifetime of a command invocation and invalidate entries when their files change.", 1285 ); 1286 ours_values[1].description = closed_description; 1287 ours_values[2].description = "Add JSON output to inspect with versioned field names and deterministic object ordering."; 1288 var theirs_values = values; 1289 theirs_values[0].title = "Delete compatibility configuration support"; 1290 theirs_values[0].tags = "config maintenance"; 1291 theirs_values[1].description = "Keep a process-wide manifest cache shared by every command and refresh it after writes."; 1292 theirs_values[2].description = "Expose inspect results as newline-delimited JSON so callers can stream large repositories."; 1293 1294 const seed_tip = (try target_repo.readRef(io, evt.events_ref)) orelse return error.NotFound; 1295 const other_ref = xit.ref.Ref{ .kind = .head, .name = "haxy/patch-other" }; 1296 var ours = [_]evt.EventWithId{ 1297 .{ 1298 .id = std.fmt.bytesToHex(patch_ids[1], .lower), 1299 .timestamp = 800, 1300 .author = .{ .name = "alice", .email = "alice@example.test" }, 1301 .event = .{ .patch = ours_values[0] }, 1302 }, 1303 .{ 1304 .id = std.fmt.bytesToHex(patch_ids[2], .lower), 1305 .timestamp = 801, 1306 .author = .{ .name = "alice", .email = "alice@example.test" }, 1307 .event = .{ .patch = ours_values[1] }, 1308 }, 1309 .{ 1310 .id = std.fmt.bytesToHex(patch_ids[3], .lower), 1311 .timestamp = 802, 1312 .author = .{ .name = "alice", .email = "alice@example.test" }, 1313 .event = .{ .patch = ours_values[2] }, 1314 }, 1315 }; 1316 1317 var theirs = ours; 1318 theirs[0].timestamp = 810; 1319 theirs[0].author = .{ .name = "bob", .email = "bob@example.test" }; 1320 theirs[0].event.patch = theirs_values[0]; 1321 theirs[1].timestamp = 811; 1322 theirs[1].author = .{ .name = "bob", .email = "bob@example.test" }; 1323 theirs[1].event.patch = theirs_values[1]; 1324 theirs[2].timestamp = 812; 1325 theirs[2].author = .{ .name = "bob", .email = "bob@example.test" }; 1326 theirs[2].event.patch = theirs_values[2]; 1327 1328 try evt.consume(.server, .repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &ours); 1329 try commitEventsAtRef(io, allocator, target_repo, other_ref, &theirs, seed_tip); 1330 { 1331 var merge = try target_repo.mergeAtRef(io, allocator, .{ .kind = .full, .action = .{ .new = .{ .source = &.{.{ .ref = other_ref }} } } }, evt.events_ref, null); 1332 defer merge.deinit(); 1333 if (merge.result != .success) return error.MergeFailed; 1334 } 1335 try target_repo.removeBranch(io, .{ .name = other_ref.name }); 1336 try evt.consume(.server, .repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &.{}); 1337 try pch.writeBranchPatch(.server, .xit, .{}, io, allocator, target_repo, std.fmt.bytesToHex(evt.EventWithId.randomId(random), .lower), .{ 1338 .title = "Merge the existing feature branch", 1339 .description = "This patch tracks the feature branch in this repo without creating a fork.", 1340 .tags = "feature", 1341 .source_branch = "feature", 1342 .target_branch = "master", 1343 }, null, patch_author); 1344 1345 // a push onto the branch that patch tracks, so the undo tab shows the 1346 // action and the patch refresh it sets off 1347 try seedPush(io, allocator, target_repo, patch_author); 1348 try pch.refreshBranches(.server, .xit, .{}, io, allocator, target_repo, null, null); 1349 } 1350 1351 // stand in for a client push, which the fixture has no server to receive: one 1352 // transaction moves the branch, refreshes the patches tracking it and records 1353 // the action, the way receive-pack does 1354 fn seedPush(io: std.Io, allocator: std.mem.Allocator, repo: *rp.Repo(.xit, .{}), author: evt.CommitAuthor) !void { 1355 const Repo = rp.Repo(.xit, .{}); 1356 const DB = Repo.DB; 1357 const Ctx = struct { 1358 core: *Repo.Core, 1359 io: std.Io, 1360 allocator: std.mem.Allocator, 1361 author: evt.CommitAuthor, 1362 1363 pub fn run(ctx: @This(), cursor: *DB.Cursor(.read_write)) !void { 1364 const opts: rp.RepoOpts(.xit) = .{}; 1365 var moment = try DB.HashMap(.read_write).init(cursor.*); 1366 const state = Repo.State(.read_write){ .core = ctx.core, .extra = .{ .moment = &moment } }; 1367 var arena = std.heap.ArenaAllocator.init(ctx.allocator); 1368 defer arena.deinit(); 1369 const aa = arena.allocator(); 1370 1371 // a null tree keeps the parent's content, so the branch advances 1372 // without the fixture having to build one 1373 const author_line = try std.fmt.allocPrint(aa, "{s} <{s}>", .{ ctx.author.name, ctx.author.email }); 1374 const feature_old = (try rf.readRecur(.xit, opts, state.readOnly(), ctx.io, .{ .ref = .{ .kind = .head, .name = "feature" } })) orelse return error.NotFound; 1375 const feature_new = try obj.writeCommit(.xit, opts, state, ctx.io, ctx.allocator, .{ 1376 .message = "Revise the feature branch", 1377 .author = author_line, 1378 .timestamp = 820, 1379 }, null, .{ .kind = .head, .name = "feature" }); 1380 1381 // a branch the push creates has no old tip, so its range is open 1382 try bch.add(.xit, opts, state, ctx.io, .{ .name = "docs" }); 1383 const docs_new = (try rf.readRecur(.xit, opts, state.readOnly(), ctx.io, .{ .ref = .{ .kind = .head, .name = "docs" } })) orelse return error.NotFound; 1384 1385 const updates = [_]xit.net_server_receive_pack.AppliedRefUpdate{ 1386 .{ 1387 .ref_name = try aa.dupe(u8, "refs/heads/feature"), 1388 .old_oid = try aa.dupe(u8, &feature_old), 1389 .new_oid = try aa.dupe(u8, &feature_new), 1390 }, 1391 .{ 1392 .ref_name = try aa.dupe(u8, "refs/heads/docs"), 1393 .old_oid = try aa.dupe(u8, "0" ** hash.hexLen(opts.hash)), 1394 .new_oid = try aa.dupe(u8, &docs_new), 1395 }, 1396 }; 1397 1398 _ = try pch.refreshBranchesInTransaction(.server, opts, state, &moment, ctx.io, ctx.allocator, &updates, null, null); 1399 try push.writeUndo(opts, state, ctx.io, ctx.allocator, ctx.author, &updates); 1400 } 1401 }; 1402 1403 try transaction(io, repo, Ctx{ .core = &repo.core, .io = io, .allocator = allocator, .author = author }); 1404 } 1405 1406 // commit `events` onto `ref`, rooted at `parent`, as one transaction. 1407 // consume always roots a new branch at nothing, so the divergent fixtures 1408 // write their side branch here instead. nothing is consumed, so it records 1409 // xit's own commit action rather than one of haxy's event actions 1410 fn commitEventsAtRef( 1411 io: std.Io, 1412 allocator: std.mem.Allocator, 1413 repo: *rp.Repo(.xit, .{}), 1414 ref: xit.ref.Ref, 1415 events: []const evt.EventWithId, 1416 parent: [hash.hexLen(.sha1)]u8, 1417 ) !void { 1418 const Repo = rp.Repo(.xit, .{}); 1419 const DB = Repo.DB; 1420 const Ctx = struct { 1421 core: *Repo.Core, 1422 io: std.Io, 1423 allocator: std.mem.Allocator, 1424 ref: xit.ref.Ref, 1425 events: []const evt.EventWithId, 1426 parent: [hash.hexLen(.sha1)]u8, 1427 1428 pub fn run(ctx: @This(), cursor: *DB.Cursor(.read_write)) !void { 1429 const opts: rp.RepoOpts(.xit) = .{}; 1430 var moment = try DB.HashMap(.read_write).init(cursor.*); 1431 const state = Repo.State(.read_write){ .core = ctx.core, .extra = .{ .moment = &moment } }; 1432 try evt.commitEvents(.xit, opts, state, ctx.io, ctx.allocator, ctx.ref, ctx.events, .{ctx.parent}); 1433 const tip = (try xit.ref.readRecur(.xit, opts, state.readOnly(), ctx.io, .{ .ref = ctx.ref })) orelse return error.NotFound; 1434 try xit.undo.write(opts, state, std.Io.Timestamp.now(ctx.io, .real).toSeconds(), .{ 1435 .commit = try .init("seed conflicting events", tip, opts.max_read_size), 1436 }); 1437 } 1438 }; 1439 1440 try transaction(io, repo, Ctx{ 1441 .core = &repo.core, 1442 .io = io, 1443 .allocator = allocator, 1444 .ref = ref, 1445 .events = events, 1446 .parent = parent, 1447 }); 1448 } 1449 1450 // append `ctx` to the repo's history as one transaction. the fixtures write a 1451 // few states the normal paths have no way to produce 1452 fn transaction(io: std.Io, repo: *rp.Repo(.xit, .{}), ctx: anytype) !void { 1453 const DB = rp.Repo(.xit, .{}).DB; 1454 try repo.core.db_file.lock(io, .exclusive); 1455 defer repo.core.db_file.unlock(io); 1456 1457 const history = try DB.ArrayList(.read_write).init(repo.core.db.rootCursor()); 1458 try history.appendContext(.{ .slot = try history.getSlot(-1) }, ctx); 1459 } 1460 1461 // recursively copy the contents of src_dir into dest_dir 1462 fn copyDir(io: std.Io, src_dir: std.Io.Dir, dest_dir: std.Io.Dir) !void { 1463 var iter = src_dir.iterate(); 1464 while (try iter.next(io)) |entry| { 1465 switch (entry.kind) { 1466 .file => try src_dir.copyFile(entry.name, dest_dir, entry.name, io, .{}), 1467 .directory => { 1468 try dest_dir.createDirPath(io, entry.name); 1469 var dest_entry_dir = try dest_dir.openDir(io, entry.name, .{ .access_sub_paths = true, .iterate = true, .follow_symlinks = false }); 1470 defer dest_entry_dir.close(io); 1471 var src_entry_dir = try src_dir.openDir(io, entry.name, .{ .access_sub_paths = true, .iterate = true, .follow_symlinks = false }); 1472 defer src_entry_dir.close(io); 1473 try copyDir(io, src_entry_dir, dest_entry_dir); 1474 }, 1475 else => {}, 1476 } 1477 } 1478 } 1479