contrib/gcc-changelog: Skip over review lines

git-check-commit.py does not know about "Reviewed-by",
"Reviewed-on", and "Signed-off-by" lines and hence it
expects those lines which follow the ChangeLog entries
to be indented by a tab.

This commit makes the script skip those lines.  No further
processing is attempted because the review information
is not part of the ChangeLogs.

contrib/

2020-05-20  Frederik Harwath  <frederik@codesourcery.com>

	* gcc-changelog/git_commit.py: Skip over lines starting
	with "Reviewed-by: ", "Reviewed-on: ", or "Signed-off-by: "

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index b799a283f34b7d95e58c0ca277915104dcb5371b..faa56374669043c2dd4b98c44fbae18251bbdb19 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-20  Frederik Harwath  <frederik@codesourcery.com>
+
+       * gcc-changelog/git_commit.py: Skip over lines starting
+       with "Reviewed-by: ", "Reviewed-on: ", or "Signed-off-by: "
+
 2020-05-20  Martin Liska  <mliska@suse.cz>
 
        * gcc-changelog/git_check_commit.py: Change

diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py
index 5cc8c4f593565c1aa0312382ebbf368ac5ca7e4b..c9b849706c49b10face20773848df53694db4809 100755 (executable)
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -151,7 +151,12 @@ LINE_LIMIT = 100
 TAB_WIDTH = 8
 CO_AUTHORED_BY_PREFIX = 'co-authored-by: '
 CHERRY_PICK_PREFIX = '(cherry picked from commit '
+REVIEWED_BY_PREFIX = 'reviewed-by: '
+REVIEWED_ON_PREFIX = 'reviewed-on: '
+SIGNED_OFF_BY_PREFIX = 'signed-off-by: '
 
+REVIEW_PREFIXES = (REVIEWED_BY_PREFIX, REVIEWED_ON_PREFIX,\
+                   SIGNED_OFF_BY_PREFIX)
 
 class Error:
     def __init__(self, message, line=None):
@@ -345,11 +350,15 @@ class GitCommit:
                     else:
                         pr_line = line.lstrip()
 
-                if line.lower().startswith(CO_AUTHORED_BY_PREFIX):
+
+                lowered_line = line.lower()
+                if lowered_line.startswith(CO_AUTHORED_BY_PREFIX):
                     name = line[len(CO_AUTHORED_BY_PREFIX):]
                     author = self.format_git_author(name)
                     self.co_authors.append(author)
                     continue
+                elif lowered_line.startswith(REVIEW_PREFIXES):
+                    continue
                 elif line.startswith(CHERRY_PICK_PREFIX):
                     continue