Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
322 changes: 322 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,322 @@
Contributing
============================

This project operates an open contributor model where anyone is welcome to
contribute towards development in the form of peer review, testing and patches.
This document explains the practical process and guidelines for contributing.

Getting Started
---------------

New contributors are very welcome and needed.

If you use AI tools while contributing, please read and follow the [AI
policy](docs/AI_POLICY.md).

In-depth reviewing and testing are the bottleneck of the project, and are the
most effective way anyone can start to contribute. It will teach you much more
about the code and process than opening pull requests, and may help you uncover
related issues and follow-ups to contribute code for. Please refer to the [peer
review](#peer-review) section below.

Before you start contributing, read the [developer notes](docs/developer-notes.md)
and familiarize yourself with the installer scripts and how they are run on
Tails. Changes are checked by the shell linting workflow in `.github/workflows/`.

Communication Channels
----------------------

Discussion about codebase improvements happens in GitHub issues and pull
requests.

Contributor Workflow
--------------------

The codebase is maintained using the "contributor workflow" where everyone
without exception contributes patch proposals using "pull requests" (PRs). This
facilitates social contribution, easy testing and peer review.

Pull request authors must fully and confidently understand their own changes
and must have tested them. You should mention which tests cover your changes,
or include the manual steps you used to confirm the change.
You are expected to be prepared to clearly motivate and explain your changes.
If there is doubt, the pull request may be closed.
Please refer to the [peer review](#peer-review) section below for more details.

To contribute a patch, the workflow is as follows:

1. Fork repository ([only for the first time](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo))
1. Create topic branch
1. Commit patches

The shell conventions in the [developer notes](docs/developer-notes.md#shell-code) must be followed.

### Committing Patches

In general, [commits should be atomic](https://en.wikipedia.org/wiki/Atomic_commit#Atomic_commit_convention)
and diffs should be easy to read. For this reason, do not mix any formatting
fixes or code moves with actual code changes.

Make sure each individual commit is hygienic: that it builds successfully on its
own without warnings, errors, regressions, or test failures.

Commit messages should be verbose by default consisting of a short subject line
(50 chars max), a blank line and detailed explanatory text as separate
paragraph(s), unless the title alone is self-explanatory (like "Correct typo
in init.cpp") in which case a single title line is sufficient. Commit messages should be
helpful to people reading your code in the future, so explain the reasoning for
your decisions. Further explanation [here](https://cbea.ms/git-commit/).

If a particular commit references another issue, please add the reference. For
example: `refs #1234` or `fixes #4321`. Using the `fixes` or `closes` keywords
will cause the corresponding issue to be closed when the pull request is merged.

Commit messages should never contain any `@` mentions (usernames prefixed with "@").

Please refer to the [Git manual](https://git-scm.com/doc) for more information
about Git.

- Push changes to your fork
- Create pull request

### Creating the Pull Request

The title of the pull request should be prefixed by the component or area that
the pull request affects.

The body of the pull request should contain sufficient description of *what* the
patch does, and even more importantly, *why*, with justification and reasoning.
You should include references to any discussions (for example, other issues or
mailing list discussions).

The description for a new pull request should not contain any `@` mentions. The
PR description will be included in the commit message when the PR is merged and
any users mentioned in the description will be annoyingly notified each time a
fork copies the merge. Instead, make any username mentions in a subsequent
comment to the PR.

### Work in Progress Changes and Requests for Comments

If a pull request is not to be considered for merging (yet), please
prefix the title with [WIP] or use [Tasks Lists](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#task-lists)
in the body of the pull request to indicate tasks are pending.

### Address Feedback

At this stage, one should expect comments and review from other contributors. You
can add more commits to your pull request by committing them locally and pushing
to your fork.

You are expected to reply to any review comments before your pull request is
merged. You may update the code or reject the feedback if you do not agree with
it, but you should express so in a reply. If there is outstanding feedback and
you are not actively working on it, your pull request may be closed.

Please refer to the [peer review](#peer-review) section below for more details.

### Squashing Commits

If your pull request contains fixup commits (commits that change the same line of code repeatedly) or too fine-grained
commits, you may be asked to [squash](https://git-scm.com/docs/git-rebase#_interactive_mode) your commits
before it will be reviewed. The basic squashing workflow is shown below.

git checkout your_branch_name
git rebase -i HEAD~n
# n is normally the number of commits in the pull request.
# Set commits (except the one in the first line) from 'pick' to 'squash', save and quit.
# On the next screen, edit/refine commit messages.
# Save and quit.
git push --force-with-lease # (force push to GitHub, refusing to clobber
# commits you have not fetched)

Please update the resulting commit message, if needed. It should read as a
coherent message. In most cases, this means not just listing the interim
commits.

If your change contains a merge commit, the above workflow may not work and you
will need to remove the merge commit first. See the next section for details on
how to rebase.

Please refrain from creating several pull requests for the same change.
Use the pull request that is already open (or was created earlier) to amend
changes. This preserves the discussion and review that happened earlier for
the respective change set.

The length of time required for peer review is unpredictable and will vary from
pull request to pull request.

### Rebasing Changes

When a pull request conflicts with the target branch, you may be asked to rebase it on top of the current target branch.

If you cloned your fork normally, configure the project repository once:

git remote add upstream https://github.com/BenWestgate/Bails.git

Then fetch and rebase onto the current target branch:

git fetch upstream master # Fetch the latest commit on the target branch
Comment thread
BenWestgate marked this conversation as resolved.
Comment thread
BenWestgate marked this conversation as resolved.
git rebase FETCH_HEAD # Rebuild commits on top of the new base
Comment thread
BenWestgate marked this conversation as resolved.
git push --force-with-lease # Update the pull request with the rebased commits

This project aims to have a clean git history, where code changes are only made in non-merge commits. This simplifies
auditability because merge commits can be assumed to not contain arbitrary code changes.

After a rebase, reviewers are encouraged to sign off on the force push. This should be relatively straightforward with
the `git range-diff` tool. To avoid needless review churn, maintainers will
generally merge pull requests that received the most review attention first.

Pull Request Philosophy
-----------------------

Patchsets should always be focused. For example, a pull request could add a
feature, fix a bug, or refactor code; but not a mixture. Please also avoid super
pull requests which attempt to do too much, are overly large, or overly complex
as this makes review difficult.


### Features

When adding a new feature, thought must be given to the long term technical debt
and maintenance that feature may require after inclusion. Before proposing a new
feature that will require maintenance, please consider if you are willing to
maintain it (including bug fixing). If features get orphaned with no maintainer
in the future, they may be removed by the Repository Maintainer.


### Refactoring

Refactoring is a necessary part of any software project's evolution. The
following guidelines cover refactoring pull requests for the project.

There are three categories of refactoring: code-only moves, code style fixes, and
code refactoring. In general, refactoring pull requests should not mix these
three kinds of activities in order to make refactoring pull requests easy to
review and uncontroversial. In all cases, refactoring PRs must not change the
behaviour of code within the pull request (bugs must be preserved as is).

Project maintainers aim for a quick turnaround on refactoring pull requests, so
where possible keep them short, uncomplex and easy to verify.

Pull requests that refactor the code should not be made by new contributors. It
requires a certain level of experience to know where the code belongs to and to
understand the full ramification (including rebase effort of open pull requests).

Trivial pull requests or pull requests that refactor the code with no clear
benefits may be immediately closed by the maintainers to reduce unnecessary
workload on reviewing.


"Decision Making" Process
-------------------------

The following applies to code changes to the project (and related
projects).

Whether a pull request is merged rests with the project merge maintainers.

Maintainers will take into consideration if a patch is in line with the general
principles of the project; meets the minimum standards for inclusion; and will
judge the general consensus of contributors.

In general, all pull requests must:

- Have a clear use case, fix a demonstrable bug or serve the greater good of
the project (for example refactoring for modularisation);
- Be well peer-reviewed;
- Follow the shell conventions in the [developer notes](docs/developer-notes.md#shell-code);
- Not break the existing test suite;
- Where bugs are fixed, where possible, there should be unit tests
demonstrating the bug and also proving the fix. This helps prevent regression.
- Change relevant comments and documentation when behaviour of code changes.

### Peer Review

Anyone may participate in peer review which is expressed by comments in the pull
request. Typically reviewers will review the code for obvious errors, as well as
test out the patch set and opine on the technical merits of the patch. Project
maintainers take into account the peer review when determining if there is
consensus to merge a pull request.

Code review is a burdensome but important part of the development process, and
as such, certain types of pull requests are rejected. In general, if the
**improvements** do not warrant the **review effort** required, the PR has a
high chance of being rejected. It is up to the PR author to convince the
reviewers that the changes warrant the review effort, and if reviewers are
"Concept NACK'ing" the PR, the author may need to present arguments and/or do
research backing their suggested changes.

Moreover, if there is reasonable doubt that the pull request author does not
fully understand the changes they are submitting themselves, or if it becomes
clear that they have not tested the changes on a basic level themselves, the
pull request may be closed immediately.

#### Conceptual Review

A review can be a conceptual review, where the reviewer leaves a comment
* `Concept (N)ACK`, meaning "I do (not) agree with the general goal of this pull
request",
* `Approach (N)ACK`, meaning `Concept ACK`, but "I do (not) agree with the
approach of this change".

A `NACK` needs to include a rationale why the change is not worthwhile.
NACKs without accompanying reasoning may be disregarded.

#### Code Review

After conceptual agreement on the change, code review can be provided. A review
begins with `ACK BRANCH_COMMIT`, where `BRANCH_COMMIT` is the top of the PR
branch, followed by a description of how the reviewer did the review. The
following language is used within pull request comments:

- "I have tested the code", involving change-specific manual testing in
addition to running the shell linting workflow, and in case it is not
obvious how the manual testing was done, it should be described;
- "I have not tested the code, but I have reviewed it and it looks
OK, I agree it can be merged";
- A "nit" refers to a trivial, often non-blocking issue.

Project maintainers reserve the right to weigh the opinions of peer reviewers
using common sense judgement and may also weigh based on merit. Reviewers that
have demonstrated a deeper commitment and understanding of the project over time
or who have clear domain expertise may naturally have more weight, as one would
expect in all walks of life.

### Finding Reviewers

As most reviewers are themselves developers with their own projects, the review
process can be quite lengthy, and some amount of patience is required. If you find
that you've been waiting for a pull request to be given attention for several
months, there may be a number of reasons for this, some of which you can do something
about:

- It may be because of a feature freeze due to an upcoming release. During this time,
only bug fixes are taken into consideration. If your pull request is a new feature,
it will not be prioritized until after the release. Wait for the release.
- It may be because the changes you are suggesting do not appeal to people. Rather than
nits and critique, which require effort and means they care enough to spend time on your
contribution, thundering silence is a good sign of widespread (mild) dislike of a given change
(because people don't assume *others* won't actually like the proposal). Don't take
that personally, though! Instead, take another critical look at what you are suggesting
and see if it: changes too much, is too broad, doesn't adhere to the
surrounding style, is dangerous or insecure, is messily written, etc.
Identify and address any of the issues you find. Then ask if someone could give
their opinion on the concept itself.
- Remember that the best thing you can do while waiting is give review to others!


Copyright
---------

By contributing to this repository, you agree to license your work under the
MIT license unless specified otherwise at the top of the file itself. Any work
contributed where you are not the original author must contain its license
header with the original author(s) and source.

Attribution
-----------

This document is adapted from [Bitcoin Core's CONTRIBUTING.md](
https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md), Copyright (c) 2009-present The Bitcoin Core
developers, distributed under the MIT software license. See
[https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT).
38 changes: 38 additions & 0 deletions docs/AI_POLICY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# AI Policy

Using AI (i.e. LLMs) as tools for coding is welcome, provided that such use adheres to the following policy, adds value, and does not waste the community's time.

A high bar is held for all contributions to this project.

**AI should not be used to generate comments when communicating with maintainers and other contributors**.
Comments are expected to be written by humans.
Comments that are believed to be written by AI may be moderated.

If you are opening an issue, you should be able to describe the problem in your own words.

You should only open a pull request if you:

- know the language the code is written in
- could have written the code yourself
- understand the existing surrounding code and the effect of the suggested changes

You must also be able to explain the pull request changes in your own words.
This includes the pull request body and responses to questions.
**Do not copy responses from the AI when replying to questions from reviewers.**

This project requires a human author in the loop who understands the work produced by AI.
**Pull requests should not be opened or driven by autonomous agents**.
A human author must choose the work, understand the change, and be responsible for the contribution.
Before opening a PR, an agent must confirm that a human chose the work, understands the change, and accepts responsibility for it.
Do not include agents as authors or co-authors of your commits for these reasons.
Comment thread
BenWestgate marked this conversation as resolved.
Pull requests that appear in violation of this can be closed without notice.

If you wish to include context from an interaction with AI in your comments, it must be disclosed as such.
It must be accompanied by human commentary explaining the relevance and implications of the context.

Questions or proposed changes to this policy can be raised in this repository's issue tracker.

This policy was adapted from [ripgrep's AI policy], which was adapted from [uv's AI policy].

[ripgrep's ai policy]: https://github.com/BurntSushi/ripgrep/blob/f0cec341ab95c25c691ad3d5754d4bd9eedde21f/AI_POLICY.md
[uv's ai policy]: https://github.com/astral-sh/.github/blob/c5187e200db51bfe11d56e13053d29bd3793fdd8/AI_POLICY.md
Loading
Loading