Make working copy customizable #2388
Merged
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
martinvonz
force-pushed
the
push-rprolzswrtox
branch
2 times, most recently
from
2ee7970 to
499b5ff
Compare
yuja
approved these changes
Oct 17, 2023
`ReadonlyRepo::init()` takes callbacks for initializing each kind of backend. We called these things like `op_store_initializer`. I found that confusing because it is not a `OpStoreFactory` (which is for loading an existing backend). This patch tries to clarify that by renaming the arguments and adding types for each kind of callback function.
Our internal working copy implementations at Google will need the commit so they can walk history backwards until they get to a "public" commit. They'll then use that to tell build tools and virtual file systems to present that as a base. I'm not sure if we'll need to update `reset()` too. It's currently only used by `jj untrack`, which doesn't change the commit's parent, so it wouldn't affect any history walks.
This makes `Workspace::load()` look a new `.jj/working_copy/type` file in order to load the right working copy implementation, just like `Repo::load()` picks the right backends based on `.jj/store/type`, `.jj/op_store/type`, etc. We don't write the file yet, and we don't have a way of adding alternative working copy implementations, so it will always be `LocalWorkingCopy` for now.
This add support for custom `jj` binaries to use custom working-copy backends. It works in the same way as with the other backends, i.e. we write a `.jj/working_copy/type` file when the working copy is initialized, and then we let that file control which implementation to use (see previous commit). I included an example of a (useless) working-copy implementation. I hope we can figure out a way to test the examples some day.
martinvonz
force-pushed
the
push-rprolzswrtox
branch
2 times, most recently
from
de960a8 to
b693268
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.
Checklist
If applicable:
CHANGELOG.md