Repository navigation
v.util: improve code related to diff tool specified via environment, add check if the diff tool exists - #21240
Merged
Merged
Conversation
…check if command exists
ttytm
changed the title
spytheman
changed the title
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
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.
The PR works on the
util.diffmodule's code related to theVDIFF_TOOLenvironment variable.It cleans up to help with maintainability and slightly extends by adding an error that should improve usability.
Regarding the changes:
At the beginning of the function we already checked if there is an
env_difftooland return early. Howenv_difftoolwas used after this in the function, was quasi dead code.v/vlib/v/util/diff/diff.v
Lines 11 to 13 in 4dcc926
Then, instead of just returning the strings specified in the environment string it is also ensured here that specified command is executable. If not an error is returned to the user. E.g. when it isn't installed or if a typo or something.