HAXY

▄▄ ▀▀▀▄ ▄▄ ▀▀▀▀▀▄ ▄▀▀▀▀ ▀▀▀▀▀▀ ▄▀▀▀▀▀▀ ▀▀▀▀▀▀ ▀ ▀ ▄▀▀▀▀▀▀ ▀▀▀▀▀▀ ▄▀ ▄▀ ▄▀▀▀▀▀▀▀▀ ▀▀▀▄▄ ▀▀▀▀▀▀ ▀▀ ▀▄▀▀ ▄▀ ▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▄ ▀▀▀▀▀▄ ▄▀▀▀▀▀▀▀ ▄ ▄▀▄▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▄ ▄▀▀▀▀▀▀▀▀▀▀▄ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▄ ▀ ▀▀▀▀▀▀ ▄▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀ ▄▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▄▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄ ▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄▄▄▀▀▀▀▄▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▄▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄ ▀▀▀▀▀▀▀▀▀▀▀▀▀▄▀▀▀▀▀▀▀▀▀▀▄ ▄▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▄▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄▄ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▄▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀ ▀▀▀▀▀▀▀▀▄ ▀▀▀ ▀▀▀▀▀▀▀▀ ▀▀▀ ▀▀▀ ▀▀▀▀▀ ▀▀ ▀▀▀▀▀▀ ▀▀▀▄▀▄ ▄▄▄▀▀ ▀▀▀▀▀▀ ▀▀▄▀▀▀▀▀▀▀ ▀▀▀▀▀▄▀▀▀▀▀ ▀▀▀▀▀▄ ▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▄▀ ▄▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀ ▀

╭ changed ──╮ │src/try.zig│ ╰───────────╯ ╭───────────╮ │← all files│ ╰───────────╯ ╭──────────╮ │← previous│ ╰──────────╯ ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │1194 .{ │ │1195 .title = "Add structured output to the inspect command", │ │1196 - .description = "Add a stable JSON representation of inspect results for scripts and editor integrations.", │ │1196 + .description = "Add a stable JSON representation of `inspect` results for scripts and editor integrations.",│ │1197 .labels = "enhancement cli", │ │1198 .status = .open, │ │1199 }, │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │1200 .{ │ │1201 .title = "Edit an adjacent line in alpha.txt", │ │1202 - .description = "This patch can be cleanly merged by haxy, while git throws a merge conflict!", │ │1202 + .description = "This patch can be cleanly merged by haxy, while git throws a **merge conflict**!",│ │1203 .labels = "merge", │ │1204 .status = .open, │ │1205 .alpha_edit = .{ .line = 2, .text = "adjust alpha beside the latest scatter edit" }, │ ╰────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │1206 }, │ │1207 .{ │ │1208 .title = "Edit a conflicting line in alpha.txt", │ │1209 - .description = "Both source and squash merges conflict with a different edit to the same line on master.", │ │1209 + .description = "Both source and squash merges conflict with a different edit to the *same line* on master.",│ │1210 .labels = "merge", │ │1211 .status = .open, │ │1212 .alpha_edit = .{ .line = 3, .text = "replace alpha with a conflicting edit" }, │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │1294 var comment_ids: [5][evt.event_id_size]u8 = undefined; │ │1295 for (&comment_ids) |*id| id.* = evt.EventWithId.randomId(random); │ │1296 const comment_bodies = [_][]const u8{ │ │1297 - "This also needs to preserve the executable bit for files nested inside generated directories.", │ │1298 - "I tested the archive path and the direct-copy path; both currently lose the mode.", │ │1299 - "The archive writer is the right place to centralize it, since every exporter already goes through that layer.", │ │1300 - "Please include a regression fixture with a mix of executable and ordinary files.", │ │1301 - "I'll add that fixture and cover both supported archive formats.", │ │1297 + "This also needs to preserve the **executable bit** for files nested inside generated directories.", │ │1298 + "I tested both paths:\n\n- the archive path\n- the direct-copy path\n\nBoth currently lose the mode.", │ │1299 + "The `ArchiveWriter` is the right place to centralize it, since every exporter already goes through that layer.",│ │1300 + "Please include a regression fixture with a *mix* of executable and ordinary files.", │ │1301 + "I'll add that fixture and cover both supported archive formats:\n\n1. tar\n2. zip", │ │1302 }; │ │1303 var comments: [comment_ids.len]evt.EventWithId = undefined; │ │1304 for (&comments, 0..) |*comment, i| { │ ╰───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │1334 ours_values[0].labels = "cleanup config breaking"; │ │1335 const closed_description = try longDescription( │ │1336 patch_arena.allocator(), │ │1337 - "Cache parsed manifests for the lifetime of a command invocation and invalidate entries when their files change.", │ │1337 + "## Summary\n\nCache parsed manifests for the lifetime of a command invocation and invalidate entries when their files change.",│ │1338 ); │ │1339 ours_values[1].description = closed_description; │ │1340 - ours_values[2].description = "Add JSON output to inspect with versioned field names and deterministic object ordering."; │ │1340 + ours_values[2].description = "Add JSON output to `inspect` with versioned field names and deterministic object ordering."; │ │1341 var theirs_values = values; │ │1342 theirs_values[0].title = "Delete compatibility configuration support"; │ │1343 theirs_values[0].labels = "config maintenance"; │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │1344 - theirs_values[1].description = "Keep a process-wide manifest cache shared by every command and refresh it after writes."; │ │1345 - theirs_values[2].description = "Expose inspect results as newline-delimited JSON so callers can stream large repositories."; │ │1344 + theirs_values[1].description = "Keep a process-wide manifest cache shared by **every** command and refresh it after writes."; │ │1345 + theirs_values[2].description = "Expose `inspect` results as newline-delimited JSON so callers can stream large repositories.";│ │1346 │ │1347 const seed_tip = (try target_repo.readRef(io, evt.events_ref)) orelse return error.NotFound; │ │1348 const other_ref = xit.ref.Ref{ .kind = .head, .name = "haxy/patch-other" }; │ ╰────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │1389 try evt.consume(.{ .server = .{ .users_dir = users_dir } }, .repo, .xit, .{}, io, allocator, target_repo, evt.events_ref, &.{}); │ │1390 try pch.writeBranchPatch(.{ .server = .{ .users_dir = users_dir } }, .xit, .{}, io, allocator, target_repo, std.fmt.bytesToHex(evt.EventWithId.randomId(random), .lower), .{│ │1391 .title = "Merge the existing feature branch", │ │1392 - .description = "This patch tracks the feature branch in this repo without creating a fork.", │ │1392 + .description = "This patch tracks the `feature` branch in this repo without creating a fork.", │ │1393 .labels = "feature", │ │1394 .source_branch = "feature", │ │1395 .target_branch = "master", │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯