external_merge: pass the repo_path to the merge tool #7292
+9
−1
Conversation
This file contains hidden or 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
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
This follows Git's merge driver interface which makes this information available using the `%P` variable. It is useful for merge drivers to adapt their behaviour based on the type of file supplied.
|
@jj-vcs/maintainers can someone please have a look? I like it and the implementation seems quite reasonable to me |
bnjmnt4n
approved these changes
Sep 5, 2025
yuja
reviewed
Sep 6, 2025
| @@ -253,6 +253,7 @@ fn run_mergetool_external_single_file( | |||
| }) | |||
| .try_collect()?; | |||
| variables.insert("marker_length", conflict_marker_len.to_string()); | |||
| variables.insert("repo_path", repo_path.as_internal_file_string().to_string()); | |||
There was a problem hiding this comment.
Can you update/add test in test_resolve_command.rs to include $repo_path or $path?
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.
This follows Git's merge driver interface which makes this information available using the
%Pvariable. It is useful for merge drivers to adapt their behaviour based on the type of file supplied.The motivation for this is that Mergiraf uses this information to determine the format of the file and parse its revisions accordingly. When the file format is determined by the file extension only, there is no need for this extra information as the file names of the base, left and right revisions will still have this extension (such as
base_main.rs,left_main.rs,right_main.rs). But for files where the format is recognized by matching the entire file name, this will not work:base_Makefileisn't recognized on its own. However, when-p src/Makefileis provided, the tool is able to pick the right parsers.Checklist
If applicable:
CHANGELOG.mdREADME.md,docs/,demos/)cli/src/config-schema.json)