╭─────────────╮ │scroll to top│ ╰─────────────╯ ╭ patch.zig ────────────────────────────────────────────────────╮ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ╰───────────────────────────────────────────────────────────────╯
🬐 🬠 🬞🬂🬏 🬟 🬑 🬟 🬑 ╭216b387a..╮ 216b387a.. see-em: 🬋🬋🬋 🬋🬋🬋 🬋 🬋 │files │ commits refs discuss issues new login 🬐 🬠 🬐 🬠 🬑 🬟 🬰 ╰──────────╯ (583) 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
1270 // read the original revision commit and author. 1271 var fork_repo_moment = if (fork_repo) |repo| try repo.core.latestMoment() else moment.readOnly(); 1272 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 } }; 1273 var event_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 1274 if (revision.event_oid.len != event_oid.len) return false; 1275 @memcpy(&event_oid, revision.event_oid); 1276 var event_object = try obj.Object(.xit, repo_opts).initCommit(fork_state, io, allocator, &event_oid); 1277 defer event_object.deinit(); 1278 const original_author = try commitAuthor(event_object.content.commit.metadata.author orelse return false); 1279 1280 // retain the submitted revision if the target has not imported it yet. 1281 var events_buffer: [3]evt.EventWithId = undefined; 1282 var events: std.ArrayList(evt.EventWithId) = .initBuffer(&events_buffer); 1283 var tree_entries: [2]evt.EventTreeEntry = undefined; 1284 const needs_import = if (current_revision) |existing| existing.removed else true; 1285 if (needs_import) { 1286 tree_entries = .{ 1287 .{ .tree = .{ .name = "base", .oid = revision.base_tree_oid } }, 1288 .{ .tree = .{ .name = "head", .oid = revision.head_tree_oid } }, 1289 }; 1290 events.appendAssumeCapacity(.{ 1291 .id = selected.id, 1292 .timestamp = event_object.content.commit.metadata.timestamp, 1293 .author = original_author, 1294 .tree_entries = &tree_entries, 1295 .event = .{ .patchrev = revision.event }, 1296 }); 1297 } else { 1298 const existing = current_revision orelse unreachable; 1299 if (!selected.matches(existing)) return error.InvalidPatch; 1300 } 1301 1302 // snapshot the merge result and mark the patch as merged. 1303 { 1304 const author = merged_author orelse original_author; 1305 const timestamp = if (merged_author != null) merged_timestamp else @as(u64, @intCast(std.Io.Timestamp.now(io, .real).toSeconds())); 1306 var patch = patch_record.event; 1307 const result = try evt.PatchRev.prepare(.xit, repo_opts, state, io, &arena, merged.before_oid, merged.after_oid, patch.title, author, timestamp); 1308 events.appendAssumeCapacity(result.event); 1309 patch.status = .{ .merged = .{ .revision = merged.revision, .patchrev_id = result.event.id } }; 1310 events.appendAssumeCapacity(.{ 1311 .id = std.fmt.bytesToHex(patch_id.*, .lower), 1312 .timestamp = timestamp, 1313 .author = author, 1314 .event = .{ .patch = patch }, 1315 }); 1316 } 1317 1318 // commit and consume the revision and patch events together. 1319 try evt.commitEvents(.xit, repo_opts, state, io, allocator, evt.events_ref, events.items, null); 1320 if (!try evt.consumeInTransaction(.repo, .xit, repo_opts, state, db, moment, io, allocator, evt.events_ref)) return error.CancelTransaction; 1321 return true; 1322 } 1323 1324 // find patches merged by commits received in a push 1325 pub fn detectMerged( 1326 comptime repo_opts: rp.RepoOpts(.xit), 1327 state: rp.Repo(.xit, repo_opts).State(.read_write), 1328 db: *evt.EventDB(repo_opts.hash), 1329 moment: *evt.EventDB(repo_opts.hash).HashMap(.read_write), 1330 io: std.Io, 1331 allocator: std.mem.Allocator, 1332 repo_root_path: []const u8, 1333 updates: []const xit.net_server_receive_pack.AppliedRefUpdate, 1334 error_writer: *std.Io.Writer, 1335 ) !void { 1336 const DB = evt.EventDB(repo_opts.hash); 1337 var arena = std.heap.ArenaAllocator.init(allocator); 1338 defer arena.deinit(); 1339 1340 // read the revision index used to identify merged patches. 1341 const haxy_moment = try evt.currentMomentFromRepoMoment(repo_opts.hash, moment.readOnly()); 1342 const revisions_cursor = try haxy_moment.getCursor(hash.hashInt(repo_opts.hash, evt.Patch.revision_to_id_set_key)) orelse return; 1343 const revisions = try DB.HashMap(.read_only).init(revisions_cursor); 1344 1345 // ignore event refs and inspect only changed branch tips. 1346 var events_ref_buffer: [rf.MAX_REF_CONTENT_SIZE]u8 = undefined; 1347 const events_ref_path = try evt.events_ref.toPath(&events_ref_buffer); 1348 const heads_prefix = "refs/heads/"; 1349 for (updates) |update| { 1350 if (!std.mem.startsWith(u8, update.ref_name, heads_prefix) or 1351 std.mem.eql(u8, update.ref_name, events_ref_path) or 1352 std.mem.eql(u8, update.old_oid, update.new_oid)) continue; 1353 1354 // validate the ref tips and skip branch deletions. 1355 if (update.old_oid.len != hash.hexLen(repo_opts.hash) or 1356 update.new_oid.len != hash.hexLen(repo_opts.hash)) return error.InvalidOid; 1357 var old_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 1358 var new_oid: [hash.hexLen(repo_opts.hash)]u8 = undefined; 1359 @memcpy(&old_oid, update.old_oid); 1360 @memcpy(&new_oid, update.new_oid); 1361 if (std.mem.allEqual(u8, &new_oid, '0')) continue; 1362 1363 // traverse commits introduced by this branch update. 1364 var commits = try obj.ObjectIterator(.xit, repo_opts).init(state.readOnly(), io, arena.allocator(), .{ .kind = .commit }); 1365 defer commits.deinit(); 1366 if (!std.mem.allEqual(u8, &old_oid, '0')) try commits.exclude(&old_oid); 1367 var targets: std.ArrayList(struct { 1368 before_oid: [hash.hexLen(repo_opts.hash)]u8, 1369 after_oid: [hash.hexLen(repo_opts.hash)]u8, 1370 }) = .empty; 1371 1372 // collect merge boundaries along the target's first-parent history. 1373 { 1374 var first_parents = try obj.ObjectIterator(.xit, repo_opts).init(state.readOnly(), io, arena.allocator(), .{ .kind = .commit, .first_parent = true }); 1375 defer first_parents.deinit(); 1376 if (!std.mem.allEqual(u8, &old_oid, '0')) try first_parents.exclude(&old_oid); 1377 try first_parents.include(&new_oid); 1378 while (try first_parents.next(arena.allocator())) |commit| { 1379 defer commit.deinit(); 1380 try targets.append(arena.allocator(), .{ 1381 .before_oid = (commit.content.commit.metadata.firstParent() orelse &old_oid).*, 1382 .after_oid = commit.oid, 1383 }); 1384 } 1385 } 1386 1387 // visit target commits oldest first, attributing each revision to the 1388 // commit that introduced it; the shared iterator visits each ancestor once 1389 var revision_key_buffer: [rf.MAX_REF_CONTENT_SIZE + 1 + hash.hexLen(repo_opts.hash)]u8 = undefined; 1390 while (targets.pop()) |target| { 1391 try commits.include(&target.after_oid); 1392 while (try commits.next(arena.allocator())) |commit| { 1393 defer commit.deinit(); 1394 1395 // find patches whose selected revision matches this commit. 1396 const key = try std.fmt.bufPrint(&revision_key_buffer, "{s}\x00{s}", .{ update.ref_name[heads_prefix.len..], &commit.oid }); 1397 const ids_cursor = try revisions.getCursor(hash.hashInt(repo_opts.hash, key)) orelse continue; 1398 const ids = try DB.CountedHashSet(.read_only).init(ids_cursor); 1399 var ids_iter = try ids.iterator(); 1400 while (try ids_iter.next()) |cursor| { 1401 const pair = try cursor.readKeyValuePair(); 1402 var patch_id: [evt.event_id_size]u8 = undefined; 1403 if ((try pair.key_cursor.readBytes(&patch_id)).len != patch_id.len) return error.InvalidPatch; 1404 const patch_hex = std.fmt.bytesToHex(patch_id, .lower); 1405 1406 // a fast-forward has no recorded merge boundary; use the old ref tip 1407 const before_oid = if (std.mem.eql(u8, &commit.oid, &target.after_oid)) &old_oid else &target.before_oid; 1408 importMerged(repo_opts, state, db, moment, io, allocator, repo_root_path, &patch_id, &commit.oid, before_oid, &target.after_oid) catch |err| { 1409 serve_common.logError(io, error_writer, "failed to mark patch {s} as merged: {s}\n", .{ &patch_hex, @errorName(err) }); 1410 continue; 1411 }; 1412 } 1413 } 1414 } 1415 } 1416 } 1417