Revert "Relax git_footers parsing to match that of Gerrit (JGit)."

This reverts commit 28a5d5defd.

Reason for revert: breaks assumption in function for adding footers

Original change's description:
> Relax git_footers parsing to match that of Gerrit (JGit).
> 
> R=​agable@chromium.org
> 
> Bug: 717504
> Change-Id: Ieb6415d55e85b91f11f9052b0fd08cf982b64d51
> Reviewed-on: https://chromium-review.googlesource.com/501849
> Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
> Reviewed-by: Aaron Gable <agable@chromium.org>
> 

TBR=agable@chromium.org,machenbach@chromium.org,tandrii@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Bug: 717504

Change-Id: I9b4d619b2972be8434aff9464f1959fbcb3abd32
Reviewed-on: https://chromium-review.googlesource.com/503030
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
This commit is contained in:
Andrii Shyshkalov
2017-05-11 09:54:22 +00:00
committed by Commit Bot
parent beec006697
commit 43ec62ec71
3 changed files with 5 additions and 34 deletions

View File

@@ -48,8 +48,6 @@ def split_footers(message):
Guarantees that:
(non_footer_lines + footer_lines) == message.splitlines().
parsed_footers is parse_footer applied on each line of footer_lines.
There could be fewer parsed_footers than footer lines if some lines in
last paragraph are malformed.
"""
message_lines = list(message.splitlines())
footer_lines = []
@@ -63,8 +61,8 @@ def split_footers(message):
footer_lines = []
footer_lines.reverse()
footers = filter(None, map(parse_footer, footer_lines))
if not footers:
footers = map(parse_footer, footer_lines)
if not footer_lines or not all(footers):
return message_lines, [], []
return message_lines[:-len(footer_lines)], footer_lines, footers