Commit d0c5719d authored by Simon Glass's avatar Simon Glass
Browse files

patman: Avoid changing the order of tags



patman collects tags that it sees in the commit and places them nicely
sorted at the end of the patch. However, this is not really necessary and
in fact is apparently not desirable.
Suggested-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
Tested-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
parent 9447a6b2
...@@ -72,7 +72,6 @@ class PatchStream: ...@@ -72,7 +72,6 @@ class PatchStream:
self.in_change = 0 # Non-zero if we are in a change list self.in_change = 0 # Non-zero if we are in a change list
self.blank_count = 0 # Number of blank lines stored up self.blank_count = 0 # Number of blank lines stored up
self.state = STATE_MSG_HEADER # What state are we in? self.state = STATE_MSG_HEADER # What state are we in?
self.tags = [] # Tags collected, like Tested-by...
self.signoff = [] # Contents of signoff line self.signoff = [] # Contents of signoff line
self.commit = None # Current commit self.commit = None # Current commit
...@@ -113,16 +112,6 @@ class PatchStream: ...@@ -113,16 +112,6 @@ class PatchStream:
self.series.AddCommit(self.commit) self.series.AddCommit(self.commit)
self.commit = None self.commit = None
def FormatTags(self, tags):
out_list = []
for tag in sorted(tags):
if tag.startswith('Cc:'):
tag_list = tag[4:].split(',')
out_list += gitutil.BuildEmailList(tag_list, 'Cc:')
else:
out_list.append(tag)
return out_list
def ProcessLine(self, line): def ProcessLine(self, line):
"""Process a single line of a patch file or commit log """Process a single line of a patch file or commit log
...@@ -271,7 +260,7 @@ class PatchStream: ...@@ -271,7 +260,7 @@ class PatchStream:
elif tag_match.group(1) == 'Patch-cc': elif tag_match.group(1) == 'Patch-cc':
self.commit.AddCc(tag_match.group(2).split(',')) self.commit.AddCc(tag_match.group(2).split(','))
else: else:
self.tags.append(line); out = [line]
# Suppress duplicate signoffs # Suppress duplicate signoffs
elif signoff_match: elif signoff_match:
...@@ -311,7 +300,6 @@ class PatchStream: ...@@ -311,7 +300,6 @@ class PatchStream:
# Output the tags (signeoff first), then change list # Output the tags (signeoff first), then change list
out = [] out = []
log = self.series.MakeChangeLog(self.commit) log = self.series.MakeChangeLog(self.commit)
out += self.FormatTags(self.tags)
out += [line] out += [line]
if self.commit: if self.commit:
out += self.commit.notes out += self.commit.notes
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment