Skip to content

support DUNE_DIFF_COMMAND environment variable #5375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 31, 2022
Merged

support DUNE_DIFF_COMMAND environment variable #5375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
Unreleased
----------

- Add a `DUNE_DIFF_COMMAND` environment variable to match `--diff-command`
command-line parameter (@raphael-proust, fix #5369, #5375)

- Add support for odoc-link rules (#5045, @lubegasimon)

- Dune will no longer generate documentation for hidden modules (#5045,
Expand Down
8 changes: 5 additions & 3 deletions bin/common.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,13 +889,15 @@ let term ~default_root_is_cwd =
~env:(Arg.env_var ~doc "DUNE_BUILD_DIR")
~doc)
and+ diff_command =
let doc = "Shell command to use to diff files.\n\
\ Use - to disable printing the diff."
in
Arg.(
value
& opt (some string) None
& info [ "diff-command" ] ~docs
~doc:
"Shell command to use to diff files.\n\
\ Use - to disable printing the diff.")
~env:(Arg.env_var ~doc "DUNE_DIFF_COMMAND")
~doc)
and+ stats_trace_file =
Arg.(
value
Expand Down