patman: Improve handling of files

Sometimes warnings are associated with a file and sometimes with the
patch as a whole. Update the regular expression to handle both cases,
even in emacs mode. Also add support for detecting new files.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/tools/patman/checkpatch.py b/tools/patman/checkpatch.py
index 98d962cd50d3e0f92d1b0619b56a91623a7b6cff..63a8e37e8c5478012b3de6ee8da3a79f3bf96e0e 100644 (file)
--- a/tools/patman/checkpatch.py
+++ b/tools/patman/checkpatch.py
@@ -93,7 +93,7 @@ def CheckPatch(fname, verbose=False, show_types=False):
     re_error = re.compile('ERROR:%s (.*)' % type_name)
     re_warning = re.compile(emacs_prefix + 'WARNING:%s (.*)' % type_name)
     re_check = re.compile('CHECK:%s (.*)' % type_name)
-    re_file = re.compile('#\d+: FILE: ([^:]*):(\d+):')
+    re_file = re.compile('#(\d+): (FILE: ([^:]*):(\d+):)?')
     re_note = re.compile('NOTE: (.*)')
     re_new_file = re.compile('new file mode .*')
     indent = ' ' * 6
@@ -153,8 +153,13 @@ def CheckPatch(fname, verbose=False, show_types=False):
             item['msg'] = check_match.group(2)
             item['type'] = 'check'
         elif file_match:
-            item['file'] = file_match.group(1)
-            item['line'] = int(file_match.group(2))
+            err_fname = file_match.group(3)
+            if err_fname:
+                item['file'] = err_fname
+                item['line'] = int(file_match.group(4))
+            else:
+                item['file'] = '<patch>'
+                item['line'] = int(file_match.group(1))
         elif subject_match:
             item['file'] = '<patch subject>'
             item['line'] = None