╭─────────────╮ │scroll to top│ ╰─────────────╯ ╭ patch.zig ────────────────────────────────────────────────────╮ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ╰───────────────────────────────────────────────────────────────╯
🬐 🬠 🬞🬂🬏 🬟 🬑 🬟 🬑 ╭dd173b4d..╮ dd173b4d.. see-em: 🬋🬋🬋 🬋🬋🬋 🬋 🬋 │files │ commits refs discuss issues new login 🬐 🬠 🬐 🬠 🬑 🬟 🬰 ╰──────────╯ (624) 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
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