Offer option to keep previously written Reviewed-by trailers

In Mesa3D project, developers often already append reviews, which happened before, so wiping them and relying only on Approval button is not an option.

This functionality ensure, that no previously given R-b is removed.

Signed-off-by: David Heidelberg david@ixit.cz

added 87 commits

• 1ff72c75...3ea5ab70 - 86 commits from branch marge-org:main
• 63ff17d0 - Offer option to keep previusly written Reviewed-by trailers

Compare with previous version

changed title from Draft: Offer option to keep previusly written Reviewed-by trailers to Draft: Offer option to keep previously written Reviewed-by trailers

You require the following (or similar) to fix the tests/test_single_job.py failures:

diff --git a/tests/git_repo_mock.py b/tests/git_repo_mock.py
index b79a5bc..f82d405 100644
--- a/tests/git_repo_mock.py
+++ b/tests/git_repo_mock.py
@@ -225,10 +225,12 @@ class GitModel:
         _, _, filter_cmd, commit_range = args
         assert args == ("--force", "--msg-filter", filter_cmd, commit_range)
 
-        trailers_var, python, script_path = shlex.split(filter_cmd)
+        trailers_var, keep_trailers_var, python, script_path = shlex.split(filter_cmd)
         _, trailers_str = trailers_var.split("=")
+        _, keep_trailers_str = keep_trailers_var.split("=")
 
         assert trailers_var == f"TRAILERS={trailers_str}"
+        assert keep_trailers_var == f"KEEP_TRAILERS={keep_trailers_str}"
         assert python == "python3"
         assert script_path.endswith("marge/trailerfilter.py")

added 5 commits

• 63ff17d0...149d5b01 - 4 commits from branch marge-org:main
• c98a3ddb - Offer option to keep previusly written Reviewed-by trailers

Compare with previous version

resolved all threads

Thank you @benjamb some of those I fixed locally after pushing it, some I merged in let me see what CI says now.

added 1 commit

• c529cac6 - Offer option to keep previusly written Reviewed-by trailers

Compare with previous version

approved this merge request

marked this merge request as ready

merged

mentioned in commit 0854b559

This MR is included in version 0.11.0

The release is available on GitLab release.

Your semantic-release bot