2014-02-24 16:32:15 -07:00
|
|
|
# Contributing to Neovim
|
|
|
|
|
2016-08-09 21:47:04 -07:00
|
|
|
Getting started
|
|
|
|
---------------
|
2014-02-24 16:32:15 -07:00
|
|
|
|
2016-08-09 21:47:04 -07:00
|
|
|
If you want to help but don't know where to start, here are some
|
|
|
|
low-risk/isolated tasks:
|
2015-03-09 16:20:15 -07:00
|
|
|
|
2016-08-09 21:47:04 -07:00
|
|
|
- Help us [review pull requests](#reviewing)!
|
|
|
|
- Merge a [Vim patch].
|
|
|
|
- Try a [complexity:low] issue.
|
|
|
|
- Fix [clang-scan] or [coverity](#coverity) warnings.
|
|
|
|
|
|
|
|
Reporting problems
|
|
|
|
------------------
|
2015-03-09 16:20:15 -07:00
|
|
|
|
2016-06-03 12:05:44 -07:00
|
|
|
- Check the [**FAQ**][wiki-faq].
|
|
|
|
- Search [existing issues][github-issues] (including closed!)
|
|
|
|
- Update Neovim to the latest version to see if your problem persists.
|
|
|
|
- If you're using a plugin manager, comment out your plugins, then add them back
|
|
|
|
in one by one, to narrow down the cause of the issue.
|
|
|
|
- Crash reports which include a stacktrace are 10x more valuable.
|
|
|
|
- [Bisecting][git-bisect] to the cause of a regression often leads to an
|
|
|
|
immediate fix.
|
|
|
|
|
2016-08-09 21:47:04 -07:00
|
|
|
Pull requests ("PRs")
|
|
|
|
---------------------
|
2016-06-03 12:05:44 -07:00
|
|
|
|
|
|
|
- To avoid duplicate work, you may want to create a `[WIP]` pull request so that
|
|
|
|
others know what you are working on.
|
|
|
|
- Avoid cosmetic changes to unrelated files in the same commit: extra noise
|
|
|
|
makes reviews more difficult.
|
|
|
|
- Use a [feature branch][git-feature-branch] instead of the master branch.
|
|
|
|
- [Rebase your feature branch][git-rebasing] onto (upstream) master before
|
|
|
|
opening the PR.
|
|
|
|
- After addressing the review comments, it's fine to rebase and force-push to
|
|
|
|
your review.
|
|
|
|
- Try to [tidy your history][git-history-rewriting]: combine related commits
|
|
|
|
with interactive rebasing, separate monolithic commits, etc.
|
2015-04-21 14:35:06 -07:00
|
|
|
|
2016-08-23 20:49:09 -07:00
|
|
|
### Stages: WIP, RFC, RDY
|
2015-04-21 14:35:06 -07:00
|
|
|
|
2016-08-23 20:49:09 -07:00
|
|
|
Pull requests have three stages: `[WIP]` (Work In Progress), `[RFC]` (Request
|
|
|
|
For Comment) and `[RDY]` (Ready).
|
2015-03-09 16:20:15 -07:00
|
|
|
|
2016-08-23 20:49:09 -07:00
|
|
|
- Untagged PRs are assumed to be `[RFC]`, i.e. you are requesting a review.
|
|
|
|
- Prepend `[WIP]` to the PR title if you are _not_ requesting feedback and the
|
2016-08-09 21:47:04 -07:00
|
|
|
work is still in flux.
|
2016-08-23 20:49:09 -07:00
|
|
|
- Prepend `[RDY]` to the PR title if you are _done_ with the PR and are only
|
|
|
|
waiting on it to be merged.
|
|
|
|
|
|
|
|
For example, a typical workflow is:
|
|
|
|
|
|
|
|
1. You open a `[WIP]` PR where the work is _not_ ready for feedback, you just want to
|
|
|
|
let others know what you are doing.
|
|
|
|
2. Once the PR is ready for review, you replace `[WIP]` in the title with `[RFC]`.
|
|
|
|
You may add fix up commits to address issues that come up during review.
|
|
|
|
3. Once the PR is ready for merging, you rebase/squash your work appropriately and
|
|
|
|
then replace `[RFC]` in the title with `[RDY]`.
|
2015-03-09 16:20:15 -07:00
|
|
|
|
2016-06-03 12:05:44 -07:00
|
|
|
### Commit messages
|
2015-03-09 16:20:15 -07:00
|
|
|
|
2016-06-03 12:05:44 -07:00
|
|
|
Follow [commit message hygiene][hygiene] to *make reviews easier* and to make
|
|
|
|
the VCS/git logs more valuable.
|
2015-03-09 16:20:15 -07:00
|
|
|
|
2016-06-03 12:05:44 -07:00
|
|
|
- Try to keep the first line under 72 characters.
|
|
|
|
- **Prefix the commit subject with a _scope_:** `doc:`, `test:`, `foo.c:`,
|
|
|
|
`runtime:`, ...
|
|
|
|
- For commits that contain only style/lint changes, a single-word subject
|
|
|
|
line is preferred: `style` or `lint`.
|
|
|
|
- A blank line must separate the subject from the description.
|
|
|
|
- Use the _imperative voice_: "Fix bug" rather than "Fixed bug" or "Fixes bug."
|
2015-03-09 16:20:15 -07:00
|
|
|
|
2016-06-03 12:05:44 -07:00
|
|
|
### Automated builds (CI)
|
2015-03-09 16:20:15 -07:00
|
|
|
|
2016-06-03 12:05:44 -07:00
|
|
|
Each pull request must pass the automated builds ([travis CI] and [quickbuild]).
|
2015-03-09 16:20:15 -07:00
|
|
|
|
2016-06-03 12:05:44 -07:00
|
|
|
- CI builds are compiled with [`-Werror`][gcc-warnings], so if your PR
|
|
|
|
introduces any compiler warnings, the build will fail.
|
|
|
|
- If any tests fail, the build will fail.
|
|
|
|
See [Building Neovim#running-tests][wiki-run-tests] to run tests locally.
|
|
|
|
Passing locally doesn't guarantee passing the CI build, because of the
|
|
|
|
different compilers and platforms tested against.
|
|
|
|
- CI runs [ASan] and other analyzers. To run valgrind locally:
|
|
|
|
`VALGRIND=1 make test`
|
|
|
|
- The `lint` build ([#3174][3174]) checks modified lines _and their immediate
|
|
|
|
neighbors_. This is to encourage incrementally updating the legacy style to
|
|
|
|
meet our style guidelines.
|
|
|
|
- A single word (`lint` or `style`) is sufficient as the subject line of
|
|
|
|
a commit that contains only style changes.
|
|
|
|
- [How to investigate QuickBuild failures](https://github.com/neovim/neovim/pull/4718#issuecomment-217631350)
|
2015-03-09 16:20:15 -07:00
|
|
|
|
2016-06-03 12:05:44 -07:00
|
|
|
### Coverity
|
2015-03-09 16:20:15 -07:00
|
|
|
|
2016-06-03 12:05:44 -07:00
|
|
|
[Coverity](https://scan.coverity.com/projects/neovim-neovim) runs against the
|
|
|
|
master build. If you want to view the defects, just request access at the
|
|
|
|
_Contributor_ level. An Admin will grant you permission.
|
2015-03-09 16:20:15 -07:00
|
|
|
|
2016-06-03 12:05:44 -07:00
|
|
|
Use this commit-message format for coverity fixes:
|
2015-03-09 16:20:15 -07:00
|
|
|
|
2016-06-03 12:05:44 -07:00
|
|
|
coverity/<id>: <description of what fixed the defect>
|
2015-03-09 16:20:15 -07:00
|
|
|
|
2016-06-03 12:05:44 -07:00
|
|
|
where `<id>` is the Coverity ID (CID). For example see [#804](https://github.com/neovim/neovim/pull/804).
|
|
|
|
|
2016-08-09 21:47:04 -07:00
|
|
|
Reviewing
|
|
|
|
---------
|
2016-06-03 12:05:44 -07:00
|
|
|
|
|
|
|
To help review pull requests, start with [this checklist][review-checklist].
|
2015-03-09 16:20:15 -07:00
|
|
|
|
|
|
|
Reviewing can be done on GitHub, but you may find it easier to do locally.
|
2016-06-03 12:05:44 -07:00
|
|
|
Using [`hub`][hub], you can create a new branch with the contents of a pull
|
|
|
|
request, e.g. [#1820][1820]:
|
2014-05-07 19:33:41 -07:00
|
|
|
|
2015-03-09 16:20:15 -07:00
|
|
|
hub checkout https://github.com/neovim/neovim/pull/1820
|
|
|
|
|
|
|
|
Use [`git log -p master..FETCH_HEAD`][git-history-filtering] to list all
|
|
|
|
commits in the feature branch which aren't in the `master` branch; `-p`
|
|
|
|
shows each commit's diff. To show the whole surrounding function of a change
|
|
|
|
as context, use the `-W` argument as well.
|
|
|
|
|
|
|
|
[gcc-warnings]: https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
|
|
|
|
[git-bisect]: http://git-scm.com/book/tr/v2/Git-Tools-Debugging-with-Git
|
|
|
|
[git-feature-branch]: https://www.atlassian.com/git/tutorials/comparing-workflows
|
|
|
|
[git-history-filtering]: https://www.atlassian.com/git/tutorials/git-log/filtering-the-commit-history
|
|
|
|
[git-history-rewriting]: http://git-scm.com/book/en/v2/Git-Tools-Rewriting-History
|
|
|
|
[git-rebasing]: http://git-scm.com/book/en/v2/Git-Branching-Rebasing
|
|
|
|
[github-issues]: https://github.com/neovim/neovim/issues
|
2016-06-03 12:05:44 -07:00
|
|
|
[1820]: https://github.com/neovim/neovim/pull/1820
|
2015-03-09 16:20:15 -07:00
|
|
|
[hub]: https://hub.github.com/
|
2016-06-03 12:05:44 -07:00
|
|
|
[hygiene]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
|
2015-04-19 13:17:45 -07:00
|
|
|
[style-guide]: http://neovim.io/develop/style-guide.xml
|
2016-06-03 12:05:44 -07:00
|
|
|
[ASan]: http://clang.llvm.org/docs/AddressSanitizer.html
|
|
|
|
[wiki-run-tests]: https://github.com/neovim/neovim/wiki/Building-Neovim#running-tests
|
2015-04-21 14:35:06 -07:00
|
|
|
[wiki-faq]: https://github.com/neovim/neovim/wiki/FAQ
|
2016-06-03 12:05:44 -07:00
|
|
|
[review-checklist]: https://github.com/neovim/neovim/wiki/Code-review-checklist
|
|
|
|
[3174]: https://github.com/neovim/neovim/issues/3174
|
|
|
|
[travis CI]: https://travis-ci.org/neovim/neovim
|
|
|
|
[quickbuild]: http://neovim-qb.szakmeister.net/dashboard
|
2016-08-09 21:47:04 -07:00
|
|
|
[Vim patch]: https://github.com/neovim/neovim/wiki/Merging-patches-from-upstream-Vim
|
|
|
|
[clang-scan]: https://neovim.io/doc/reports/clang/
|
|
|
|
[complexity:low]: https://github.com/neovim/neovim/issues?q=is%3Aopen+is%3Aissue+label%3Acomplexity%3Alow
|