aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-09Merge script: adds a way for confirmation to expect a newline.Théo Zimmermann
This fulfils Gaetan's wish.
2018-04-09Add sanity check in merge script: local branch is up-to-date.Théo Zimmermann
In case the local branch is ahead of upstream, we only print a warning because it could be that we are merging several PRs in a row.
2018-04-08Document requirement to have git >= 2.7 to use the merge script.Théo Zimmermann
As reported in https://github.com/coq/coq/issues/7097#issuecomment-378632415
2018-04-08Merge script does not warn when the remote is set to HTTPS.Théo Zimmermann
This should solve Emilio's problem.
2018-04-08Merge script: use fetch URL for the remote.Théo Zimmermann
In case the push URL has been overriden to make it fetch-only.
2018-04-08Merge PR #6809: Improve shell scriptsMichael Soegtrop
2018-04-06Merge PR #7129: Fix #7124: Warning "Ignoring implicit status" does not ↵Hugo Herbelin
provide line number
2018-04-06Merge PR #6960: [api] Move some types to their proper module.Pierre-Marie Pédrot
2018-04-06Merge PR #7180: Remove unused script.Pierre-Marie Pédrot
2018-04-06Merge PR #7178: Fixes issue #7172 (don't include MinGW make in install)Enrico Tassi
2018-04-06Merge PR #7131: Sphinx doc chapter 30Théo Zimmermann
2018-04-05Improve shell scriptszapashcanon
2018-04-05Merge PR #6838: Light refactoring of implicit argumentsHugo Herbelin
2018-04-05Refactor impargs code.Jasper Hugunin
This should preserve semantics exactly. In the compute_implicits family of functions, I changed the name of the pushed rel to not be fresh, but the env isn't passed to find_displayed_name_in, and shouldn't affect whd_all.
2018-04-05Remove unused script.Théo Zimmermann
This is dead code since fd44a40f9d426a7b65f167bc30d320a0f7dd2bbd. This script was initially introduced in a088d03434417e935df3c75f81a954eadbdfc2b8 and left untouched since then.
2018-04-05Fix #7124: Warning "Ignoring implicit status" does not provide line numberMaxime Dénès
2018-04-05Fixes issue #7172 (don't include MinGW make in install)Michael Soegtrop
2018-04-05Merge PR #7169: Sphinx docs: fix typo in Chrząszcz (non-ASCII character ↵Maxime Dénès
lost in sphinx migration)
2018-04-05Merge PR #7074: Update merging docMaxime Dénès
2018-04-05Add note for homebrew users.Théo Zimmermann
2018-04-05Some advice about merge script dependencies.Théo Zimmermann
Including: how to create a GPG key.
2018-04-05Improve the MERGING doc.Théo Zimmermann
In particular, describes what to do with overlays.
2018-04-05Adapt CONTRIBUTING to recent changes in Coq.Théo Zimmermann
- The testing and benchmarking labels are now distinct. - The release manager does not take care of merging anymore. - The reference manual is not written in LaTeX anymore.
2018-04-05Merge PR #7115: Sphinx doc chapter 28Théo Zimmermann
2018-04-05Merge PR #7016: Make parsing independent of the cumulativity flag.Enrico Tassi
2018-04-05Merge PR #7139: [stm] More cleanup of "classification is not an interpreter"Enrico Tassi
2018-04-05[Sphinx] Add chapter 30Maxime Dénès
Thanks to Paul Steckler for porting this chapter.
2018-04-05[Sphinx] Move chapter 30 to new infrastructureMaxime Dénès
2018-04-04Merge PR #7127: Fix #6257: anomaly with Printing Projections and Context.Hugo Herbelin
2018-04-04Merge PR #7163: merge-pr.sh: cache github API callsMaxime Dénès
2018-04-04Sphinx docs: fix typo (non-ASCII character lost in sphinx migration)Peter LeFanu Lumsdaine
2018-04-04[Sphinx] Add chapter 28Maxime Dénès
Thanks to Paul Steckler for porting this chapter.
2018-04-04[Sphinx] Move chapter 28 to new infrastructureMaxime Dénès
2018-04-04Merge PR #7158: [meta] Add `num` to the set of base libraries.Enrico Tassi
2018-04-04Merge PR #6407: Fix #6404 - Print tactics called by ML tacticsPierre-Marie Pédrot
2018-04-04Merge PR #7147: [doc] Document better ocamlfind and flambda requirements.Théo Zimmermann
2018-04-04Merge PR #7144: [toplevel] Protect goal printing better wrt Break [helps ↵Enrico Tassi
with #7142]
2018-04-04Merge PR #7138: [stm] Move VernacBacktrack to the toplevel.Enrico Tassi
2018-04-04Merge PR #7104: Sphinx doc chapter 27Théo Zimmermann
2018-04-04Merge PR #7048: Sphinx doc chapter 25Théo Zimmermann
2018-04-04Merge PR #7049: Sphinx doc chapter 26Théo Zimmermann
2018-04-04Merge PR #7047: Sphinx doc chapter 24Théo Zimmermann
2018-04-04Merge PR #7041: Sphinx doc chapter 23Théo Zimmermann
2018-04-04Merge PR #7037: Sphinx doc chapter 18Théo Zimmermann
2018-04-03merge-pr.sh: cache github API callsGaëtan Gilbert
2018-04-03Merge PR #7154: Update coq_makefile timing testGaëtan Gilbert
2018-04-03[doc] Document better ocamlfind and flambda requirements.Emilio Jesus Gallego Arias
Closes #6782
2018-04-03[meta] Add `num` to the set of base libraries.Emilio Jesus Gallego Arias
In the META file, the set of base libraries is determined by the dependencies of the `coq.clib` package. We add `num` to the dependencies as otherwise dynamically loading `micromega` and `nsatz` will fail as they require the toplevel to have `num` linked in.
2018-04-02Update coq_makefile timing testJason Gross
This fixes #5675 (in yet another way). The issue was that `$` (end of string regex) was not properly escaped in `"`s. This handles the issue that is displayed in ``` cat A.v.timing.diff After | Code | Before || Change | % Change --------------------------------------------------------------------------------------------------- 0m01.44s | Total | 0m01.56s || -0m00.12s | -7.92% --------------------------------------------------------------------------------------------------- 0m00.609s | Chars 163 - 208 [Definition~foo1~:=~Eval~comp~i...] | 0m00.627s || -0m00.01s | -2.87% 0m00.527s | Chars 069 - 162 [Definition~foo0~:=~Eval~comp~i...] | 0m00.552s || -0m00.02s | -4.52% 0m00.304s | Chars 000 - 026 [Require~Coq.ZArith.BinInt.] | 0m00.379s || -0m00.07s | -19.78% N/A | Chars 027 - 068 [Declare~Reduction~comp~:=~nati...] | 0m00.006s || -0m00.00s | -100.00% 0m00.s | Chars 027 - 068 [Declare~Reduction~comp~:=~vm_c...] | N/A || +0m00.00s | N/A --- A.v.timing.diff.desired.processed 2018-03-23 22:22:19.000000000 +0000 +++ A.v.timing.diff.processed 2018-03-23 22:22:19.000000000 +0000 @@ -1,4 +1,4 @@ - N/A | Chars 27 - 68 [Declare~Reduction~comp~:=~nati] | ms || -ms | N/A + N/A | Chars 27 - 68 [Declare~Reduction~comp~:=~nati] | ms || -ms | -% ------ ------ After | Code | Before || Change | % Change ``` where, because `Declare Reduction` takes 0.006s rather than 0s, the % change shows up as -100% rather than N/A.
2018-04-02Fix #6404 - Print tactics called by ML tacticsJason Gross