From c4917cf8c988f38daaef0b2a80a78655fdbc9751 Mon Sep 17 00:00:00 2001
From: Hugo Trentesaux <hugo@trentesaux.fr>
Date: Sat, 3 Sep 2022 12:19:50 +0200
Subject: [PATCH] wip
---
CONTRIBUTING.md | 23 +++++++-------------
docs/dev/git-conventions.md | 43 ++++++++++++++++++-------------------
2 files changed, 29 insertions(+), 37 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 03282c4a4..2ea12ca80 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,28 +19,21 @@ Please read [Developer documentation] before contribute.
- Create a branch based on `master` and prefixed with your nickname. Give your branch a short name indicating the subject.
- Create an MR from your branch to `master`.
-- Never contribute to a branch of another contributor! If the contributor make a `git rebase` your commit will be lost !
+- Never contribute to a branch of another contributor! If the contributor makes a `git rebase` your commit will be lost!
- Before you push your commit:
- Apply formatters (rustfmt and prettier) and linter (clippy)
- - Document your code.
+ - Document your code
- Apply the [project's git conventions]
## Merge Process
1. Ensure you rebased your branch on the latest `master` commit to avoid any merge conflicts.
-
-2. Ensure that you respect the [commit naming conventions].
-
-3. Ensure that all automated tests pass with the `cargo test` command.
-
-3. Ensure that the code is well formated `cargo fmt` and comply with the good practices `cargo clippy`. If you have been working on tests, check everything with `cargo clippy --all --tests`.
-
-4. Update the documentation with details of changes to the interface, this includes new environment
- variables, exposed ports, useful file locations and container parameters.
-
-5. Push your branch on the gitlab and create a merge request. Briefly explain the purpose of your contribution in the description of the merge request.
-
-6. Tag a Duniter reviewer so they will review your contribution. If you still have no news after several weeks, tag another reviewer or/and talk about your contribution on [the technical forum].
+1. Ensure that you respect the [commit naming conventions].
+1. Ensure that all automated tests pass with the `cargo test` command.
+1. Ensure that the code is well formated `cargo fmt` and comply with the good practices `cargo clippy`. If you have been working on tests, check everything with `cargo clippy --all --tests`.
+1. Update the documentation with details of changes to the interface, this includes new environment variables, exposed ports, useful file locations and container parameters.
+1. Push your branch on the gitlab and create a merge request. Briefly explain the purpose of your contribution in the description of the merge request.
+1. Tag a Duniter reviewer so they will review your contribution. If you still have no news after several weeks, tag another reviewer or/and talk about your contribution on [the technical forum].
## List of Duniter's reviewers
diff --git a/docs/dev/git-conventions.md b/docs/dev/git-conventions.md
index 74c4207fd..084918cbc 100644
--- a/docs/dev/git-conventions.md
+++ b/docs/dev/git-conventions.md
@@ -15,10 +15,10 @@ The summary gives an overview of the rules described below. Reading it will help
## Naming commits
-Every commit must follow [conventional commit specification v1.0.0].
+Every commit must comply with [conventional commit specification v1.0.0].
-The commit name hase to be meaningful in the context of commit history reread. It should not make reference to a specific MR or discussion.
-Among other, commit history is used in changlogs and to follow the project progress, that's why it has to be self-explanatory.
+The commit name has to be meaningful in the context of commit history reread. It should not make reference to a specific MR or discussion.
+Among other, commit history is used in changlogs and to track the project progress, that's why it has to be self-explanatory.
If you have a new need, please contact the main developers to add a type together.
## Update strategy
@@ -28,18 +28,13 @@ We only use **rebases**, *merges* are strictly fordbidden !
Every time the `master` branch is updated, you must rebase each of your working branch on it. For each of them:
1. Go on your branch
-2. Run a rebase on master:
+1. Rebase on master with `git rebase master`
+1. If you see conflicts, fix them by editing the sources. Once it is done, you must:
+ 1. commit the files that were in conflict
+ 1. continue the rebase with `git rebase --continue`
+1. Keep doing until you don't have any more conflict after `git rebase --continue`.
- git rebase master
-
-3. If you see conflicts, fix them by editing the sources. Once it is done, you must:
- a. commit the files that were in conflict
- b. continue the rebase with `git rebase --continue`
- c. Do 3. again for each commit that will be in conflict.
-
-4. When you don't have any conflict anymore after `git rebase --continue`, then the rebase succeeded. Then rebase a remaning branch.
-
-To prevent accidental merge commits, we recommend that force the `--ff-only` option on the merge command:
+To prevent accidental merge commits, we recommend to force the `--ff-only` option on the merge command:
git config --global merge.ff only
@@ -58,20 +53,24 @@ any problem with your material.
After complying with the above criteria in your commits, you should check that your branch is up to date with the target branch (`master` in this example). As this branch is moving forward frequently, it is possible that new commits may have occurred while you were working on your branch (named YOUR_BRANCH, here). If this is the case or in case of doubt, to update your branch with respect to `master`, do the following:
- git checkout master # switch to master branch
- git pull # updates the remote branch based on remote
- git checkout YOU_BRANCH # switch back to your branch
- git rebase master # rebase you work on master branch
+```bash
+git checkout master # switch to master branch
+git pull # updates the remote branch based on remote
+git checkout YOU_BRANCH # switch back to your branch
+git rebase master # rebase you work on master branch
+```
In case of conflict during rebase that you can not solve, contact a lead developer telling them the hash of the commit on which YOUR_BRANCH is currently based so they can reproduce the rebase and see the conflicts. While waiting for their answer, you can cancel the rebase and work on YOUR_BRANCH without updating:
- git rebase --abort
+```
+git rebase --abort
+```
It is better to take your time before integrating a new contribution because the history of the master branch cannot be modified: it is a protected branch. Each commit on this branch remains there *ad vitam aeternam* that is why we make sure to keep a clear and understandable commit history.
## Discussion in a merge request
-On Gitlab, a discussion is opened for each merge request. It will allow you to discuss the changes you have made. Feel free to identify someone by writing @pseudo so that they are notified of your request. Don't be impatient, the review of your contribution may take more or less time depending on its content!
+On Gitlab, a discussion is opened for each merge request. It will allow you to discuss the changes you have made. Feel free to tag someone by writing @pseudo so that they are notified of your request. Don't be impatient, the review of your contribution may take more or less time depending on its content!
The general discussion is used to comment on the merge request as a whole, for example to tag a developer for a proofreading request. When it comes to discussing a specific change in the code, you should go to the "Changes" tab of the merge request and comment under the code extract involved. This makes it easier to break down the resolution of problems raised by the merge request via the "comment resolution" feature. Each segment can be marked as resolved, but only the reviewer is allowed to do so!
@@ -81,7 +80,7 @@ When you finished developing, you must compile, run linter and run all tests:
cargo fmt
cargo clippy
- cd tests && npm test
+ cd tests && npm test # FIXME
Then commit everything.
@@ -93,7 +92,7 @@ If you have a pile of commits, use the useful interactive rebase to clean up you
There you can rename the `wip:` commits, you can "fixup" commits that go together, you can rename and re-order commits,...
-After an interactive rebase, your local git history is different that yours in Gitlab, so you need a force push to make it to Gitlab:
+After an interactive rebase, your local git history differs from Gitlab's version, so you need a force push to make it to Gitlab:
git push -f
--
GitLab