╭─────────────╮ │scroll to top│ ╰─────────────╯ ╭ try.zig ──────────────────────────────────────────────────────╮ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ╰───────────────────────────────────────────────────────────────╯
🬐 🬠 🬞🬂🬏 🬟 🬑 🬟 🬑 ╭03aedad0..╮ 03aedad0.. haxy: 🬋🬋🬋 🬋🬋🬋 🬋 🬋 │files │ commits refs discuss issues patches new login 🬐 🬠 🬐 🬠 🬑 🬟 🬰 ╰──────────╯ (701) 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
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_name: []const u8, 1246 repo_user_id: *const [evt.event_id_size]u8, 1247 user_id: *const [evt.event_id_size]u8, 1248 random: std.Random, 1249 now: u64, 1250 ) ![evt.event_id_size]u8 { 1251 const patch_data = [_]struct { 1252 title: []const u8, 1253 description: []const u8, 1254 labels: []const u8, 1255 status: ?evt.Patch.StatusKind, 1256 alpha_edit: ?ScatterEdit = null, 1257 // based behind master, so merging it makes a merge commit 1258 behind_master: bool = false, 1259 // a base file the patch removes 1260 removed_path: ?[]const u8 = null, 1261 }{ 1262 .{ 1263 .title = "Draft a faster dependency scanner", 1264 .description = "Rework dependency discovery so a **large workspace** can be scanned without repeatedly opening the same manifests.", 1265 .labels = "performance build", 1266 .status = null, 1267 }, 1268 .{ 1269 .title = "Remove the legacy configuration loader", 1270 .description = "Delete the compatibility loader now that the replacement format has shipped and the migration warning has been available for a *full release*.", 1271 .labels = "cleanup config", 1272 .status = .merged, 1273 .behind_master = true, 1274 }, 1275 .{ 1276 .title = "Cache parsed manifests between commands", 1277 .description = "Keep parsed manifests in the command `Context` so consecutive operations do not repeat identical filesystem and parsing work.", 1278 .labels = "performance cache", 1279 .status = .closed, 1280 }, 1281 .{ 1282 .title = "Add structured output to the inspect command", 1283 .description = "Add a stable JSON representation of `inspect` results for scripts and editor integrations.", 1284 .labels = "enhancement cli", 1285 .status = .open, 1286 .removed_path = "docs/dev/contribute.md", 1287 }, 1288 .{ 1289 .title = "Edit an adjacent line in alpha.txt", 1290 .description = "This patch can be cleanly merged by haxy, while git throws a **merge conflict**!", 1291 .labels = "merge", 1292 .status = .open, 1293 .alpha_edit = .{ .line = 2, .text = "adjust alpha beside the latest scatter edit" }, 1294 }, 1295 .{ 1296 .title = "Edit a conflicting line in alpha.txt", 1297 .description = "Both source and squash merges conflict with a different edit to the *same line* on master.", 1298 .labels = "merge", 1299 .status = .open, 1300 .alpha_edit = .{ .line = 3, .text = "replace alpha with a conflicting edit" }, 1301 }, 1302 }; 1303 1304 const users_dir = try std.Io.Dir.path.join(allocator, &.{ server_path, "users" }); 1305 defer allocator.free(users_dir); 1306 const patch_author = evt.CommitAuthor{ .name = "admin", .email = "admin@example.test" }; 1307 var patch_ids: [patch_data.len][evt.event_id_size]u8 = undefined; 1308 for (patch_data, 0..) |patch, i| { 1309 const timestamp = seedTimestamp(now, i, patch_data.len, 25 * std.time.s_per_day, 3 * std.time.s_per_hour); 1310 patch_ids[i] = evt.EventWithId.randomId(random); 1311 const patch_hex = std.fmt.bytesToHex(patch_ids[i], .lower); 1312 const path = try fork.create(.{}, io, allocator, users_dir, .{ 1313 .id = patch_hex, 1314 .user_id = user_id.*, 1315 .repo_id = repo_id.*, 1316 .repo_user_id = repo_user_id.*, 1317 .repo_name = repo_name, 1318 .title = patch.title, 1319 .description = patch.description, 1320 .labels = patch.labels, 1321 .target_branch = "master", 1322 .author = patch_author, 1323 .timestamp = timestamp, 1324 }); 1325 allocator.free(path); 1326 1327 // prepare the patch's base and file contents, then seed its commits and revision 1328 { 1329 var arena = std.heap.ArenaAllocator.init(allocator); 1330 defer arena.deinit(); 1331 const aa = arena.allocator(); 1332 var base_oid = (try target_repo.readRef(io, .{ .kind = .head, .name = "master" })) orelse return error.NotFound; 1333 if (patch.alpha_edit != null or patch.behind_master) { 1334 // v30 precedes the last scatter commit, even after the sample merge 1335 const tag_oid = (try target_repo.readRef(io, .{ .kind = .tag, .name = "v30" })) orelse return error.NotFound; 1336 var moment = try target_repo.core.latestMoment(); 1337 const state = rp.Repo(.xit, .{}).State(.read_only){ .core = &target_repo.core, .extra = .{ .moment = &moment } }; 1338 var tag = try obj.Object(.xit, .{}).init(state, io, allocator, &tag_oid); 1339 defer tag.deinit(); 1340 base_oid = switch (tag.content) { 1341 .tag => |value| value.target, 1342 else => return error.InvalidObject, 1343 }; 1344 } 1345 var contents: [3][]const u8 = undefined; 1346 const file_path: []const u8, const count: usize = if (patch.alpha_edit) |edit| blk: { 1347 // rev 29 first changes line 4; edit that line or the one above it 1348 contents[0] = try scatterContent(aa, 0, 28, edit); 1349 break :blk .{ "src/alpha.txt", 1 }; 1350 } else blk: { 1351 var writer = std.Io.Writer.Allocating.init(allocator); 1352 defer writer.deinit(); 1353 for (&contents, 0..) |*content, part| { 1354 try writer.writer.print("{s}: part {d}\n", .{ patch.title, part + 1 }); 1355 content.* = try aa.dupe(u8, writer.written()); 1356 } 1357 break :blk .{ "patch.txt", contents.len }; 1358 }; 1359 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); 1360 } 1361 const status = patch.status orelse continue; 1362 try pch.publish(.{}, io, allocator, .{ .users_dir = users_dir }, admin_repo, target_repo, .{ 1363 .id = patch_hex, 1364 .user_id = user_id.*, 1365 .repo_id = repo_id.*, 1366 .author = patch_author, 1367 .timestamp = timestamp + 6, 1368 }); 1369 1370 if (status == .merged) { 1371 try pch.mergeAndRemoveFork(.{}, io, allocator, .{ .users_dir = users_dir }, target_repo, .{ 1372 .id = patch_hex, 1373 .revision = .source, 1374 .author = patch_author, 1375 .timestamp = timestamp + 7, 1376 }); 1377 } else if (status != .open) { 1378 try evt.Patch.update(.{ .server = .{ .users_dir = users_dir } }, .xit, .{}, io, allocator, target_repo, &patch_ids[i], .{ .status = status }, patch_author); 1379 } 1380 } 1381 1382 // seed a small comment tree on the newest patch 1383 var comment_ids: [5][evt.event_id_size]u8 = undefined; 1384 for (&comment_ids) |*id| id.* = evt.EventWithId.randomId(random); 1385 const comment_bodies = [_][]const u8{ 1386 "This also needs to preserve the **executable bit** for files nested inside generated directories.", 1387 "I tested both paths:\n\n- the archive path\n- the direct-copy path\n\nBoth currently lose the mode.", 1388 "The `ArchiveWriter` is the right place to centralize it, since every exporter already goes through that layer.", 1389 "Please include a regression fixture with a *mix* of executable and ordinary files.", 1390 "I'll add that fixture and cover both supported archive formats:\n\n1. tar\n2. zip", 1391 }; 1392 var comments: [comment_ids.len]evt.EventWithId = undefined; 1393 for (&comments, 0..) |*comment, i| { 1394 comment.* = .{ 1395 .id = std.fmt.bytesToHex(comment_ids[i], .lower), 1396 .timestamp = seedTimestamp(now, i, comments.len, 2 * std.time.s_per_hour, 45), 1397 .author = .{ .name = if (i % 2 == 0) "alice" else "bobby", .email = if (i % 2 == 0) "alice@example.test" else "bobby@example.test" }, 1398 .event = .{ .comment = .{ 1399 .thread_id = std.fmt.bytesToHex(patch_ids[patch_ids.len - 1], .lower), 1400 .parent_id = switch (i) { 1401 0, 1 => std.fmt.bytesToHex(patch_ids[patch_ids.len - 1], .lower), 1402 2, 4 => std.fmt.bytesToHex(comment_ids[0], .lower), 1403 3 => std.fmt.bytesToHex(comment_ids[2], .lower), 1404 else => unreachable, 1405 }, 1406 .body = comment_bodies[i], 1407 } }, 1408 }; 1409 } 1410 try evt.consume(.{ .server = .{ .users_dir = users_dir } }, .repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &comments); 1411 1412 // create divergent metadata edits on the next three patches 1413 var patch_arena = std.heap.ArenaAllocator.init(allocator); 1414 defer patch_arena.deinit(); 1415 const moment = try evt.currentMoment(.{}, target_repo); 1416 var values: [3]evt.Patch = undefined; 1417 for (1..4) |i| { 1418 const record = (try evt.Patch.readById(evt.EventDB(.sha1), .sha1, moment, &patch_arena, &patch_ids[i])) orelse return error.NotFound; 1419 values[i - 1] = record.event; 1420 } 1421 var ours_values = values; 1422 ours_values[0].title = "Drop the legacy configuration loader"; 1423 ours_values[0].labels = "cleanup config breaking"; 1424 const closed_description = try longDescription( 1425 patch_arena.allocator(), 1426 "## Summary\n\nCache parsed manifests for the lifetime of a command invocation and invalidate entries when their files change.", 1427 ); 1428 ours_values[1].description = closed_description; 1429 ours_values[2].description = "Add JSON output to `inspect` with versioned field names and deterministic object ordering."; 1430 var theirs_values = values; 1431 theirs_values[0].title = "Delete compatibility configuration support"; 1432 theirs_values[0].labels = "config maintenance"; 1433 theirs_values[1].description = "Keep a process-wide manifest cache shared by **every** command and refresh it after writes."; 1434 theirs_values[2].description = "Expose `inspect` results as newline-delimited JSON so callers can stream large repositories."; 1435 1436 const seed_tip = (try target_repo.readRef(io, evt.events_ref)) orelse return error.NotFound; 1437 const other_ref = xit.ref.Ref{ .kind = .head, .name = "haxy/patch-other" }; 1438 var ours = [_]evt.EventWithId{ 1439 .{ 1440 .id = std.fmt.bytesToHex(patch_ids[1], .lower), 1441 .timestamp = now - 30 * std.time.s_per_min, 1442 .author = .{ .name = "alice", .email = "alice@example.test" }, 1443 .event = .{ .patch = ours_values[0] }, 1444 }, 1445 .{ 1446 .id = std.fmt.bytesToHex(patch_ids[2], .lower), 1447 .timestamp = now - 29 * std.time.s_per_min, 1448 .author = .{ .name = "alice", .email = "alice@example.test" }, 1449 .event = .{ .patch = ours_values[1] }, 1450 }, 1451 .{ 1452 .id = std.fmt.bytesToHex(patch_ids[3], .lower), 1453 .timestamp = now - 28 * std.time.s_per_min, 1454 .author = .{ .name = "alice", .email = "alice@example.test" }, 1455 .event = .{ .patch = ours_values[2] }, 1456 }, 1457 }; 1458 1459 var theirs = ours; 1460 theirs[0].timestamp = now - 25 * std.time.s_per_min; 1461 theirs[0].author = .{ .name = "bobby", .email = "bobby@example.test" }; 1462 theirs[0].event.patch = theirs_values[0]; 1463 theirs[1].timestamp = now - 24 * std.time.s_per_min; 1464 theirs[1].author = .{ .name = "bobby", .email = "bobby@example.test" }; 1465 theirs[1].event.patch = theirs_values[1]; 1466 theirs[2].timestamp = now - 23 * std.time.s_per_min; 1467 theirs[2].author = .{ .name = "bobby", .email = "bobby@example.test" }; 1468 theirs[2].event.patch = theirs_values[2]; 1469 1470 try evt.consume(.{ .server = .{ .users_dir = users_dir } }, .repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &ours); 1471 try commitEventsAtRef(io, allocator, target_repo, other_ref, &theirs, seed_tip); 1472 { 1473 var merge = try target_repo.mergeAtRef(io, allocator, .{ .kind = .full, .action = .{ .new = .{ .source = &.{.{ .ref = other_ref }} } } }, evt.events_ref, null); 1474 defer merge.deinit(); 1475 if (merge.result != .success) return error.MergeFailed; 1476 } 1477 try target_repo.removeBranch(io, .{ .name = other_ref.name }); 1478 try evt.consume(.{ .server = .{ .users_dir = users_dir } }, .repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &.{}); 1479 try pch.writeBranchPatch(.{ .server = .{ .users_dir = users_dir } }, .xit, .{}, io, allocator, target_repo, std.fmt.bytesToHex(evt.EventWithId.randomId(random), .lower), .{ 1480 .title = "Merge the existing feature branch", 1481 .description = "This patch tracks the `feature` branch in this repo without creating a fork.", 1482 .labels = "feature", 1483 .source_branch = "feature", 1484 .target_branch = "master", 1485 }, null, patch_author); 1486 1487 // a push onto the branch that patch tracks, so the undo tab shows the 1488 // action and the patch refresh it sets off 1489 try seedPush(io, allocator, target_repo, users_dir, patch_author, now - 15); 1490 try pch.refreshBranches(.{ .server = .{ .users_dir = users_dir } }, .xit, .{}, io, allocator, target_repo, null, null); 1491 return patch_ids[patch_ids.len - 1]; 1492 } 1493 1494 // stand in for a client push, which the fixture has no server to receive: one 1495 // transaction moves the branch, refreshes the patches tracking it and records 1496 // the action, the way receive-pack does 1497 fn seedPush(io: std.Io, allocator: std.mem.Allocator, repo: *rp.Repo(.xit, .{}), users_dir: []const u8, author: evt.CommitAuthor, timestamp: u64) !void { 1498 const Repo = rp.Repo(.xit, .{}); 1499 const DB = Repo.DB; 1500 const Ctx = struct { 1501 core: *Repo.Core, 1502 io: std.Io, 1503 allocator: std.mem.Allocator, 1504 users_dir: []const u8, 1505 author: evt.CommitAuthor, 1506 timestamp: u64, 1507 1508 pub fn run(ctx: @This(), cursor: *DB.Cursor(.read_write)) !void { 1509 const opts: rp.RepoOpts(.xit) = .{}; 1510 var moment = try DB.HashMap(.read_write).init(cursor.*); 1511 const state = Repo.State(.read_write){ .core = ctx.core, .extra = .{ .moment = &moment } }; 1512 var arena = std.heap.ArenaAllocator.init(ctx.allocator); 1513 defer arena.deinit(); 1514 const aa = arena.allocator(); 1515 1516 // a null tree keeps the parent's content, so the branch advances 1517 // without the fixture having to build one 1518 const author_line = try aa.print("{s} <{s}>", .{ ctx.author.name, ctx.author.email }); 1519 const feature_old = (try rf.readRecur(.xit, opts, state.readOnly(), ctx.io, .{ .ref = .{ .kind = .head, .name = "feature" } })) orelse return error.NotFound; 1520 const feature_new = try obj.writeCommit(.xit, opts, state, ctx.io, ctx.allocator, .{ 1521 .message = "Revise the feature branch", 1522 .author = author_line, 1523 .timestamp = ctx.timestamp, 1524 }, null, .{ .kind = .head, .name = "feature" }); 1525 1526 // a branch the push creates has no old tip, so its range is open 1527 try bch.add(.xit, opts, state, ctx.io, .{ .name = "docs" }); 1528 const docs_new = (try rf.readRecur(.xit, opts, state.readOnly(), ctx.io, .{ .ref = .{ .kind = .head, .name = "docs" } })) orelse return error.NotFound; 1529 1530 const updates = [_]xit.net_server_receive_pack.AppliedRefUpdate{ 1531 .{ 1532 .ref_name = try aa.dupe(u8, "refs/heads/feature"), 1533 .old_oid = try aa.dupe(u8, &feature_old), 1534 .new_oid = try aa.dupe(u8, &feature_new), 1535 }, 1536 .{ 1537 .ref_name = try aa.dupe(u8, "refs/heads/docs"), 1538 .old_oid = try aa.dupe(u8, &@as([hash.hexLen(opts.hash)]u8, @splat('0'))), 1539 .new_oid = try aa.dupe(u8, &docs_new), 1540 }, 1541 }; 1542 1543 // receive-pack patches the new tips before the branches refresh 1544 try xit.patch.writePatches(opts, state, ctx.io, ctx.allocator, &.{ feature_new, docs_new }, null); 1545 _ = try pch.refreshBranchesInTransaction(.{ .server = .{ .users_dir = ctx.users_dir } }, opts, state, &moment, ctx.io, ctx.allocator, &updates, null, null); 1546 try push.writeUndo(opts, state, ctx.io, ctx.allocator, ctx.author, &updates); 1547 } 1548 }; 1549 1550 try transaction(io, repo, Ctx{ .core = &repo.core, .io = io, .allocator = allocator, .users_dir = users_dir, .author = author, .timestamp = timestamp }); 1551 } 1552 1553 // commit `events` onto `ref`, rooted at `parent`, as one transaction. 1554 // consume always roots a new branch at nothing, so the divergent fixtures 1555 // write their side branch here instead. nothing is consumed, so it records 1556 // xit's own commit action rather than one of haxy's event actions 1557 fn commitEventsAtRef( 1558 io: std.Io, 1559 allocator: std.mem.Allocator, 1560 repo: *rp.Repo(.xit, .{}), 1561 ref: xit.ref.Ref, 1562 events: []const evt.EventWithId, 1563 parent: [hash.hexLen(.sha1)]u8, 1564 ) !void { 1565 const Repo = rp.Repo(.xit, .{}); 1566 const DB = Repo.DB; 1567 const Ctx = struct { 1568 core: *Repo.Core, 1569 io: std.Io, 1570 allocator: std.mem.Allocator, 1571 ref: xit.ref.Ref, 1572 events: []const evt.EventWithId, 1573 parent: [hash.hexLen(.sha1)]u8, 1574 1575 pub fn run(ctx: @This(), cursor: *DB.Cursor(.read_write)) !void { 1576 const opts: rp.RepoOpts(.xit) = .{}; 1577 var moment = try DB.HashMap(.read_write).init(cursor.*); 1578 const state = Repo.State(.read_write){ .core = ctx.core, .extra = .{ .moment = &moment } }; 1579 try evt.commitEvents(.xit, opts, state, ctx.io, ctx.allocator, ctx.ref, ctx.events, .{ctx.parent}); 1580 const tip = (try xit.ref.readRecur(.xit, opts, state.readOnly(), ctx.io, .{ .ref = ctx.ref })) orelse return error.NotFound; 1581 try xit.undo.write(opts, state, std.Io.Timestamp.now(ctx.io, .real).toSeconds(), .{ 1582 .commit = try .init("seed conflicting events", tip, opts.max_read_size), 1583 }); 1584 } 1585 }; 1586 1587 try transaction(io, repo, Ctx{ 1588 .core = &repo.core, 1589 .io = io, 1590 .allocator = allocator, 1591 .ref = ref, 1592 .events = events, 1593 .parent = parent, 1594 }); 1595 } 1596 1597 // append `ctx` to the repo's history as one transaction. the fixtures write a 1598 // few states the normal paths have no way to produce 1599 // fixtures commit directly, so the ref tips are indexed by hand. a fork gets 1600 // no commit index, as in production. 1601 const Reindex = struct { 1602 io: std.Io, 1603 allocator: std.mem.Allocator, 1604 core: *rp.Repo(.xit, .{}).Core, 1605 commits: bool, 1606 1607 pub fn run(ctx: @This(), cursor: *rp.Repo(.xit, .{}).DB.Cursor(.read_write)) !void { 1608 var moment = try rp.Repo(.xit, .{}).DB.HashMap(.read_write).init(cursor.*); 1609 const state = rp.Repo(.xit, .{}).State(.read_write){ .core = ctx.core, .extra = .{ .moment = &moment } }; 1610 _ = try find.refreshInTransaction(.{}, state, &moment, ctx.io, ctx.allocator, null); 1611 if (ctx.commits) _ = try srch_cmmt.refreshInTransaction(.{}, state, &moment, ctx.io, ctx.allocator, &.{}, null); 1612 } 1613 }; 1614 1615 fn transaction(io: std.Io, repo: *rp.Repo(.xit, .{}), ctx: anytype) !void { 1616 const DB = rp.Repo(.xit, .{}).DB; 1617 try repo.core.db_file.lock(io, .exclusive); 1618 defer repo.core.db_file.unlock(io); 1619 1620 const history = try DB.ArrayList(.read_write).init(repo.core.db.rootCursor()); 1621 try history.appendContext(.{ .slot = try history.getSlot(-1) }, ctx); 1622 } 1623 1624 // recursively copy the contents of src_dir into dest_dir 1625 fn copyDir(io: std.Io, src_dir: std.Io.Dir, dest_dir: std.Io.Dir) !void { 1626 var iter = src_dir.iterate(); 1627 while (try iter.next(io)) |entry| { 1628 switch (entry.kind) { 1629 .file => try src_dir.copyFile(entry.name, dest_dir, entry.name, io, .{}), 1630 .directory => { 1631 try dest_dir.createDirPath(io, entry.name); 1632 var dest_entry_dir = try dest_dir.openDir(io, entry.name, .{ .access_sub_paths = true, .iterate = true, .follow_symlinks = false }); 1633 defer dest_entry_dir.close(io); 1634 var src_entry_dir = try src_dir.openDir(io, entry.name, .{ .access_sub_paths = true, .iterate = true, .follow_symlinks = false }); 1635 defer src_entry_dir.close(io); 1636 try copyDir(io, src_entry_dir, dest_entry_dir); 1637 }, 1638 else => {}, 1639 } 1640 } 1641 } 1642