merge_tools: extract tool configuration from invocation path #3172
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
approved these changes
Mar 1, 2024
There was a problem hiding this comment.
Because the snapshot directory will be removed soon
Do you mean that you're changing how the merge tools run so we don't create the temporary working copies? For external merge tools too? Or did we create the temporary working copies for the builtin tool too?
Oops, I just meant the directory is removed at the end of the function call. I'll update the commit message. |
…y snapshot Because the snapshot directory is removed at the end of the function, it doesn't make sense to enable watchman in it. The max_new_file_size parameter might be somewhat useful, but it's unlikely that the temporary directory contains gigantic node_modules tree for example. OTOH, the base_ignores matters since it may contain common ignore patterns like *~. This eliminates most of the UserSettings dependencies from this function.
This clarifies that the instructions text can be omitted. All callers appear to pass non-empty instructions, though.
This gets rid of the last UserSettings dependency from edit_diff_external(). I'm going to remove it from edit_diff() too, and let callers pass a preconfigured MergeTool struct instead. These changes will make it easier to add --tool=<name> argument jj-vcs#2575.
I'm going to make them be loaded by caller, and these newtypes will provide extra compile-time safety (plus nicer API to be added later.) The error types will be cleaned up later patches.
This moves the config loading closer to CLI args where --tool=<name> option will be processed. The factory function are proxied through the command helper so that the base_ignores can be attached there later.
write!(ui.hint(), ..) error is suppressed because it seemed weird if the configuration error had io::Error variant. The write error isn't important anyway.
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.
Prep for #2575.
Checklist
If applicable:
CHANGELOG.md