╭─────────────╮ │scroll to top│ ╰─────────────╯ ╭ patch.zig ────────────────────────────────────────────────────╮ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ╰───────────────────────────────────────────────────────────────╯
🬐 🬠 🬞🬂🬏 🬟 🬑 🬟 🬑 ╭89200f97..╮ 89200f97.. see-em: 🬋🬋🬋 🬋🬋🬋 🬋 🬋 │files │ commits refs discuss issues new login 🬐 🬠 🬐 🬠 🬑 🬟 🬰 ╰──────────╯ (623) 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 ╭─────────────────────────────────╮ │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
1302 // open the fork when the revision is not stored in the target repository. 1303 var fork_repo_maybe: ?rp.Repo(.xit, repo_opts) = if (record.event.source_branch != null) null else blk: { 1304 var config = try xit.config.Config(.xit, repo_opts).init(state.readOnly(), io, allocator); 1305 defer config.deinit(); 1306 const forker_id = (try fork.readForkerId(&config.sections, patch_id)) orelse return error.PatchDataUnavailable; 1307 const fork_path = try fork.forkPath(arena.allocator(), users_dir, &forker_id, patch_id); 1308 break :blk try rp.Repo(.xit, repo_opts).open(io, allocator, .{ .path = fork_path, .require_repo_root = true }); 1309 }; 1310 defer if (fork_repo_maybe) |*repo| repo.deinit(io, allocator); 1311 1312 // import the revision and record the client-side merge. 1313 _ = try importMergedRevision(repo_opts, state, db, moment, io, allocator, if (fork_repo_maybe) |*repo| repo else null, patch_id, .{ .revision = revision, .before_oid = before_oid, .after_oid = after_oid }, null, null, 0); 1314 } 1315 1316 // import the revision and mark its patch merged in the current transaction 1317 fn importMergedRevision( 1318 comptime repo_opts: rp.RepoOpts(.xit), 1319 state: rp.Repo(.xit, repo_opts).State(.read_write), 1320 db: *evt.EventDB(repo_opts.hash), 1321 moment: *evt.EventDB(repo_opts.hash).HashMap(.read_write), 1322 io: std.Io, 1323 allocator: std.mem.Allocator, 1324 fork_repo: ?*rp.Repo(.xit, repo_opts), 1325 patch_id: *const [evt.event_id_size]u8, 1326 merged: struct { 1327 revision: evt.Patch.MergeRevision, 1328 before_oid: *const [hash.hexLen(repo_opts.hash)]u8, 1329 after_oid: *const [hash.hexLen(repo_opts.hash)]u8, 1330 }, 1331 expected_patch: ?evt.Patch, 1332 merged_author: ?evt.CommitAuthor, 1333 merged_timestamp: u64, 1334 ) !bool { 1335 const DB = evt.EventDB(repo_opts.hash); 1336 var arena = std.heap.ArenaAllocator.init(allocator); 1337 defer arena.deinit(); 1338 1339 // read the patch and reject outdated or conflicting merge requests. 1340 const haxy_moment = try evt.currentMomentFromRepoMoment(repo_opts.hash, moment.readOnly()); 1341 const patch_record = (try evt.Patch.readById(DB, repo_opts.hash, haxy_moment, &arena, patch_id)) orelse return false; 1342 const selected = patch_record.event.revision orelse return false; 1343 if (patch_record.removed or patch_record.event.status.kind() == .merged) return false; 1344 if (expected_patch) |expected| { 1345 if (!evt.fieldEqual(evt.Patch, expected, patch_record.event)) return false; 1346 if (try haxy_moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.conflicts_key))) |cursor| { 1347 const conflicts = try DB.SortedMap(.read_only).init(cursor); 1348 if (try conflicts.getCursor(&evt.orderKeyDesc(patch_record.created_order, patch_id)) != null) return false; 1349 } 1350 } 1351 const revision_id = try evt.parseEventId(&selected.id); 1352 1353 // resolve the selected revision from the target or its fork. 1354 const current_revision = try evt.PatchRev.readById(DB, repo_opts.hash, haxy_moment, &arena, &revision_id); 1355 const revision = (if (fork_repo) |repo| 1356 try evt.PatchRev.readById(DB, repo_opts.hash, try evt.currentMoment(repo_opts, repo), &arena, &revision_id) 1357 else 1358 current_revision) orelse return false; 1359 if (!selected.matches(revision)) return false; 1360 1361 // read the original revision commit and author. 1362 var fork_repo_moment = if (fork_repo) |repo| try repo.core.latestMoment() else moment.readOnly(); 1363 const fork_state = rp.Repo(.xit, repo_opts).State(.read_only){ .core = if (fork_repo) |repo| &repo.core else state.core, .extra = .{ .moment = &fork_repo_moment } }; 1364 var event_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 1365 if (revision.event_oid.len != event_oid.len) return false; 1366 @memcpy(&event_oid, revision.event_oid); 1367 var event_object = try obj.Object(.xit, repo_opts).initCommit(fork_state, io, allocator, &event_oid); 1368 defer event_object.deinit(); 1369 const original_author = try commitAuthor(event_object.content.commit.metadata.author orelse return false); 1370 1371 // retain the submitted revision if the target has not imported it yet. 1372 var events_buffer: [3]evt.EventWithId = undefined; 1373 var events: std.ArrayList(evt.EventWithId) = .initBuffer(&events_buffer); 1374 var tree_entries: [2]evt.EventTreeEntry = undefined; 1375 const needs_import = if (current_revision) |existing| existing.removed else true; 1376 if (needs_import) { 1377 tree_entries = .{ 1378 .{ .tree = .{ .name = "base", .oid = revision.base_tree_oid } }, 1379 .{ .tree = .{ .name = "head", .oid = revision.head_tree_oid } }, 1380 }; 1381 events.appendAssumeCapacity(.{ 1382 .id = selected.id, 1383 .timestamp = event_object.content.commit.metadata.timestamp, 1384 .author = original_author, 1385 .tree_entries = &tree_entries, 1386 .event = .{ .patchrev = revision.event }, 1387 }); 1388 } else { 1389 const existing = current_revision orelse unreachable; 1390 if (!selected.matches(existing)) return error.InvalidPatch; 1391 } 1392 1393 // snapshot the merge result and mark the patch as merged. 1394 { 1395 const author = merged_author orelse original_author; 1396 const timestamp = if (merged_author != null) merged_timestamp else @as(u64, @intCast(std.Io.Timestamp.now(io, .real).toSeconds())); 1397 var patch = patch_record.event; 1398 const result = try evt.PatchRev.prepare(.xit, repo_opts, state, io, &arena, merged.before_oid, merged.after_oid, patch.title, author, timestamp); 1399 events.appendAssumeCapacity(result.event); 1400 patch.status = .{ .merged = .{ .revision = merged.revision, .patchrev_id = result.event.id } }; 1401 events.appendAssumeCapacity(.{ 1402 .id = std.fmt.bytesToHex(patch_id.*, .lower), 1403 .timestamp = timestamp, 1404 .author = author, 1405 .event = .{ .patch = patch }, 1406 }); 1407 } 1408 1409 // commit and consume the revision and patch events together. 1410 try evt.commitEvents(.xit, repo_opts, state, io, allocator, evt.events_ref, events.items, null); 1411 if (!try evt.consumeInTransaction(.repo, .xit, repo_opts, state, db, moment, io, allocator, evt.events_ref)) return error.CancelTransaction; 1412 return true; 1413 } 1414 1415 // find patches merged by commits received in a push 1416 pub fn detectMerged( 1417 comptime repo_opts: rp.RepoOpts(.xit), 1418 state: rp.Repo(.xit, repo_opts).State(.read_write), 1419 db: *evt.EventDB(repo_opts.hash), 1420 moment: *evt.EventDB(repo_opts.hash).HashMap(.read_write), 1421 io: std.Io, 1422 allocator: std.mem.Allocator, 1423 users_dir: []const u8, 1424 updates: []const xit.net_server_receive_pack.AppliedRefUpdate, 1425 error_writer: *std.Io.Writer, 1426 ) !void { 1427 const DB = evt.EventDB(repo_opts.hash); 1428 var arena = std.heap.ArenaAllocator.init(allocator); 1429 defer arena.deinit(); 1430 1431 // read the revision index used to identify merged patches. 1432 const haxy_moment = try evt.currentMomentFromRepoMoment(repo_opts.hash, moment.readOnly()); 1433 const revisions_cursor = try haxy_moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.revision_to_id_set_key)) orelse return; 1434 const revisions = try DB.HashMap(.read_only).init(revisions_cursor); 1435 1436 // ignore event refs and inspect only changed branch tips. 1437 var events_ref_buffer: [rf.MAX_REF_CONTENT_SIZE]u8 = undefined; 1438 const events_ref_path = try evt.events_ref.toPath(&events_ref_buffer); 1439 const heads_prefix = "refs/heads/"; 1440 for (updates) |update| { 1441 if (!std.mem.startsWith(u8, update.ref_name, heads_prefix) or 1442 std.mem.eql(u8, update.ref_name, events_ref_path) or 1443 std.mem.eql(u8, update.old_oid, update.new_oid)) continue; 1444 1445 // validate the ref tips and skip branch deletions. 1446 if (update.old_oid.len != hash.hexLen(repo_opts.hash) or 1447 update.new_oid.len != hash.hexLen(repo_opts.hash)) return error.InvalidOid; 1448 var old_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 1449 var new_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 1450 @memcpy(&old_oid, update.old_oid); 1451 @memcpy(&new_oid, update.new_oid); 1452 if (std.mem.allEqual(u8, &new_oid, '0')) continue; 1453 1454 // traverse commits introduced by this branch update. 1455 var commits = try obj.ObjectIterator(.xit, repo_opts).init(state.readOnly(), io, arena.allocator(), .{ .kind = .commit }); 1456 defer commits.deinit(); 1457 if (!std.mem.allEqual(u8, &old_oid, '0')) try commits.exclude(&old_oid); 1458 var targets: std.ArrayList(struct { 1459 before_oid: [hash.hexLen(repo_opts.hash)]u8, 1460 after_oid: [hash.hexLen(repo_opts.hash)]u8, 1461 }) = .empty; 1462 1463 // collect merge boundaries along the target's first-parent history. 1464 { 1465 var first_parents = try obj.ObjectIterator(.xit, repo_opts).init(state.readOnly(), io, arena.allocator(), .{ .kind = .commit, .first_parent = true }); 1466 defer first_parents.deinit(); 1467 if (!std.mem.allEqual(u8, &old_oid, '0')) try first_parents.exclude(&old_oid); 1468 try first_parents.include(&new_oid); 1469 while (try first_parents.next(arena.allocator())) |commit| { 1470 defer commit.deinit(); 1471 try targets.append(arena.allocator(), .{ 1472 .before_oid = (commit.content.commit.metadata.firstParent() orelse &old_oid).*, 1473 .after_oid = commit.oid, 1474 }); 1475 } 1476 } 1477 1478 // visit target commits oldest first, attributing each revision to the 1479 // commit that introduced it; the shared iterator visits each ancestor once 1480 var revision_key_buffer: [rf.MAX_REF_CONTENT_SIZE + 1 + hash.hexLen(repo_opts.hash)]u8 = undefined; 1481 while (targets.pop()) |target| { 1482 try commits.include(&target.after_oid); 1483 while (try commits.next(arena.allocator())) |commit| { 1484 defer commit.deinit(); 1485 1486 // find patches whose selected revision matches this commit. 1487 const key = try std.fmt.bufPrint(&revision_key_buffer, "{s}\x00{s}", .{ update.ref_name[heads_prefix.len..], &commit.oid }); 1488 const ids_cursor = try revisions.getCursor(hash.hashInt(repo_opts.hash, key)) orelse continue; 1489 const ids = try DB.CountedHashSet(.read_only).init(ids_cursor); 1490 var ids_iter = try ids.iterator(); 1491 while (try ids_iter.next()) |cursor| { 1492 const pair = try cursor.readKeyValuePair(); 1493 var patch_id: [evt.event_id_size]u8 = undefined; 1494 if ((try pair.key_cursor.readBytes(&patch_id)).len != patch_id.len) return error.InvalidPatch; 1495 const patch_hex = std.fmt.bytesToHex(patch_id, .lower); 1496 1497 // a fast-forward has no recorded merge boundary; use the old ref tip 1498 const before_oid = if (std.mem.eql(u8, &commit.oid, &target.after_oid)) &old_oid else &target.before_oid; 1499 importMerged(repo_opts, state, db, moment, io, allocator, users_dir, &patch_id, &commit.oid, before_oid, &target.after_oid) catch |err| { 1500 serve_common.logError(io, error_writer, "failed to mark patch {s} as merged: {s}\n", .{ &patch_hex, @errorName(err) }); 1501 continue; 1502 }; 1503 } 1504 } 1505 } 1506 } 1507 } 1508