OXYGENHUB

Changes up to # 34c777f8893a touching crates/oxy-core/src/repo/checkout.rs · 29

See as swimlanes (independent work side by side)

Identical conflict sides settle by themselves, keeping one, in any file (closes #146)
Andy McCall via agent:claude@andymccall agent ·
◈ c0d4075cadc0
merge=union: a checkout keeps both sides of a union file's adjacent insertions (refs #145)
Andy McCall via agent:claude@andymccall agent ·
◈ 4afe288b7946
A big tree renders many times faster, and is not rendered twice (refs #137)
Andy McCall via agent:claude@andymccall agent ·
◈ 4476cdbb0443
Switch and checkout name the files they take off disk
Andy McCall ·
✔ 9b723f69b032
A verified clean check restamps the manifest; checkout keeps directory times (refs #41)
Andy McCall ·
✔ 0389c3e82f6c
The operation log says what each operation did; op restore, op revert and --at-op; commands say where they left you (closes #51, closes #52, closes #53) v0.2.0
Andy McCall ·
✔ 98a1620a3840
Checkout: files added once are written from their text, new files written in parallel (refs #41)
Andy McCall ·
✔ 091fef80755d
Checkout through the state index; two indexes kept; racy files hashed in parallel (refs #41)
Andy McCall ·
✔ 638fb21420d7
Manifest as a flat binary file, hashes and graph keys as bytes (refs #41)
Andy McCall ·
✔ 1966f5db15ee
Tree views updated in place, and a faster render of edited files
Andy McCall ·
✔ e83354cdac22
Render a file that is one chain of lines without contracting it
Andy McCall ·
✔ 598009a75f6c
Check out against the manifest, without the base state v0.1.0
Andy McCall ·
✔ 0554aaa7ddef
Switch without a snapshot when the working copy is clean
Andy McCall ·
✔ d3cd7ef95da6
Check out only what differs, a batch at a time
Andy McCall ·
✔ c5ce0367eddf
Never move a subrepo's bookmark backwards from its parent
Andy McCall ·
✔ 1a3b62032ed9
Hold the working-copy lock through every working-copy write
Andy McCall ·
✔ 6caacfff1d4f
Merges move clean working copies; checkouts say what blocks them
Andy McCall ·
✔ 1c2bd9abdd4f
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
Portability: exec bits, symlinks and path names on macOS and Windows
Andy McCall ·
✔ c863c7a7a2d1
Unbound hosted repositories adopt the first pusher's id
Andy McCall ·
✔ 75167672ebcd
Machine interface for editors (spec 0.8b): oxy root, cat, version, hunks, discard by path or hunk; --json on log (with --path), show, diff, resolve, op log, bookmark list, remote list, fetch, pull, push, submodule status, bisect status, verify, policy show; commit --hunks; integration test over every JSON command
Andy McCall ·
✔ c6aa5bd9d1c8
Subrepositories: subrepo node kind with Oxygen and Git pins, .oxymodules, nested repositories skipped by the walker and moved by checkout, oxy submodule add|update|status|remove, Git gitlink import and export (spec 0.8 section 7.8)
Andy McCall ·
✔ 4dee277c327a
Ignore rules apply to untracked paths only: tracked files hidden by .oxyignore stay tracked in snapshots, amend, checkout manifests and the prompt
Andy McCall ·
✔ 9ac1fbe211b4
Snapshot: the manifest is a stat cache; unchanged opaque files are not read and contribute their recorded blob, with a two-second racy-stat window (status on 1 GiB 2.4 s to 4 ms; spec 0.6s)
Andy McCall ·
✔ b7f102fcbb17
Hooks: pre-commit, post-commit, pre-push, post-fetch, post-checkout with JSON payloads; semantic-deps hook behind hooks.semantic-deps (spec 0.6k)
Andy McCall ·
✔ 6d3eefbce2f0
.oxyattributes: binary, text, eol=lf|crlf, nocompress (raw chunks in packs), lockable with advisory local oxy lock/unlock (spec 0.6j)
Andy McCall ·
✔ cdb5beba7f05
Sparse checkout: filter.paths, clone --sparse (implies lazy blobs), oxy sparse, scope-aware snapshot/checkout/prompt (spec 0.6f)
Andy McCall ·
✔ 7421309f5372
Pack merging above 16 packs; modern CLI presentation (colour, spinners, --plain, NO_COLOR); oxy prompt with manifest-based dirty check and docs/prompt.md
Andy McCall ·
✔ 135212de5370
Split repo.rs into repo/{config,snapshot,checkout,identity,sync,tests}; hermetic OXY_HOME in tests; identity recorded in user config
Andy McCall ·
✔ 982864068a59