patman: Attach warnings to individual patches
At present warnings are produced across the whole set of patches when
parsing them. It is more useful to associate each warning with the patch
(or commit) that generated it.
Attach warnings to the Commit object and move them out of PatchStream.
Also avoid generating duplicate warnings for the same commit.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index 9f28347..880d7dd 100644
--- a/tools/patman/patchstream.py
+++ b/tools/patman/patchstream.py
@@ -68,7 +68,6 @@
self.skip_blank = False # True to skip a single blank line
self.found_test = False # Found a TEST= line
self.lines_after_test = 0 # Number of lines found after TEST=
- self.warn = [] # List of warnings we have collected
self.linenum = 1 # Output line number we are up to
self.in_section = None # Name of start...END section we are in
self.notes = [] # Series notes
@@ -84,12 +83,20 @@
self.commit = None # Current commit
def _add_warn(self, warn):
- """Add a new warning to report to the user
+ """Add a new warning to report to the user about the current commit
+
+ The new warning is added to the current commit if not already present.
Args:
warn (str): Warning to report
+
+ Raises:
+ ValueError: Warning is generated with no commit associated
"""
- self.warn.append(warn)
+ if not self.commit:
+ raise ValueError('Warning outside commit: %s' % warn)
+ if warn not in self.commit.warn:
+ self.commit.warn.append(warn)
def _add_to_series(self, line, name, value):
"""Add a new Series-xxx tag.
@@ -614,7 +621,7 @@
if backup_dir:
shutil.copy(fname, os.path.join(backup_dir, os.path.basename(fname)))
shutil.move(tmpname, fname)
- return pst.warn
+ return cmt.warn
def fix_patches(series, fnames):
"""Fix up a list of patches identified by filenames