2020-07-08 21:38:18 -06:00
|
|
|
.. _contributing:
|
|
|
|
|
2015-09-22 08:06:56 -06:00
|
|
|
###########################
|
|
|
|
How to contribute to DFHack
|
|
|
|
###########################
|
2015-01-22 21:05:46 -07:00
|
|
|
|
2020-07-08 00:13:37 -06:00
|
|
|
.. contents:: Contents
|
|
|
|
:local:
|
2015-09-24 00:58:02 -06:00
|
|
|
|
2015-12-14 23:08:25 -07:00
|
|
|
.. _contributing-code:
|
|
|
|
|
2015-09-22 08:06:56 -06:00
|
|
|
Contributing Code
|
|
|
|
=================
|
2021-04-02 22:20:15 -06:00
|
|
|
|
|
|
|
DFHack's source code is hosted on GitHub. To obtain the code, you do not need an
|
|
|
|
account - see the `compilation instructions <compile-how-to-get-the-code>` for
|
|
|
|
details. However, to contribute code to DFHack, you will need a GitHub account
|
|
|
|
to submit pull requests. DFHack consists of several repositories, so you will
|
|
|
|
need to fork the repository (or repositories) containing the code you wish to
|
|
|
|
modify. GitHub has several documentation pages on these topics, including:
|
|
|
|
|
|
|
|
* `An overview of forks
|
|
|
|
<https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/working-with-forks>`__
|
|
|
|
* `Proposing changes with pull requests
|
|
|
|
<https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/proposing-changes-to-your-work-with-pull-requests>`__
|
|
|
|
(note: see `contributing-pr-guidelines` for some DFHack-specific information)
|
|
|
|
|
|
|
|
In general, if you are not sure where or how to make a change, or would like
|
|
|
|
advice before attempting to make a change, please see `support` for ways to
|
|
|
|
contact maintainers - DFHack-specific channels such as IRC or Bay12 are
|
|
|
|
preferred. If you are interested in addressing an issue reported on the
|
|
|
|
:issue:`issue tracker <>`, you can start a discussion there if you prefer.
|
|
|
|
|
|
|
|
The sections below cover some guidelines that contributions should follow:
|
|
|
|
|
|
|
|
.. contents::
|
|
|
|
:local:
|
2015-01-22 21:05:46 -07:00
|
|
|
|
2020-08-06 00:30:17 -06:00
|
|
|
Code format
|
2015-01-27 13:12:46 -07:00
|
|
|
-----------
|
2015-01-31 20:50:37 -07:00
|
|
|
* Four space indents for C++. Never use tabs for indentation in any language.
|
2015-01-22 21:05:46 -07:00
|
|
|
* LF (Unix style) line terminators
|
2015-01-31 19:38:42 -07:00
|
|
|
* Avoid trailing whitespace
|
2015-01-22 21:05:46 -07:00
|
|
|
* UTF-8 encoding
|
2015-01-27 13:12:46 -07:00
|
|
|
* For C++:
|
|
|
|
|
2015-01-31 19:38:42 -07:00
|
|
|
* Opening and closing braces on their own lines or opening brace at the end of the previous line
|
2015-01-31 21:04:35 -07:00
|
|
|
* Braces placed at original indent level if on their own lines
|
2021-04-02 22:20:15 -06:00
|
|
|
* ``#include`` directives should be sorted: C++ libraries first, then DFHack modules, then ``df/`` headers,
|
2015-09-22 08:06:56 -06:00
|
|
|
then local includes. Within each category they should be sorted alphabetically.
|
2015-01-22 21:05:46 -07:00
|
|
|
|
2021-04-02 22:20:15 -06:00
|
|
|
.. _contributing-pr-guidelines:
|
|
|
|
|
2020-08-06 00:30:17 -06:00
|
|
|
Pull request guidelines
|
|
|
|
-----------------------
|
2021-04-02 22:20:15 -06:00
|
|
|
|
2020-08-06 00:30:17 -06:00
|
|
|
* Pull requests should be based on (and submitted to) the default branch of the
|
|
|
|
relevant repo, which is the branch you see when you access the repo on GitHub
|
|
|
|
or clone the repo without specifying a branch. As of 0.47.04-r1, this is
|
|
|
|
``develop`` for the main DFHack repo and ``master`` for other repos.
|
2021-04-02 22:20:15 -06:00
|
|
|
* We often leave feedback as comments on pull requests, so be sure that you have
|
|
|
|
`notifications turned on <https://github.com/settings/notifications>`__ or
|
|
|
|
that you check back for feedback periodically.
|
2020-08-06 00:30:17 -06:00
|
|
|
* Use a new branch for each feature or bugfix so that your changes can be merged
|
|
|
|
independently (i.e. not the ``master`` or ``develop`` branch of your fork).
|
|
|
|
|
|
|
|
* An exception: for a collection of small miscellaneous changes (e.g.
|
|
|
|
structures research), one branch instead of many small branches is fine. It
|
|
|
|
is still preferred that this branch be dedicated to this purpose, i.e. not
|
|
|
|
``master`` or ``develop``. Your pull request may be merged at any point
|
|
|
|
unless you indicate that it isn't ready (see below), but you can continue to
|
|
|
|
push to the same branch and open new pull requests as needed.
|
|
|
|
|
|
|
|
* Try to keep pull requests relatively small so that they are easier to review
|
|
|
|
and merge.
|
|
|
|
|
|
|
|
* If you expect to make a large number of related additions or changes (e.g.
|
|
|
|
adding a large new plugin), multiple PRs are preferred, as they allow more
|
|
|
|
frequent (and easier) feedback. If development of this feature is expected
|
|
|
|
to take a while, we may create a dedicated branch to merge your pull
|
|
|
|
requests into instead of the repo's default branch.
|
|
|
|
|
|
|
|
* If you plan to make additional changes to your pull request in the near
|
|
|
|
future, or if it isn't quite ready to be merged, mark it as a
|
|
|
|
`draft pull request <https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests#draft-pull-requests>`_
|
|
|
|
or add "WIP" to the title. Otherwise, your pull request may be reviewed and/or
|
|
|
|
merged prematurely.
|
|
|
|
|
|
|
|
General contribution guidelines
|
2015-01-22 21:05:46 -07:00
|
|
|
-------------------------------
|
2020-08-06 00:30:17 -06:00
|
|
|
* If convenient, compile on multiple platforms when changing anything that
|
|
|
|
compiles. Our CI should catch anything that fails to build, but checking in
|
2021-04-02 22:20:15 -06:00
|
|
|
advance can sometimes let you know of any issues sooner.
|
2020-07-06 23:54:59 -06:00
|
|
|
* Update documentation when applicable - see `docs-standards` for details.
|
2022-11-30 05:13:21 -07:00
|
|
|
* Update ``docs/changelog.txt`` and ``docs/about/Authors.rst`` when applicable. See
|
2018-04-02 20:22:20 -06:00
|
|
|
`build-changelog` for more information on the changelog format.
|
2015-11-06 17:35:44 -07:00
|
|
|
* Submit ideas and bug reports as :issue:`issues on GitHub <>`.
|
|
|
|
Posts in the forum thread can easily get missed or forgotten.
|
|
|
|
* Work on :issue:`reported problems <?q=is:open+-label:idea>`
|
|
|
|
will take priority over ideas or suggestions.
|
2015-01-22 21:05:46 -07:00
|
|
|
|
|
|
|
|
2015-10-03 11:50:52 -06:00
|
|
|
Other ways to help
|
|
|
|
==================
|
|
|
|
DFHack is a software project, but there's a lot more to it than programming.
|
|
|
|
If you're not comfortable programming, you can help by:
|
|
|
|
|
|
|
|
* reporting bugs and incomplete documentation
|
|
|
|
* improving the documentation
|
|
|
|
* finding third-party scripts to add
|
|
|
|
* writing tutorials for newbies
|
|
|
|
|
|
|
|
All those things are crucial, and often under-represented. So if that's
|
|
|
|
your thing, go get started!
|