POC for GitBackend opening worktrees #4801
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We want to check for colocated workspaces in the GitBackend initialization code. So it has to move to jj_lib.
This does the plumbing but does not actually use it.
- Save the colocation warning on GitBackend - try reopening as colocated during GitBackend::init_external, in addition to during ::load - Open the workspace root if colocated in GitBackend::load
This is just so incredibly hacky. Proof of concept only.
This is very haphazard.
No longer necessary. GitBackend has already opened the correct repo. So we may simply get the store's git backend and read the HEAD from it. We do NOT remove the repository parameter from git::reset_head, because: - it has had this param since before the worktree code came around - it still uses `git2::Repository` and judging from a token attempt, converting this code is a lot of work. But, at least in theory, git::reset_head can just use the `gix::Repository` on the GitBackend.
cormacrelf
force-pushed
the
workspace-colocate-minimal
branch
from
1f362de
to
ba0823a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Just to illustrate what #4644 could do differently. See discussion there.
Checklist
If applicable:
CHANGELOG.md