diff options
| author | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2024-04-18 13:28:44 -0400 |
|---|---|---|
| committer | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2024-04-18 13:28:44 -0400 |
| commit | 11c5cc46b7f4bb10c134e4ba05e984e8ab13ed6f (patch) | |
| tree | cfc3ba0ce329011e26d25fda9841c92a1d4022ef | |
| parent | 1072ea7e8722c5a1decf706d002351e771c9f805 (diff) | |
| download | b4-11c5cc46b7f4bb10c134e4ba05e984e8ab13ed6f.tar.gz | |
ez: improve needs-editing logic for single-patch series
When sending single-patch series, the cover letter does not need to be
edited even if it contains EDITME.
Reported-by: Mark Brown <broonie@kernel.org>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218706
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
| -rw-r--r-- | src/b4/ez.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/b4/ez.py b/src/b4/ez.py index a78ecff..84db698 100644 --- a/src/b4/ez.py +++ b/src/b4/ez.py @@ -2345,7 +2345,6 @@ def show_info(param: str) -> None: cover, tracking = load_cover(usebranch=mybranch) csubject, cbody = get_cover_subject_body(cover) info['cover-subject'] = csubject.full_subject - info['needs-editing'] = 'EDITME' in cover ts = tracking['series'] if ts.get('prefixes'): info['prefixes'] = ' '.join(ts.get('prefixes')) @@ -2357,6 +2356,13 @@ def show_info(param: str) -> None: if ts.get('base-branch'): info['base-branch'] = ts['base-branch'] base_commit, start_commit, end_commit, oneline, shortlog, diffstat = get_series_details(usebranch=mybranch) + info['needs-editing'] = False + if len(oneline) == 1: + todests, ccdests, tag_msg, patches = get_prep_branch_as_patches(usebranch=mybranch) + if b'EDITME' in b4.LoreMessage.get_msg_as_bytes(patches[0][1]): + info['needs-editing'] = True + elif 'EDITME' in cover: + info['needs-editing'] = True info['base-commit'] = base_commit info['start-commit'] = start_commit info['end-commit'] = end_commit |