feat(vcs): jj driver, detection and process wrapper - #11373
THEjacob1000 wants to merge 587 commits into
Conversation
303457f to
c000929
Compare
c000929 to
482a6bb
Compare
|
hey @THEjacob1000 , I'd love to help out on this to get it across the line but should you not wait on #2829 to merge before any work is done? unless your base is based on that branch then I only see this being throwaway work. |
|
@omarshaarawi yeah there's like 4 PRs to get this over the line (so I'm not just merging a 12k line PR into an open source project). This one is the only one that doesn't conflict with that existing PR (the other 3 are stacked on top of 2829). EDIT: Even though it wasn't going to conflict and could actually still be based on main, it makes more sense to have all 4 PRs in the same stack from the same branch (and WAY easier to track) |
482a6bb to
a7f6227
Compare
Bugbot is paused — on-demand spend limit reachedBugbot uses usage-based billing for this team and has hit its on-demand spend limit. A team admin can raise the spend limit in the Cursor dashboard, or wait for the next billing cycle to continue. |
|
@juliusmarminge fresh take on jj against V2, following your close note on #2461. It's stacked on |
a7f6227 to
3214619
Compare
a5ebe9a to
a62d7ad
Compare
3214619 to
7b89dd4
Compare
0f32464 to
4ab2efc
Compare
7b89dd4 to
c093b11
Compare
43db598 to
6f6817f
Compare
5ff0a93 to
fd8ea2f
Compare
…g#12491) Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…d vcs kind contracts
c093b11 to
6434784
Compare
fe4f6ad to
87c67bd
Compare
|
Note 🤖 GPT-6 Astra responding on behalf of Theo We're closing this as part of a cleanup of old PRs. Thank you for the time and care you put into this contribution. The current comparison includes 1,477 files and 478,596 changed lines, with conflicts in 546 files against the target branch. Much of that comparison comes from diverged base history, beyond the change described here. The latest implementation commit is from 2026-09-20. At this point, regenerating a focused patch against the current intended base would be easier to review and maintain than updating this PR. We appreciate the problem report and the work already done; this thread will remain available as a reference. If you revisit it, please confirm the current direction with us and link a fresh, focused PR back here. |
What Changed
Bottom of a 4 PR stack for colocated jj: this, then #11382, #11383, #11384. A
JjVcsDriverbehind the existingVcsDriverRegistry, detected before git when the nearest marker is.jj, plus theJjProcesswrapper, availability check (floor jj 0.42.0), repo path resolution and avcs.kindfield on local status. CI gets asetup-jjaction.Why
The reopen Julius asked for on #2461, on the
VcsDriverfoundation from #2435 rather than a parallel subsystem like #743 and #1796. jj owns the working copy, the colocated.gitstays the object store, so diffs and hosting don't fork. A jj repo with no reachable.gitis reported unusable, not treated as git. Every jj call setsgit.abandon-unreachable-commits=falseso a status poll can't abandon commits.Nothing routes to the driver yet. Closes #1126 as a stack.
Stack
Manual evidence
Manually exercised in the installed Linux desktop app, build
2a249f8e503a(the complete stack), using disposable repositories. These captures verify the integrated stack, not each lower PR in isolation.Discovery/rescan reports Jujutsu available. A colocated repo gets bookmark controls; a non-colocated repo disables actions with the colocation explanation. Missing/old binaries, nested-repo precedence and config overrides are still untested.
Discovery and unsupported repository
Checklist
Evidence captured with Codex; test turns used GPT-6 Astra.