╭─────────────╮ │scroll to top│ ╰─────────────╯ ╭ try.zig ──────────────────────────────────────────────────────╮ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ╰───────────────────────────────────────────────────────────────╯
╭────╮ ╭ clone ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ╮ │http│ ssh │ │ ╰────╯ ╰ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ╯
1184 .parent_id = switch (i) { 1185 0, 1 => std.fmt.bytesToHex(patch_ids[patch_ids.len - 1], .lower), 1186 2, 4 => std.fmt.bytesToHex(comment_ids[0], .lower), 1187 3 => std.fmt.bytesToHex(comment_ids[2], .lower), 1188 else => unreachable, 1189 }, 1190 .body = comment_bodies[i], 1191 } }, 1192 }; 1193 } 1194 try evt.consume(.repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &comments); 1195 1196 // create divergent metadata edits on the next three patches 1197 var patch_arena = std.heap.ArenaAllocator.init(allocator); 1198 defer patch_arena.deinit(); 1199 const moment = try evt.currentMoment(.{}, target_repo); 1200 var values: [3]evt.Patch = undefined; 1201 for (1..4) |i| { 1202 const record = (try evt.Patch.readById(evt.EventDB(.sha1), .sha1, moment, &patch_arena, &patch_ids[i])) orelse return error.NotFound; 1203 values[i - 1] = record.event; 1204 } 1205 var ours_values = values; 1206 ours_values[0].title = "Drop the legacy configuration loader"; 1207 ours_values[0].tags = "cleanup config breaking"; 1208 const closed_description = try longDescription( 1209 patch_arena.allocator(), 1210 "Cache parsed manifests for the lifetime of a command invocation and invalidate entries when their files change.", 1211 ); 1212 ours_values[1].description = closed_description; 1213 ours_values[2].description = "Add JSON output to inspect with versioned field names and deterministic object ordering."; 1214 var theirs_values = values; 1215 theirs_values[0].title = "Delete compatibility configuration support"; 1216 theirs_values[0].tags = "config maintenance"; 1217 theirs_values[1].description = "Keep a process-wide manifest cache shared by every command and refresh it after writes."; 1218 theirs_values[2].description = "Expose inspect results as newline-delimited JSON so callers can stream large repositories."; 1219 1220 const seed_tip = (try target_repo.readRef(io, evt.events_ref)) orelse return error.NotFound; 1221 const other_ref = xit.ref.Ref{ .kind = .head, .name = "haxy/patch-other" }; 1222 var ours = [_]evt.EventWithId{ 1223 .{ 1224 .id = std.fmt.bytesToHex(patch_ids[1], .lower), 1225 .timestamp = 800, 1226 .author = .{ .name = "alice", .email = "alice@example.test" }, 1227 .event = .{ .patch = ours_values[0] }, 1228 }, 1229 .{ 1230 .id = std.fmt.bytesToHex(patch_ids[2], .lower), 1231 .timestamp = 801, 1232 .author = .{ .name = "alice", .email = "alice@example.test" }, 1233 .event = .{ .patch = ours_values[1] }, 1234 }, 1235 .{ 1236 .id = std.fmt.bytesToHex(patch_ids[3], .lower), 1237 .timestamp = 802, 1238 .author = .{ .name = "alice", .email = "alice@example.test" }, 1239 .event = .{ .patch = ours_values[2] }, 1240 }, 1241 }; 1242 1243 var theirs = ours; 1244 theirs[0].timestamp = 810; 1245 theirs[0].author = .{ .name = "bob", .email = "bob@example.test" }; 1246 theirs[0].event.patch = theirs_values[0]; 1247 theirs[1].timestamp = 811; 1248 theirs[1].author = .{ .name = "bob", .email = "bob@example.test" }; 1249 theirs[1].event.patch = theirs_values[1]; 1250 theirs[2].timestamp = 812; 1251 theirs[2].author = .{ .name = "bob", .email = "bob@example.test" }; 1252 theirs[2].event.patch = theirs_values[2]; 1253 1254 try evt.consume(.repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &ours); 1255 var json: std.Io.Writer.Allocating = .init(allocator); 1256 defer json.deinit(); 1257 for (theirs, 0..) |event, i| { 1258 json.clearRetainingCapacity(); 1259 try std.json.Stringify.value(event, .{}, &json.writer); 1260 const author = try std.fmt.allocPrint(allocator, "{s} <{s}>", .{ event.author.name, event.author.email }); 1261 defer allocator.free(author); 1262 _ = try target_repo.commitAtRef(io, allocator, .{ 1263 .author = author, 1264 .message = json.written(), 1265 .timestamp = event.timestamp, 1266 .parent_oids = if (i == 0) &.{seed_tip} else null, 1267 }, null, other_ref); 1268 } 1269 { 1270 var to_events = try target_repo.switchDir(io, allocator, .{ .target = .{ .ref = evt.events_ref } }); 1271 defer to_events.deinit(); 1272 } 1273 { 1274 var merge = try target_repo.merge(io, allocator, .{ .kind = .full, .action = .{ .new = .{ .source = &.{.{ .ref = other_ref }} } } }, null); 1275 defer merge.deinit(); 1276 if (merge.result != .success) return error.MergeFailed; 1277 } 1278 { 1279 var to_master = try target_repo.switchDir(io, allocator, .{ .target = .{ .ref = .{ .kind = .head, .name = "master" } } }); 1280 defer to_master.deinit(); 1281 } 1282 try target_repo.removeBranch(io, .{ .name = other_ref.name }); 1283 try evt.consume(.repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &.{}); 1284 } 1285 1286 // recursively copy the contents of src_dir into dest_dir 1287 fn copyDir(io: std.Io, src_dir: std.Io.Dir, dest_dir: std.Io.Dir) !void { 1288 var iter = src_dir.iterate(); 1289 while (try iter.next(io)) |entry| { 1290 switch (entry.kind) { 1291 .file => try src_dir.copyFile(entry.name, dest_dir, entry.name, io, .{}), 1292 .directory => { 1293 try dest_dir.createDirPath(io, entry.name); 1294 var dest_entry_dir = try dest_dir.openDir(io, entry.name, .{ .access_sub_paths = true, .iterate = true, .follow_symlinks = false }); 1295 defer dest_entry_dir.close(io); 1296 var src_entry_dir = try src_dir.openDir(io, entry.name, .{ .access_sub_paths = true, .iterate = true, .follow_symlinks = false }); 1297 defer src_entry_dir.close(io); 1298 try copyDir(io, src_entry_dir, dest_entry_dir); 1299 }, 1300 else => {}, 1301 } 1302 } 1303 } 1304