Remove deprecated reading of env vars for determining diff program#1469
Remove deprecated reading of env vars for determining diff program#1469Ahajha wants to merge 2 commits into
Conversation
My environment for whatever reason has `DISPLAY=1`, and so in diff mode I always get this warning. A whole bunch of this has been deprecated since 2019, just delete it so I can silence it.
There was a problem hiding this comment.
Code Review
This pull request simplifies the diff command selection by removing deprecated environment variables and setting the default diff command to 'diff --unified'. However, removing the Windows fallback to 'FC' will break diffing on Windows systems without bash and diff installed, so this fallback should be restored. Additionally, the documentation comment for the Find function is now outdated and should be updated, and the parentheses around its single return type should be removed to adhere to idiomatic Go formatting.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
| d.MultiDiff = md == "1" | ||
| knowMultiDiff = true | ||
| } | ||
| d.Cmd = "diff --unified" |
There was a problem hiding this comment.
Removing the Windows fallback to FC will break buildifier -mode=diff on Windows environments that do not have bash and diff installed.
When d.Cmd is set to "diff --unified", the Differ.run method attempts to execute it via /usr/bin/env bash, which is not available on standard Windows systems. Keeping the FC fallback for Windows ensures that diffing continues to work out-of-the-box on Windows.
Note: You will also need to add "runtime" back to the imports list at the top of this file.
if runtime.GOOS == "windows" {
d.Cmd = "FC"
} else {
d.Cmd = "diff --unified"
}References
- When modifying code, ensure that changes are consistent with previous behavior, especially if the previous behavior was intentional.
There was a problem hiding this comment.
Hmm, I'm not sure about this one. #520 marked this path as deprecated too, but I'm wondering the reason for making the sole Windows path here deprecated.
|
@vladmos Could you please TAL? |
My environment for whatever reason has
DISPLAY=1, and so in diff mode I always get this warning. A whole bunch of this has been deprecated since 2019, just delete it so I can silence it.