Skip to content
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

Jump to bottom

Avoid running a pager when running 'git diff' #3912

Merged
merged 2 commits into from
Nov 17, 2020
Merged

Avoid running a pager when running 'git diff' #3912

merged 2 commits into from
Nov 17, 2020

Conversation

AltGr
Copy link
Member

@AltGr AltGr commented Nov 3, 2020

my parallel tests hang because of this

@AltGr
Avoid running a pager when running 'git diff'
bfae536 
my parallel tests hang because of this

Signed-off-by: Louis Gesbert <[email protected]>
@nojb
Copy link
Collaborator

nojb commented Nov 3, 2020

I'm surprised by this PR; git diff never uses a pager when run under dune for me (even when I would like it to :)). Do you have a specific configuration in place?

@AltGr
Copy link
Member Author

AltGr commented Nov 3, 2020

This happened on an OSX machine with obsolete versions:

$ git --version
git version 2.17.2 (Apple Git-113)
$ diff --version
diff (GNU diffutils) 2.8.1

but I suspect this https://travis-ci.org/github/ocaml/opam/jobs/740866285 to be the same issue.

AltGr added a commit to OCamlPro/opam that referenced this pull request Nov 3, 2020
@AltGr
Fixes for reftests on OSX
e21f5d8 
TMPDIR var is required for proper sandboxing etc.
randomly it's prefixed with /private
and workaround dune running a pager through GIT_PAGER (see ocaml/dune#3912)
@rgrinberg
Copy link
Member

This seems good to me. @nojb when is it useful for for git to run the pager?

@nojb
Copy link
Collaborator

nojb commented Nov 4, 2020

This seems good to me. @nojb when is it useful for for git to run the pager?

Well, when the diff is rather big sometimes I wish I had the pager to look around. But I can see that the interaction with the rest of dune (buffering, etc) is not clear, so it is not something I am asking for :)

@AltGr
Copy link
Member Author

AltGr commented Nov 9, 2020

@nojb at least there should be checks for no concurrency (-j 1 ?) and a terminal ; it would be OK to re-enable the pager in this case I guess, but it would need more care.

aalekseyev
aalekseyev approved these changes Nov 17, 2020
View reviewed changes
Copy link
Collaborator

@aalekseyev aalekseyev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@aalekseyev aalekseyev merged commit 6350393 into ocaml:master Nov 17, 2020
rjbou pushed a commit to OCamlPro/opam that referenced this pull request Dec 3, 2020
@AltGr @rjbou
Fixes for reftests on OSX
332aebd 
TMPDIR var is required for proper sandboxing etc.
randomly it's prefixed with /private
and workaround dune running a pager through GIT_PAGER (see ocaml/dune#3912)
AltGr added a commit to AltGr/opam that referenced this pull request Dec 16, 2020
@AltGr
Fixes for reftests on OSX
9d692ae 
TMPDIR var is required for proper sandboxing etc.
randomly it's prefixed with /private
and workaround dune running a pager through GIT_PAGER (see ocaml/dune#3912)
rjbou pushed a commit to OCamlPro/opam that referenced this pull request Dec 17, 2020
@AltGr @rjbou
Fixes for reftests on OSX
8b78f88 
TMPDIR var is required for proper sandboxing etc.
randomly it's prefixed with /private
and workaround dune running a pager through GIT_PAGER (see ocaml/dune#3912)
AltGr added a commit to OCamlPro/opam that referenced this pull request Jan 11, 2021
@AltGr
Fixes for reftests on OSX
4d3b2ca 
TMPDIR var is required for proper sandboxing etc.
randomly it's prefixed with /private
and workaround dune running a pager through GIT_PAGER (see ocaml/dune#3912)
AltGr added a commit to OCamlPro/opam that referenced this pull request Jan 12, 2021
@AltGr
Fixes for reftests on OSX
9c61813 
TMPDIR var is required for proper sandboxing etc.
randomly it's prefixed with /private
and workaround dune running a pager through GIT_PAGER (see ocaml/dune#3912)
@rgrinberg rgrinberg mentioned this pull request Jan 13, 2021
Merged
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Jan 13, 2021
@rgrinberg
[new release] dune-build-info, dune, dune-configurator, dune-site, du…
dbe0014 
…ne-action-plugin, dune-private-libs and dune-glob (2.8.0)

CHANGES:

- `dune rules` accepts aliases and other non-path rules (ocaml/dune#4063, @mrmr1993)

- Action `(diff reference test_result)` now accept `reference` to be absent and
  in that case consider that the reference is empty. Then running `dune promote`
  will create the reference file. (ocaml/dune#3795, @bobot)

- Ignore special files (BLK, CHR, FIFO, SOCKET), (ocaml/dune#3570, fixes ocaml/dune#3124, ocaml/dune#3546,
  @ejgallego)

- Experimental: Simplify loading of additional files (data or code) at runtime
  in programs by introducing specific installation sites. In particular it allow
  to define plugins to be installed in these sites. (ocaml/dune#3104, ocaml/dune#3794, fixes ocaml/dune#1185,
  @bobot)

- Move all temporary files created by dune to run actions to a single directory
  and make sure that actions executed by dune also use this directory by setting
  `TMPDIR` (or `TEMP` on Windows). (ocaml/dune#3691, fixes ocaml/dune#3422, @rgrinberg)

- Fix bootstrap script with custom configuration. (ocaml/dune#3757, fixes ocaml/dune#3774, @marsam)

- Add the `executable` field to `inline_tests` to customize the compilation
  flags of the test runner executable (ocaml/dune#3747, fixes ocaml/dune#3679, @lubegasimon)

- Add `(enabled_if ...)` to `(copy_files ...)` (ocaml/dune#3756, @nojb)

- Make sure Dune cleans up the status line before exiting (ocaml/dune#3767,
  fixes ocaml/dune#3737, @alan-j-hu)

- Add `{gitlab,bitbucket}` as options for defining project sources with `source`
  stanza `(source (<host> user/repo))` in the `dune-project` file.  (ocaml/dune#3813,
  @rgrinberg)

- Fix generation of `META` and `dune-package` files when some targets (byte,
  native, dynlink) are disabled. Previously, dune would generate all archives
  for regardless of settings. (ocaml/dune#3829, ocaml/dune#4041, @rgrinberg)

- Do not run ocamldep to for single module executables & libraries. The
  dependency graph for such artifacts is trivial (ocaml/dune#3847, @rgrinberg)

- Fix cram tests inside vendored directories not being interpreted correctly.
  (ocaml/dune#3860, fixes ocaml/dune#3843, @rgrinberg)

- Add `package` field to private libraries. This allows such libraries to be
  installed and to be usable by other public libraries in the same project
  (ocaml/dune#3655, fixes ocaml/dune#1017, @rgrinberg)

- Fix the `%{make}` variable on Windows by only checking for a `gmake` binary
  on UNIX-like systems as a unrelated `gmake` binary might exist on Windows.
  (ocaml/dune#3853, @kit-ty-kate)

- Fix `$ dune install` modifying the build directory. This made the build
  directory unusable when `$ sudo dune install` modified permissions. (fix
  ocaml/dune#3857, @rgrinberg)

- Fix handling of aliases given on the command line (using the `@` and `@@`
  syntax) so as to correctly handle relative paths. (ocaml/dune#3874, fixes ocaml/dune#3850, @nojb)

- Allow link time code generation to be used in preprocessing executable. This
  makes it possible to use the build info module inside the preprocessor.
  (ocaml/dune#3848, fix ocaml/dune#3848, @rgrinberg)

- Correctly call `git ls-tree` so unicode files are not quoted, this fixes
  problems with `dune subst` in the presence of unicode files. Fixes ocaml/dune#3219
  (ocaml/dune#3879, @ejgallego)

- `dune subst` now accepts common command-line arguments such as
  `--debug-backtraces` (ocaml/dune#3878, @ejgallego)

- `dune describe` now also includes information about executables in addition to
  that of libraries. (ocaml/dune#3892, ocaml/dune#3895, @nojb)

- instrumentation backends can now receive arguments via `(instrumentation
  (backend <name> <args>))`. (ocaml/dune#3906, ocaml/dune#3932, @nojb)

- Tweak auto-formatting of `dune` files to improve readability. (ocaml/dune#3928, @nojb)

- Add a switch argument to opam when context is not default. (ocaml/dune#3951, @tmattio)

- Avoid pager when running `$ git diff` (ocaml/dune#3912, @AltGr)

- Add `(root_module ..)` field to libraries & executables. This makes it
  possible to use library dependencies shadowed by local modules (ocaml/dune#3825,
  @rgrinberg)

- Allow `(formatting ...)` field in `(env ...)` stanza to set per-directory
  formatting specification. (ocaml/dune#3942, @nojb)

- [coq] In `coq.theory`, `:standard` for the `flags` field now uses the
  flags set in `env` profile flags (ocaml/dune#3931 , @ejgallego @rgrinberg)

- [coq] Add `-q` flag to `:standard` `coqc` flags , fixes ocaml/dune#3924, (ocaml/dune#3931 , @ejgallego)

- Add support for Coq's native compute compilation mode (@ejgallego, ocaml/dune#3210)

- Add a `SUFFIX` directive in `.merlin` files for each dialect with no
  preprocessing, to let merlin know of additional file extensions (ocaml/dune#3977,
  @vouillon)

- Stop promoting `.merlin` files. Write per-stanza Merlin configurations in
  binary form. Add a new subcommand `dune ocaml-merlin` that Merlin can use to
  query the configuration files. The `allow_approximate_merlin` option is now
  useless and deprecated. Dune now conflicts with `merlin < 3.4.0` and
  `ocaml-lsp-server < 1.3.0` (ocaml/dune#3554, @voodoos)

- Configurator: fix a bug introduced in 2.6.0 where the configurator V1 API
  doesn't work at all when used outside of dune. (ocaml/dune#4046, @aalekseyev)

- Fix `libexec` and `libexec-private` variables. In cross-compilation settings,
  they now point to the file in the host context. (ocaml/dune#4058, fixes ocaml/dune#4057,
  @TheLortex)

- When running `$ dune subst`, use project metadata as a fallback when package
  metadata is missing. We also generate a warning when `(name ..)` is missing in
  `dune-project` files to avoid failures in production builds.

- Remove support for passing `-nodynlink` for executables. It was bypassed in
  most cases and not correct in other cases in particular on arm32.
  (ocaml/dune#4085, fixes ocaml/dune#4069, fixes ocaml/dune#2527, @emillon)

- Generate archive rules compatible with 4.12. Dune longer attempt to generate
  an archive file if it's unnecessary (ocaml/dune#3973, fixes ocaml/dune#3766, @rgrinberg)

- Fix generated Merlin configurations when multiple preprocessors are defined
  for different modules in the same folder. (ocaml/dune#4092, fixes ocaml/dune#2596, ocaml/dune#1212 and
  ocaml/dune#3409, @voodoos)

- Add the option `use_standard_c_and_cxx_flags` to `dune-project` that 1.
  disables the unconditional use of the `ocamlc_cflags` and `ocamlc_cppflags`
  from `ocamlc -config` in C compiler calls, these flags will be present in the
  `:standard` set instead; and 2. enables the detection of the C compiler family
  and populates the `:standard` set of flags with common default values when
  building CXX stubs. (ocaml/dune#3875, ocaml/dune#3802, fix ocaml/dune#3718 and ocaml/dune#3528, @voodoos)
AltGr added a commit to OCamlPro/opam that referenced this pull request Jan 20, 2021
@AltGr
Fixes for reftests on OSX
7757051 
TMPDIR var is required for proper sandboxing etc.
randomly it's prefixed with /private
and workaround dune running a pager through GIT_PAGER (see ocaml/dune#3912)
AltGr added a commit to OCamlPro/opam that referenced this pull request Feb 1, 2021
@AltGr
Fixes for reftests on OSX
3b66f89 
TMPDIR var is required for proper sandboxing etc.
randomly it's prefixed with /private
and workaround dune running a pager through GIT_PAGER (see ocaml/dune#3912)
kit-ty-kate pushed a commit to kit-ty-kate/opam that referenced this pull request Feb 7, 2021
@AltGr @kit-ty-kate
Fixes for reftests on OSX
ba92276 
TMPDIR var is required for proper sandboxing etc.
randomly it's prefixed with /private
and workaround dune running a pager through GIT_PAGER (see ocaml/dune#3912)
AltGr added a commit to OCamlPro/opam that referenced this pull request Feb 24, 2021
@AltGr
Fixes for reftests on OSX
7d59316 
TMPDIR var is required for proper sandboxing etc.
randomly it's prefixed with /private
and workaround dune running a pager through GIT_PAGER (see ocaml/dune#3912)
AltGr added a commit to OCamlPro/opam that referenced this pull request Mar 4, 2021
@AltGr
Fixes for reftests on OSX
582b50a 
TMPDIR var is required for proper sandboxing etc.
randomly it's prefixed with /private
and workaround dune running a pager through GIT_PAGER (see ocaml/dune#3912)
AltGr added a commit to OCamlPro/opam that referenced this pull request Mar 11, 2021
@AltGr
Fixes for reftests on OSX
e4d39bc 
TMPDIR var is required for proper sandboxing etc.
randomly it's prefixed with /private
and workaround dune running a pager through GIT_PAGER (see ocaml/dune#3912)
AltGr added a commit to OCamlPro/opam that referenced this pull request Mar 12, 2021
@AltGr
Fixes for reftests on OSX
e75d5bf 
TMPDIR var is required for proper sandboxing etc.
randomly it's prefixed with /private
and workaround dune running a pager through GIT_PAGER (see ocaml/dune#3912)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aalekseyev aalekseyev aalekseyev approved these changes

@rgrinberg rgrinberg Awaiting requested review from rgrinberg

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@AltGr @nojb @rgrinberg @aalekseyev