OXYGENHUB

Changes up to # 0588de69a84d +3 touching crates/oxy-core/src/repo/snapshot.rs · 77

See as swimlanes (independent work side by side)

0588de69a84d807a47d1013e20ecfaffe92fa1016b3470d10807e130edbcfb94+1931724b1d6b51a8b37c7ca7769468f3bae40a66593f7fc91eeff3fb9d76aaec+8fd78eb52ad2aaac80470949fa2b6bbe79ef04a19c14b830eae56d0adcfb1f71+e4595038502a2a70b39cedbd575a9282e6ee2a50bc147b094f8f35d8519fa6d6 has 4 heads. The graph shows their union; heads are marked.
Identical conflict sides settle by themselves, keeping one, in any file (closes #146)
Andy McCall via agent:claude@andymccall agent ·
◈ c0d4075cadc0
Repo::union_resolution: a host settles a state whose conflicts are all union (refs #145) push-notes
Andy McCall via agent:claude@andymccall agent ·
◈ ac4ec124b9f2
merge=union: a checkout keeps both sides of a union file's adjacent insertions (refs #145)
Andy McCall via agent:claude@andymccall agent ·
◈ 4afe288b7946
oxy resolve --both keeps both sides of an adjacent insertion (closes #121)
Andy McCall via agent:claude@andymccall agent ·
◈ 9bd98cfb4f7e
oxy resolve PATH settles a replace conflict with the working copy's content (closes #140)
Andy McCall via agent:claude@andymccall agent ·
◈ 157d02e95586
Marker-like text no longer blocks a conflict resolution doctor-trustkeyless-tagsv0.5.0v0.5.1v0.6.0v0.7.0
Andy McCall via agent:claude@andymccall agent ·
◈ 3652104ae7d3
Commit a resolution by paths, and amend only some paths
Andy McCall via agent:claude@andymccall agent ·
◈ 69953b507188
Snapshots: large new files left out and named; past working copies expire
Andy McCall ·
✔ b689779e9e74
Remove or move every copy of a node at one place
Andy McCall ·
✔ e8e6e0cac26a
Commit without a second snapshot; the state index after a checkpoint
Andy McCall ·
✔ 7505194116e7
oxy cat builds only the file it prints
Andy McCall ·
✔ 19303b4a06fb
log --path and touches() without decoding all of history
Andy McCall ·
✔ 170bb436e1d5
A binary file's new contents and new executable bit are both kept bare-hashescarry-identicalonly-help-103switch-saysv0.4.2v0.4.3v0.4.4
Andy McCall ·
✔ 6eae06b6ec04
First commit: 12 s and 2.1 GB on the Linux tree (refs #41) agents-in-readmev0.3.0v0.3.1v0.4.0v0.4.1v0.4.2
Andy McCall ·
✔ 5b4c51307b14
Edited files are diffed in parallel (refs #41)
Andy McCall ·
✔ 360aa74a6277
A commit writes the manifest once (refs #41) agents-in-readmev0.3.0v0.3.1v0.4.0
Andy McCall ·
✔ 236f35c0baba
A commit's own snapshot records no operation (refs #41)
Andy McCall ·
✔ cd4eb55e3b3d
Fewer waits on the disk: batched loose writes, the commit in one batch, fan-outs kept (refs #41)
Andy McCall ·
✔ b30a880fa409
Commit takes a status's snapshot from the cache; the stat check lends its stats to the snapshot (refs #41)
Andy McCall ·
✔ e226a6cc2f71
Diff from the status cache: the working-copy change rendered against its indexed base (refs #41)
Andy McCall ·
✔ 77445673174b
Status with work in progress from a status cache: ahead of Git on the Linux tree (refs #41)
Andy McCall ·
✔ 3604179679eb
Projects coming from Git: .gitignore honoured, nested Git repositories named (closes #43, closes #44)
Andy McCall ·
✔ d4dbab97e948
Commit: cheaper bookkeeping around a change (refs #41)
Andy McCall ·
✔ f9466021286a
Snapshot: whole-tree passes as merge joins (refs #41)
Andy McCall ·
✔ d616faf5d136
Status: maps built in path order, fast maps for node lookups (refs #41) v0.2.0
Andy McCall ·
✔ 36e51aa806c6
Manifest as a flat binary file, hashes and graph keys as bytes (refs #41)
Andy McCall ·
✔ 1966f5db15ee
Status rewrites the manifest only when it helps, and asks keys on demand v0.1.0
Andy McCall ·
✔ 992467d31d26
A snapshot builds only the paths that may have changed v0.1.0
Andy McCall ·
✔ 23ff1288a5dd
A command parses the manifest once
Andy McCall ·
✔ d0990c2bff74
A state index for the working copy's base
Andy McCall ·
✔ f9575918477f
A new file's lines share its content v0.1.0
Andy McCall ·
✔ 40a40bb7b798
Tree views updated in place, and a faster render of edited files
Andy McCall ·
✔ e83354cdac22
A Git import commit costs what it changes
Andy McCall ·
✔ 2306a4d24779
A commit's graph keys from the state it extended v0.1.0
Andy McCall ·
✔ 8457a6cc6984
A cheaper tree view; history loads and snapshots timed finer
Andy McCall ·
✔ d0d52107b074
Git import: one node per directory path, and no placement out of sight
Andy McCall ·
✔ a87c7b9d563a
Keep an insert's lines in one shared buffer
Andy McCall ·
✔ 01a47cd7f0c8
Store a large change's texts a batch at a time
Andy McCall ·
✔ 17f94b13ae54
Encode a large change once, and store it on every core
Andy McCall ·
✔ 192fad1e46a2
Walk the working copy in parallel, and keep its stats
Andy McCall ·
✔ 8b276e0106d1
Status after a large commit without reading or holding its text
Andy McCall ·
✔ 86e1824f2d0b
Hold the working-copy lock through every working-copy write
Andy McCall ·
✔ 6caacfff1d4f
Store large inserts as text blobs (change format 2)
Andy McCall ·
✔ 6f8aeb996558
Git import: shared graphs, deterministic node ids; quieter status
Andy McCall ·
✔ dfb23a3a8cfa
Git import costs what each commit changes, not the whole tree
Andy McCall ·
✔ 958fb27dda7c
Replace conflicts are resolved by keeping a candidate
Andy McCall ·
✔ f7510b63cceb
Commit, diff and show build only what they touch
Andy McCall ·
✔ 8ab265dc4a51
Status snapshots skip files unchanged since the manifest
Andy McCall ·
✔ cc7a00565161
History-only states: log, log of a path and blame_in load changes and tree only, deferring file edits; load_graphs builds the graphs a command needs from checkpoint blobs or by replay, identical to a full load; an unloaded graph is never read as empty
Andy McCall ·
✔ e8d38e47e9d7
Stat cache for text files: a stat-clean file whose recorded hash is the base's rendering takes the base's bytes instead of being read; edits are always read (spec 12.4)
Andy McCall ·
✔ 696bbf29d3eb
older