OXYGENHUB

Changes up to # 642fa213de80 +4 touching src/cli/workspace.rs · 81

See as swimlanes (independent work side by side)

642fa213de80028beaac55764ddb218936e6ee784f3c884ff7533308ec5edcf8+80b069facc699214ba6ae4ad9f9c943df79f1089d3502c4b0fe19082098b3252+8fd78eb52ad2aaac80470949fa2b6bbe79ef04a19c14b830eae56d0adcfb1f71+c0d4075cadc08ad8f82059238de1df8c82df07c5431aa1d99335d80fb1357e65+e4595038502a2a70b39cedbd575a9282e6ee2a50bc147b094f8f35d8519fa6d6 has 5 heads. The graph shows their union; heads are marked.
Identical conflict sides settle by themselves, keeping one, in any file (closes #146) head
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
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
Commit a resolution by paths, and amend only some paths
Andy McCall via agent:claude@andymccall agent ·
◈ 69953b507188
oxy show --stat: the files a change touched, with lines added and removed show-stat
Andy McCall via agent:claude@andymccall agent ·
◈ 0299076f09a2
A carried switch no longer says carried files were removed carried-not-removeddoctor-trustkeyless-tagspaths-for-resolutions-and-amendv0.5.0v0.5.1v0.6.0v0.7.0
Andy McCall via agent:claude@andymccall agent ·
◈ 44f1ebe7aa5b
Readers never wait: one head per handle, retry on a miss, retire before deleting carried-not-removeddoctor-trustmerge-remote-bookmarkpaths-for-resolutions-and-amendshow-stat
Andy McCall via agent:claude@andymccall agent ·
◈ 767ac6cd0545
Switch and checkout name the files they take off disk
Andy McCall ·
✔ 9b723f69b032
Snapshots: large new files left out and named; past working copies expire
Andy McCall ·
✔ b689779e9e74
undo: this workspace's last command, saying what it undid
Andy McCall ·
✔ 530a0fc650a2
log and the state index without needless copies
Andy McCall ·
✔ 79b5a90ffd43
Commit without a second snapshot; the state index after a checkpoint
Andy McCall ·
✔ 7505194116e7
pull: bring a working copy that fell behind up to its bookmark v0.4.2
Andy McCall ·
✔ f6dccc4533c8
Several remotes and no origin: a default, and the right comparison
Andy McCall ·
✔ 42ccf504aa50
Catch up a stale bookmark: switch, pull and carry v0.4.1
Andy McCall ·
✔ 72484195899a
bookmark: show a bookmark's heads; bookmark() in revsets
Andy McCall ·
✔ bf3a67819b59
A repository kept on a store: oxy init --store
Andy McCall ·
✔ d069701a4997
Who did the work: via AGENT in log and show, delegates by name v0.4.0
Andy McCall ·
✔ 5cde7882d767
Revsets: trust predicates, and -r on show, verify and abandon
Andy McCall ·
✔ 2c9ddac3c387
Revsets: oxy log -r selects changes by set algebra over history
Andy McCall ·
✔ 47ce8b8e2d4b
oxy gc says what it is doing
Andy McCall ·
✔ 9ae4d15a0e4b
Strata: a push lands over what landed meanwhile; oxy gc --remote agents-in-readmev0.4.0v0.4.1v0.4.2v0.4.3
Andy McCall ·
✔ d8d9367878a6
checkout BOOKMARK switches to it; workspace add takes a bookmark and its subrepos
Andy McCall ·
✔ a46f3e4f50b1
Fetch reports how each bookmark stands against the remote's copy
Andy McCall ·
✔ b35df36b7dc5
describe, amend, abandon, split, squash and rebase read only the metadata they print (refs #41) v0.3.0v0.3.1
Andy McCall ·
✔ 631fc8970bd0
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
Blame prints through one buffered lock; the tree view builds in one step (refs #41)
Andy McCall ·
✔ fddf64baa3d2
oxy log shows the working copy as last recorded, and takes milliseconds (refs #41)
Andy McCall ·
✔ 33472ccc08cc
Diff renders only the edited files and skips freeing at exit (refs #41)
Andy McCall ·
✔ 10b4fd430eab
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
Notes start with a quieter mark; a spinner's last line prints once (closes #55)
Andy McCall ·
✔ c07406bcc237
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
oxy log draws a graph: lanes, bookmarks inline, unique ID prefixes (closes #50)
Andy McCall ·
✔ 2bf22305bc48
Remote bookmarks work like local ones; a newer format names the oxy that cannot read it (closes #48, closes #49)
Andy McCall ·
✔ 14edbaaf5291
Nested repositories listed in order, and how to leave one out quietly (refs #43) v0.2.0
Andy McCall ·
✔ 69692f14b80f
Projects coming from Git: .gitignore honoured, nested Git repositories named (closes #43, closes #44)
Andy McCall ·
✔ d4dbab97e948
Rebase: --into-working-copy resolves a conflicted rebase in the working copy (closes #42)
Andy McCall ·
✔ e266b7d4065c
Log from the state index, signature marks without reading changes (refs #41)
Andy McCall ·
✔ 4cce912a0953
bookmark set asks before losing changes; rebase names the way through a conflict v0.1.0
Andy McCall ·
✔ 06d16dc2bc13
gc repacks everything into one pack, compressed harder
Andy McCall ·
✔ da652d6392d8
Log, blame and fsck at the scale of the Linux tree
Andy McCall ·
✔ 69816d688300
Switch without a snapshot when the working copy is clean
Andy McCall ·
✔ d3cd7ef95da6
Answer a clean status from the manifest alone
Andy McCall ·
✔ da868d5d2646
Refuse a bookmark at one head that leaves earlier work out
Andy McCall ·
✔ 4fe7d6045860
Build identity in oxy --version
Andy McCall ·
✔ e293c90dca62
The history of a range of lines: oxy log -L START,END:PATH
Andy McCall ·
✔ 83d61e803ccd
Commit, diff and show build only what they touch
Andy McCall ·
✔ 8ab265dc4a51
oxy describe names builds; tags name changes; commit -F
Andy McCall ·
✔ 6a81dbab471d
older