╭─────────────╮ │scroll to top│ ╰─────────────╯ ╭ try.zig ──────────────────────────────────────────────────────╮ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ╰───────────────────────────────────────────────────────────────╯
🬐 🬠 🬞🬂🬏 🬟 🬑 🬟 🬑 ╭0cb27677..╮ 0cb27677.. haxy: 🬋🬋🬋 🬋🬋🬋 🬋 🬋 │files │ commits refs discuss issues patches new login 🬐 🬠 🬐 🬠 🬑 🬟 🬰 ╰──────────╯ (700) 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 markdown.zig notify.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
1077 try file.writeStreamingAll(io, content); 1078 } 1079 1080 const ScatterEdit = struct { line: usize, text: []const u8 }; 1081 1082 fn scatterContent(allocator: std.mem.Allocator, fi: usize, c: usize, replacement: ?ScatterEdit) ![]u8 { 1083 var writer = std.Io.Writer.Allocating.init(allocator); 1084 defer writer.deinit(); 1085 for (0..40) |line| { 1086 if (replacement) |edit| if (line == edit.line) { 1087 try writer.writer.print("{s}\n", .{edit.text}); 1088 continue; 1089 }; 1090 const start = writer.written().len; 1091 if ((line + fi + c) % 8 == 0) { 1092 const tag = scatter_words[(line + fi + c * 3) % scatter_words.len]; 1093 try writer.writer.print("rev {d} {s}", .{ c, tag }); 1094 } 1095 const target = 40 + (line * 17 + fi * 23) % 70; 1096 var w = line + fi; 1097 while (true) : (w += 1) { 1098 const word = scatter_words[w % scatter_words.len]; 1099 const len = writer.written().len - start; 1100 if (len >= target or len + 1 + word.len > 120) break; 1101 if (len == 0) 1102 try writer.writer.print("{s}", .{word}) 1103 else 1104 try writer.writer.print(" {s}", .{word}); 1105 } 1106 try writer.writer.writeByte('\n'); 1107 } 1108 return writer.toOwnedSlice(); 1109 } 1110 1111 // tag the current HEAD with the next three sequential versions, so the refs 1112 // tab has enough tags to page through 1113 fn addNextTags(repo: *rp.Repo(.xit, .{}), io: std.Io, allocator: std.mem.Allocator, n: *usize) !void { 1114 for (0..3) |_| { 1115 var buf: [16]u8 = undefined; 1116 const name = try std.fmt.bufPrint(&buf, "v{d}", .{n.*}); 1117 _ = try repo.addTag(io, allocator, .{ .name = name }); 1118 n.* += 1; 1119 } 1120 } 1121 1122 fn commitTree( 1123 io: std.Io, 1124 allocator: std.mem.Allocator, 1125 repo: *rp.Repo(.xit, .{}), 1126 oid: *const [hash.hexLen(.sha1)]u8, 1127 ) ![hash.hexLen(.sha1)]u8 { 1128 var moment = try repo.core.latestMoment(); 1129 const state = rp.Repo(.xit, .{}).State(.read_only){ .core = &repo.core, .extra = .{ .moment = &moment } }; 1130 var object = try obj.Object(.xit, .{}).init(state, io, allocator, oid); 1131 defer object.deinit(); 1132 return switch (object.content) { 1133 .commit => |commit| commit.tree, 1134 else => error.InvalidObject, 1135 }; 1136 } 1137 1138 // distribute a seed batch from oldest to newest relative to this run. 1139 fn seedTimestamp(now: u64, index: usize, count: usize, oldest_age: u64, newest_age: u64) u64 { 1140 const age = if (count > 1) oldest_age - (oldest_age - newest_age) * index / (count - 1) else newest_age; 1141 return now - age; 1142 } 1143 1144 fn seedPatchRevision( 1145 io: std.Io, 1146 allocator: std.mem.Allocator, 1147 users_dir: []const u8, 1148 forker_id: *const [evt.event_id_size]u8, 1149 patch_id: *const [evt.event_id_size]u8, 1150 title: []const u8, 1151 author: evt.CommitAuthor, 1152 timestamp: u64, 1153 random: std.Random, 1154 base_oid: [hash.hexLen(.sha1)]u8, 1155 path: []const u8, 1156 contents: []const []const u8, 1157 // a base file the last commit removes 1158 removed_path: ?[]const u8, 1159 ) !void { 1160 const patch_hex = std.fmt.bytesToHex(patch_id.*, .lower); 1161 const fork_path = try fork.forkPath(allocator, users_dir, forker_id, patch_id); 1162 defer allocator.free(fork_path); 1163 var fork_repo = try rp.Repo(.xit, .{}).open(io, allocator, .{ .path = fork_path, .require_repo_root = true }); 1164 defer fork_repo.deinit(io, allocator); 1165 1166 try fork_repo.addConfig(io, allocator, .{ .name = "core.bare", .value = "false" }); 1167 { 1168 var reset = try fork_repo.reset(io, allocator, .{ .target = .{ .oid = &base_oid } }); 1169 defer reset.deinit(); 1170 } 1171 const base_tree_oid = try commitTree(io, allocator, &fork_repo, &base_oid); 1172 var source_oid = base_oid; 1173 var fork_dir = try std.Io.Dir.cwd().openDir(io, fork_path, .{}); 1174 defer fork_dir.close(io); 1175 var writer = std.Io.Writer.Allocating.init(allocator); 1176 defer writer.deinit(); 1177 if (std.Io.Dir.path.dirname(path)) |dir| try fork_dir.createDirPath(io, dir); 1178 const commit_count = contents.len + @intFromBool(removed_path != null); 1179 for (contents, 0..) |content, i| { 1180 { 1181 const file = try fork_dir.createFile(io, path, .{}); 1182 defer file.close(io); 1183 try file.writeStreamingAll(io, content); 1184 } 1185 try fork_repo.add(io, allocator, &.{path}); 1186 writer.clearRetainingCapacity(); 1187 try writer.writer.print("{s} ({d}/{d})", .{ title, i + 1, commit_count }); 1188 source_oid = try fork_repo.commit(io, allocator, .{ .message = writer.written(), .timestamp = timestamp + i }); 1189 } 1190 if (removed_path) |removed| { 1191 // the bare fork never checked the base files out, so only the index drops it 1192 try fork_repo.remove(io, allocator, &.{removed}, .{ .update_work_dir = false }); 1193 writer.clearRetainingCapacity(); 1194 try writer.writer.print("{s} ({d}/{d})", .{ title, commit_count, commit_count }); 1195 source_oid = try fork_repo.commit(io, allocator, .{ .message = writer.written(), .timestamp = timestamp + contents.len }); 1196 } 1197 try fork_repo.patchAll(io, allocator, null); 1198 try fork_repo.addConfig(io, allocator, .{ .name = "core.bare", .value = "true" }); 1199 try transaction(io, &fork_repo, Reindex{ .io = io, .allocator = allocator, .core = &fork_repo.core, .commits = false }); 1200 _ = try fork_repo.garbageCollect(io, allocator, .{}, null); 1201 try fork_dir.deleteFile(io, path); 1202 const revision_id = evt.EventWithId.randomId(random); 1203 const head_tree_oid = try commitTree(io, allocator, &fork_repo, &source_oid); 1204 const revision: evt.PatchRev = .{ 1205 .base_oid = &base_oid, 1206 .source_oid = &source_oid, 1207 .message = title, 1208 }; 1209 const revision_timestamp = timestamp + 3; 1210 const tree_entries = [_]evt.EventTreeEntry{ 1211 .{ .tree = .{ .name = "base", .oid = &base_tree_oid } }, 1212 .{ .tree = .{ .name = "head", .oid = &head_tree_oid } }, 1213 }; 1214 try evt.consume(.{ .server = .{ .users_dir = users_dir } }, .fork, .xit, .{}, io, allocator, &fork_repo, evt.events_ref, &.{.{ 1215 .id = std.fmt.bytesToHex(revision_id, .lower), 1216 .timestamp = revision_timestamp, 1217 .author = author, 1218 .tree_entries = &tree_entries, 1219 .event = .{ .patchrev = revision }, 1220 }}); 1221 1222 var arena = std.heap.ArenaAllocator.init(allocator); 1223 defer arena.deinit(); 1224 const moment = try evt.currentMoment(.{}, &fork_repo); 1225 const revision_record = (try evt.PatchRev.readById(evt.EventDB(.sha1), .sha1, moment, &arena, &revision_id)) orelse return error.NotFound; 1226 const patch_record = (try evt.Patch.readById(evt.EventDB(.sha1), .sha1, moment, &arena, patch_id)) orelse return error.NotFound; 1227 var patch = patch_record.event; 1228 patch.revision = evt.Patch.Revision.fromRecord(revision_id, revision_record); 1229 try evt.consume(.{ .server = .{ .users_dir = users_dir } }, .fork, .xit, .{}, io, allocator, &fork_repo, evt.events_ref, &.{.{ 1230 .id = patch_hex, 1231 .timestamp = revision_timestamp + 1, 1232 .author = author, 1233 .event = .{ .patch = patch }, 1234 }}); 1235 } 1236 1237 // returns the newest patch, the one the seeded comments are on 1238 fn seedPatches( 1239 io: std.Io, 1240 allocator: std.mem.Allocator, 1241 server_path: []const u8, 1242 admin_repo: *rp.Repo(.xit, evt.admin_repo_opts), 1243 target_repo: *rp.Repo(.xit, .{}), 1244 repo_id: *const [evt.event_id_size]u8, 1245 repo_user_id: *const [evt.event_id_size]u8, 1246 user_id: *const [evt.event_id_size]u8, 1247 random: std.Random, 1248 now: u64, 1249 ) ![evt.event_id_size]u8 { 1250 const patch_data = [_]struct { 1251 title: []const u8, 1252 description: []const u8, 1253 labels: []const u8, 1254 status: ?evt.Patch.StatusKind, 1255 alpha_edit: ?ScatterEdit = null, 1256 // based behind master, so merging it makes a merge commit 1257 behind_master: bool = false, 1258 // a base file the patch removes 1259 removed_path: ?[]const u8 = null, 1260 }{ 1261 .{ 1262 .title = "Draft a faster dependency scanner", 1263 .description = "Rework dependency discovery so a **large workspace** can be scanned without repeatedly opening the same manifests.", 1264 .labels = "performance build", 1265 .status = null, 1266 }, 1267 .{ 1268 .title = "Remove the legacy configuration loader", 1269 .description = "Delete the compatibility loader now that the replacement format has shipped and the migration warning has been available for a *full release*.", 1270 .labels = "cleanup config", 1271 .status = .merged, 1272 .behind_master = true, 1273 }, 1274 .{ 1275 .title = "Cache parsed manifests between commands", 1276 .description = "Keep parsed manifests in the command `Context` so consecutive operations do not repeat identical filesystem and parsing work.", 1277 .labels = "performance cache", 1278 .status = .closed, 1279 }, 1280 .{ 1281 .title = "Add structured output to the inspect command", 1282 .description = "Add a stable JSON representation of `inspect` results for scripts and editor integrations.", 1283 .labels = "enhancement cli", 1284 .status = .open, 1285 .removed_path = "docs/dev/contribute.md", 1286 }, 1287 .{ 1288 .title = "Edit an adjacent line in alpha.txt", 1289 .description = "This patch can be cleanly merged by haxy, while git throws a **merge conflict**!", 1290 .labels = "merge", 1291 .status = .open, 1292 .alpha_edit = .{ .line = 2, .text = "adjust alpha beside the latest scatter edit" }, 1293 }, 1294 .{ 1295 .title = "Edit a conflicting line in alpha.txt", 1296 .description = "Both source and squash merges conflict with a different edit to the *same line* on master.", 1297 .labels = "merge", 1298 .status = .open, 1299 .alpha_edit = .{ .line = 3, .text = "replace alpha with a conflicting edit" }, 1300 }, 1301 }; 1302 1303 const users_dir = try std.Io.Dir.path.join(allocator, &.{ server_path, "users" }); 1304 defer allocator.free(users_dir); 1305 const patch_author = evt.CommitAuthor{ .name = "admin", .email = "admin@example.test" }; 1306 var patch_ids: [patch_data.len][evt.event_id_size]u8 = undefined; 1307 for (patch_data, 0..) |patch, i| { 1308 const timestamp = seedTimestamp(now, i, patch_data.len, 25 * std.time.s_per_day, 3 * std.time.s_per_hour); 1309 patch_ids[i] = evt.EventWithId.randomId(random); 1310 const patch_hex = std.fmt.bytesToHex(patch_ids[i], .lower); 1311 const path = try fork.create(.{}, io, allocator, users_dir, .{ 1312 .id = patch_hex, 1313 .user_id = user_id.*, 1314 .repo_id = repo_id.*, 1315 .repo_user_id = repo_user_id.*, 1316 .title = patch.title, 1317 .description = patch.description, 1318 .labels = patch.labels, 1319 .target_branch = "master", 1320 .author = patch_author, 1321 .timestamp = timestamp, 1322 }); 1323 allocator.free(path); 1324 1325 // prepare the patch's base and file contents, then seed its commits and revision 1326 { 1327 var arena = std.heap.ArenaAllocator.init(allocator); 1328 defer arena.deinit(); 1329 const aa = arena.allocator(); 1330 var base_oid = (try target_repo.readRef(io, .{ .kind = .head, .name = "master" })) orelse return error.NotFound; 1331 if (patch.alpha_edit != null or patch.behind_master) { 1332 // v30 precedes the last scatter commit, even after the sample merge 1333 const tag_oid = (try target_repo.readRef(io, .{ .kind = .tag, .name = "v30" })) orelse return error.NotFound; 1334 var moment = try target_repo.core.latestMoment(); 1335 const state = rp.Repo(.xit, .{}).State(.read_only){ .core = &target_repo.core, .extra = .{ .moment = &moment } }; 1336 var tag = try obj.Object(.xit, .{}).init(state, io, allocator, &tag_oid); 1337 defer tag.deinit(); 1338 base_oid = switch (tag.content) { 1339 .tag => |value| value.target, 1340 else => return error.InvalidObject, 1341 }; 1342 } 1343 var contents: [3][]const u8 = undefined; 1344 const file_path: []const u8, const count: usize = if (patch.alpha_edit) |edit| blk: { 1345 // rev 29 first changes line 4; edit that line or the one above it 1346 contents[0] = try scatterContent(aa, 0, 28, edit); 1347 break :blk .{ "src/alpha.txt", 1 }; 1348 } else blk: { 1349 var writer = std.Io.Writer.Allocating.init(allocator); 1350 defer writer.deinit(); 1351 for (&contents, 0..) |*content, part| { 1352 try writer.writer.print("{s}: part {d}\n", .{ patch.title, part + 1 }); 1353 content.* = try aa.dupe(u8, writer.written()); 1354 } 1355 break :blk .{ "patch.txt", contents.len }; 1356 }; 1357 try seedPatchRevision(io, allocator, users_dir, user_id, &patch_ids[i], patch.title, patch_author, timestamp + 1, random, base_oid, file_path, contents[0..count], patch.removed_path); 1358 } 1359 const status = patch.status orelse continue; 1360 try pch.publish(.{}, io, allocator, .{ .users_dir = users_dir }, admin_repo, target_repo, .{ 1361 .id = patch_hex, 1362 .user_id = user_id.*, 1363 .repo_id = repo_id.*, 1364 .author = patch_author, 1365 .timestamp = timestamp + 6, 1366 }); 1367 1368 if (status == .merged) { 1369 try pch.mergeAndRemoveFork(.{}, io, allocator, .{ .users_dir = users_dir }, target_repo, .{ 1370 .id = patch_hex, 1371 .revision = .source, 1372 .author = patch_author, 1373 .timestamp = timestamp + 7, 1374 }); 1375 } else if (status != .open) { 1376 try evt.Patch.update(.{ .server = .{ .users_dir = users_dir } }, .xit, .{}, io, allocator, target_repo, &patch_ids[i], .{ .status = status }, patch_author); 1377 } 1378 } 1379 1380 // seed a small comment tree on the newest patch 1381 var comment_ids: [5][evt.event_id_size]u8 = undefined; 1382 for (&comment_ids) |*id| id.* = evt.EventWithId.randomId(random); 1383 const comment_bodies = [_][]const u8{ 1384 "This also needs to preserve the **executable bit** for files nested inside generated directories.", 1385 "I tested both paths:\n\n- the archive path\n- the direct-copy path\n\nBoth currently lose the mode.", 1386 "The `ArchiveWriter` is the right place to centralize it, since every exporter already goes through that layer.", 1387 "Please include a regression fixture with a *mix* of executable and ordinary files.", 1388 "I'll add that fixture and cover both supported archive formats:\n\n1. tar\n2. zip", 1389 }; 1390 var comments: [comment_ids.len]evt.EventWithId = undefined; 1391 for (&comments, 0..) |*comment, i| { 1392 comment.* = .{ 1393 .id = std.fmt.bytesToHex(comment_ids[i], .lower), 1394 .timestamp = seedTimestamp(now, i, comments.len, 2 * std.time.s_per_hour, 45), 1395 .author = .{ .name = if (i % 2 == 0) "alice" else "bobby", .email = if (i % 2 == 0) "alice@example.test" else "bobby@example.test" }, 1396 .event = .{ .comment = .{ 1397 .thread_id = std.fmt.bytesToHex(patch_ids[patch_ids.len - 1], .lower), 1398 .parent_id = switch (i) { 1399 0, 1 => std.fmt.bytesToHex(patch_ids[patch_ids.len - 1], .lower), 1400 2, 4 => std.fmt.bytesToHex(comment_ids[0], .lower), 1401 3 => std.fmt.bytesToHex(comment_ids[2], .lower), 1402 else => unreachable, 1403 }, 1404 .body = comment_bodies[i], 1405 } }, 1406 }; 1407 } 1408 try evt.consume(.{ .server = .{ .users_dir = users_dir } }, .repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &comments); 1409 1410 // create divergent metadata edits on the next three patches 1411 var patch_arena = std.heap.ArenaAllocator.init(allocator); 1412 defer patch_arena.deinit(); 1413 const moment = try evt.currentMoment(.{}, target_repo); 1414 var values: [3]evt.Patch = undefined; 1415 for (1..4) |i| { 1416 const record = (try evt.Patch.readById(evt.EventDB(.sha1), .sha1, moment, &patch_arena, &patch_ids[i])) orelse return error.NotFound; 1417 values[i - 1] = record.event; 1418 } 1419 var ours_values = values; 1420 ours_values[0].title = "Drop the legacy configuration loader"; 1421 ours_values[0].labels = "cleanup config breaking"; 1422 const closed_description = try longDescription( 1423 patch_arena.allocator(), 1424 "## Summary\n\nCache parsed manifests for the lifetime of a command invocation and invalidate entries when their files change.", 1425 ); 1426 ours_values[1].description = closed_description; 1427 ours_values[2].description = "Add JSON output to `inspect` with versioned field names and deterministic object ordering."; 1428 var theirs_values = values; 1429 theirs_values[0].title = "Delete compatibility configuration support"; 1430 theirs_values[0].labels = "config maintenance"; 1431 theirs_values[1].description = "Keep a process-wide manifest cache shared by **every** command and refresh it after writes."; 1432 theirs_values[2].description = "Expose `inspect` results as newline-delimited JSON so callers can stream large repositories."; 1433 1434 const seed_tip = (try target_repo.readRef(io, evt.events_ref)) orelse return error.NotFound; 1435 const other_ref = xit.ref.Ref{ .kind = .head, .name = "haxy/patch-other" }; 1436 var ours = [_]evt.EventWithId{ 1437 .{ 1438 .id = std.fmt.bytesToHex(patch_ids[1], .lower), 1439 .timestamp = now - 30 * std.time.s_per_min, 1440 .author = .{ .name = "alice", .email = "alice@example.test" }, 1441 .event = .{ .patch = ours_values[0] }, 1442 }, 1443 .{ 1444 .id = std.fmt.bytesToHex(patch_ids[2], .lower), 1445 .timestamp = now - 29 * std.time.s_per_min, 1446 .author = .{ .name = "alice", .email = "alice@example.test" }, 1447 .event = .{ .patch = ours_values[1] }, 1448 }, 1449 .{ 1450 .id = std.fmt.bytesToHex(patch_ids[3], .lower), 1451 .timestamp = now - 28 * std.time.s_per_min, 1452 .author = .{ .name = "alice", .email = "alice@example.test" }, 1453 .event = .{ .patch = ours_values[2] }, 1454 }, 1455 }; 1456 1457 var theirs = ours; 1458 theirs[0].timestamp = now - 25 * std.time.s_per_min; 1459 theirs[0].author = .{ .name = "bobby", .email = "bobby@example.test" }; 1460 theirs[0].event.patch = theirs_values[0]; 1461 theirs[1].timestamp = now - 24 * std.time.s_per_min; 1462 theirs[1].author = .{ .name = "bobby", .email = "bobby@example.test" }; 1463 theirs[1].event.patch = theirs_values[1]; 1464 theirs[2].timestamp = now - 23 * std.time.s_per_min; 1465 theirs[2].author = .{ .name = "bobby", .email = "bobby@example.test" }; 1466 theirs[2].event.patch = theirs_values[2]; 1467 1468 try evt.consume(.{ .server = .{ .users_dir = users_dir } }, .repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &ours); 1469 try commitEventsAtRef(io, allocator, target_repo, other_ref, &theirs, seed_tip); 1470 { 1471 var merge = try target_repo.mergeAtRef(io, allocator, .{ .kind = .full, .action = .{ .new = .{ .source = &.{.{ .ref = other_ref }} } } }, evt.events_ref, null); 1472 defer merge.deinit(); 1473 if (merge.result != .success) return error.MergeFailed; 1474 } 1475 try target_repo.removeBranch(io, .{ .name = other_ref.name }); 1476 try evt.consume(.{ .server = .{ .users_dir = users_dir } }, .repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &.{}); 1477 try pch.writeBranchPatch(.{ .server = .{ .users_dir = users_dir } }, .xit, .{}, io, allocator, target_repo, std.fmt.bytesToHex(evt.EventWithId.randomId(random), .lower), .{ 1478 .title = "Merge the existing feature branch", 1479 .description = "This patch tracks the `feature` branch in this repo without creating a fork.", 1480 .labels = "feature", 1481 .source_branch = "feature", 1482 .target_branch = "master", 1483 }, null, patch_author); 1484 1485 // a push onto the branch that patch tracks, so the undo tab shows the 1486 // action and the patch refresh it sets off 1487 try seedPush(io, allocator, target_repo, users_dir, patch_author, now - 15); 1488 try pch.refreshBranches(.{ .server = .{ .users_dir = users_dir } }, .xit, .{}, io, allocator, target_repo, null, null); 1489 return patch_ids[patch_ids.len - 1]; 1490 } 1491 1492 // stand in for a client push, which the fixture has no server to receive: one 1493 // transaction moves the branch, refreshes the patches tracking it and records 1494 // the action, the way receive-pack does 1495 fn seedPush(io: std.Io, allocator: std.mem.Allocator, repo: *rp.Repo(.xit, .{}), users_dir: []const u8, author: evt.CommitAuthor, timestamp: u64) !void { 1496 const Repo = rp.Repo(.xit, .{}); 1497 const DB = Repo.DB; 1498 const Ctx = struct { 1499 core: *Repo.Core, 1500 io: std.Io, 1501 allocator: std.mem.Allocator, 1502 users_dir: []const u8, 1503 author: evt.CommitAuthor, 1504 timestamp: u64, 1505 1506 pub fn run(ctx: @This(), cursor: *DB.Cursor(.read_write)) !void { 1507 const opts: rp.RepoOpts(.xit) = .{}; 1508 var moment = try DB.HashMap(.read_write).init(cursor.*); 1509 const state = Repo.State(.read_write){ .core = ctx.core, .extra = .{ .moment = &moment } }; 1510 var arena = std.heap.ArenaAllocator.init(ctx.allocator); 1511 defer arena.deinit(); 1512 const aa = arena.allocator(); 1513 1514 // a null tree keeps the parent's content, so the branch advances 1515 // without the fixture having to build one 1516 const author_line = try aa.print("{s} <{s}>", .{ ctx.author.name, ctx.author.email }); 1517 const feature_old = (try rf.readRecur(.xit, opts, state.readOnly(), ctx.io, .{ .ref = .{ .kind = .head, .name = "feature" } })) orelse return error.NotFound; 1518 const feature_new = try obj.writeCommit(.xit, opts, state, ctx.io, ctx.allocator, .{ 1519 .message = "Revise the feature branch", 1520 .author = author_line, 1521 .timestamp = ctx.timestamp, 1522 }, null, .{ .kind = .head, .name = "feature" }); 1523 1524 // a branch the push creates has no old tip, so its range is open 1525 try bch.add(.xit, opts, state, ctx.io, .{ .name = "docs" }); 1526 const docs_new = (try rf.readRecur(.xit, opts, state.readOnly(), ctx.io, .{ .ref = .{ .kind = .head, .name = "docs" } })) orelse return error.NotFound; 1527 1528 const updates = [_]xit.net_server_receive_pack.AppliedRefUpdate{ 1529 .{ 1530 .ref_name = try aa.dupe(u8, "refs/heads/feature"), 1531 .old_oid = try aa.dupe(u8, &feature_old), 1532 .new_oid = try aa.dupe(u8, &feature_new), 1533 }, 1534 .{ 1535 .ref_name = try aa.dupe(u8, "refs/heads/docs"), 1536 .old_oid = try aa.dupe(u8, &@as([hash.hexLen(opts.hash)]u8, @splat('0'))), 1537 .new_oid = try aa.dupe(u8, &docs_new), 1538 }, 1539 }; 1540 1541 // receive-pack patches the new tips before the branches refresh 1542 try xit.patch.writePatches(opts, state, ctx.io, ctx.allocator, &.{ feature_new, docs_new }, null); 1543 _ = try pch.refreshBranchesInTransaction(.{ .server = .{ .users_dir = ctx.users_dir } }, opts, state, &moment, ctx.io, ctx.allocator, &updates, null, null); 1544 try push.writeUndo(opts, state, ctx.io, ctx.allocator, ctx.author, &updates); 1545 } 1546 }; 1547 1548 try transaction(io, repo, Ctx{ .core = &repo.core, .io = io, .allocator = allocator, .users_dir = users_dir, .author = author, .timestamp = timestamp }); 1549 } 1550 1551 // commit `events` onto `ref`, rooted at `parent`, as one transaction. 1552 // consume always roots a new branch at nothing, so the divergent fixtures 1553 // write their side branch here instead. nothing is consumed, so it records 1554 // xit's own commit action rather than one of haxy's event actions 1555 fn commitEventsAtRef( 1556 io: std.Io, 1557 allocator: std.mem.Allocator, 1558 repo: *rp.Repo(.xit, .{}), 1559 ref: xit.ref.Ref, 1560 events: []const evt.EventWithId, 1561 parent: [hash.hexLen(.sha1)]u8, 1562 ) !void { 1563 const Repo = rp.Repo(.xit, .{}); 1564 const DB = Repo.DB; 1565 const Ctx = struct { 1566 core: *Repo.Core, 1567 io: std.Io, 1568 allocator: std.mem.Allocator, 1569 ref: xit.ref.Ref, 1570 events: []const evt.EventWithId, 1571 parent: [hash.hexLen(.sha1)]u8, 1572 1573 pub fn run(ctx: @This(), cursor: *DB.Cursor(.read_write)) !void { 1574 const opts: rp.RepoOpts(.xit) = .{}; 1575 var moment = try DB.HashMap(.read_write).init(cursor.*); 1576 const state = Repo.State(.read_write){ .core = ctx.core, .extra = .{ .moment = &moment } }; 1577 try evt.commitEvents(.xit, opts, state, ctx.io, ctx.allocator, ctx.ref, ctx.events, .{ctx.parent}); 1578 const tip = (try xit.ref.readRecur(.xit, opts, state.readOnly(), ctx.io, .{ .ref = ctx.ref })) orelse return error.NotFound; 1579 try xit.undo.write(opts, state, std.Io.Timestamp.now(ctx.io, .real).toSeconds(), .{ 1580 .commit = try .init("seed conflicting events", tip, opts.max_read_size), 1581 }); 1582 } 1583 }; 1584 1585 try transaction(io, repo, Ctx{ 1586 .core = &repo.core, 1587 .io = io, 1588 .allocator = allocator, 1589 .ref = ref, 1590 .events = events, 1591 .parent = parent, 1592 }); 1593 } 1594 1595 // append `ctx` to the repo's history as one transaction. the fixtures write a 1596 // few states the normal paths have no way to produce 1597 // fixtures commit directly, so the ref tips are indexed by hand. a fork gets 1598 // no commit index, as in production. 1599 const Reindex = struct { 1600 io: std.Io, 1601 allocator: std.mem.Allocator, 1602 core: *rp.Repo(.xit, .{}).Core, 1603 commits: bool, 1604 1605 pub fn run(ctx: @This(), cursor: *rp.Repo(.xit, .{}).DB.Cursor(.read_write)) !void { 1606 var moment = try rp.Repo(.xit, .{}).DB.HashMap(.read_write).init(cursor.*); 1607 const state = rp.Repo(.xit, .{}).State(.read_write){ .core = ctx.core, .extra = .{ .moment = &moment } }; 1608 _ = try find.refreshInTransaction(.{}, state, &moment, ctx.io, ctx.allocator, null); 1609 if (ctx.commits) _ = try srch_cmmt.refreshInTransaction(.{}, state, &moment, ctx.io, ctx.allocator, &.{}, null); 1610 } 1611 }; 1612 1613 fn transaction(io: std.Io, repo: *rp.Repo(.xit, .{}), ctx: anytype) !void { 1614 const DB = rp.Repo(.xit, .{}).DB; 1615 try repo.core.db_file.lock(io, .exclusive); 1616 defer repo.core.db_file.unlock(io); 1617 1618 const history = try DB.ArrayList(.read_write).init(repo.core.db.rootCursor()); 1619 try history.appendContext(.{ .slot = try history.getSlot(-1) }, ctx); 1620 } 1621 1622 // recursively copy the contents of src_dir into dest_dir 1623 fn copyDir(io: std.Io, src_dir: std.Io.Dir, dest_dir: std.Io.Dir) !void { 1624 var iter = src_dir.iterate(); 1625 while (try iter.next(io)) |entry| { 1626 switch (entry.kind) { 1627 .file => try src_dir.copyFile(entry.name, dest_dir, entry.name, io, .{}), 1628 .directory => { 1629 try dest_dir.createDirPath(io, entry.name); 1630 var dest_entry_dir = try dest_dir.openDir(io, entry.name, .{ .access_sub_paths = true, .iterate = true, .follow_symlinks = false }); 1631 defer dest_entry_dir.close(io); 1632 var src_entry_dir = try src_dir.openDir(io, entry.name, .{ .access_sub_paths = true, .iterate = true, .follow_symlinks = false }); 1633 defer src_entry_dir.close(io); 1634 try copyDir(io, src_entry_dir, dest_entry_dir); 1635 }, 1636 else => {}, 1637 } 1638 } 1639 } 1640