Add 'Reland ' to whitelist and update error messages for clarity.

Commit messages starting with 'Reland ' always pass presubmit test. Error message now shows offending lines and how to get around them. Bug: angleproject:4683 Change-Id: If1a1ccfcf59172b10b2ca2066f3a087ff61dd4bd Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2237987 Commit-Queue: Manh Nguyen <nguyenmh@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

Add 'Reland ' to whitelist and update error messages for clarity.
75037213 · Manh Nguyen · Commit Bot · 4c2d466e · 75037213
Commit 75037213 authored Jun 09, 2020 by Manh Nguyen Committed by Commit Bot Jun 10, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

PRESUBMIT.py PRESUBMIT.py +8 -3

No files found.
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -41,7 +41,7 @@ def _CheckCommitMessageFormatting(input_api, output_api):
            while len(lines) > 0 and _IsLineBlank(lines[0]):
                lines.pop(0)

-    whitelist_strings = ['Revert "', 'Roll ']
+    whitelist_strings = ['Revert "', 'Roll ', 'Reland ']
    summary_linelength_warning_lower_limit = 65
    summary_linelength_warning_upper_limit = 70
    description_linelength_limit = 72
@@ -51,6 +51,9 @@ def _CheckCommitMessageFormatting(input_api, output_api):
    else:
        git_output = subprocess.check_output(["git", "log", "-n", "1", "--pretty=format:%B"])
    commit_msg_lines = git_output.splitlines()
+    commit_msg_line_numbers = {}
+    for i in range(len(commit_msg_lines)):
+        commit_msg_line_numbers[commit_msg_lines[i]] = i + 1
    _PopBlankLines(commit_msg_lines, True)
    _PopBlankLines(commit_msg_lines, False)
    if len(commit_msg_lines) > 0:
@@ -124,8 +127,10 @@ def _CheckCommitMessageFormatting(input_api, output_api):
        if len(line) > description_linelength_limit:
            errors.append(
                output_api.PresubmitError(
-                    "Please ensure that your description body is wrapped to " +
-                    str(description_linelength_limit) + " characters or less."))
+                    'Line ' + str(commit_msg_line_numbers[line]) + ' is too long.\n' + '"' + line +
+                    '"\n' + 'Please wrap it to ' + str(description_linelength_limit) +
+                    ' characters. ' +
+                    "Lines without spaces or lines starting with 4 spaces are exempt."))
            return errors
    return errors