10d24de9dSSimon Glass# Copyright (c) 2011 The Chromium OS Authors. 20d24de9dSSimon Glass# 31a459660SWolfgang Denk# SPDX-License-Identifier: GPL-2.0+ 40d24de9dSSimon Glass# 50d24de9dSSimon Glass 60d24de9dSSimon Glassimport os 70d24de9dSSimon Glassimport re 80d24de9dSSimon Glassimport shutil 90d24de9dSSimon Glassimport tempfile 100d24de9dSSimon Glass 110d24de9dSSimon Glassimport command 120d24de9dSSimon Glassimport commit 130d24de9dSSimon Glassimport gitutil 140d24de9dSSimon Glassfrom series import Series 150d24de9dSSimon Glass 160d24de9dSSimon Glass# Tags that we detect and remove 17619dd5deSSimon Glassre_remove = re.compile('^BUG=|^TEST=|^BRANCH=|^Change-Id:|^Review URL:' 183fefd5efSSimon Glass '|Reviewed-on:|Commit-\w*:') 190d24de9dSSimon Glass 200d24de9dSSimon Glass# Lines which are allowed after a TEST= line 210d24de9dSSimon Glassre_allowed_after_test = re.compile('^Signed-off-by:') 220d24de9dSSimon Glass 2305e5b735SIlya Yanok# Signoffs 24102061bdSSimon Glassre_signoff = re.compile('^Signed-off-by: *(.*)') 2505e5b735SIlya Yanok 260d24de9dSSimon Glass# The start of the cover letter 270d24de9dSSimon Glassre_cover = re.compile('^Cover-letter:') 280d24de9dSSimon Glass 29fe2f8d9eSSimon Glass# A cover letter Cc 30fe2f8d9eSSimon Glassre_cover_cc = re.compile('^Cover-letter-cc: *(.*)') 31fe2f8d9eSSimon Glass 320d24de9dSSimon Glass# Patch series tag 335c8fdd91SAlbert ARIBAUDre_series_tag = re.compile('^Series-([a-z-]*): *(.*)') 345c8fdd91SAlbert ARIBAUD 355c8fdd91SAlbert ARIBAUD# Commit series tag 365c8fdd91SAlbert ARIBAUDre_commit_tag = re.compile('^Commit-([a-z-]*): *(.*)') 370d24de9dSSimon Glass 380d24de9dSSimon Glass# Commit tags that we want to collect and keep 39659c89daSSimon Glassre_tag = re.compile('^(Tested-by|Acked-by|Reviewed-by|Patch-cc): (.*)') 400d24de9dSSimon Glass 410d24de9dSSimon Glass# The start of a new commit in the git log 4268618281SDoug Andersonre_commit = re.compile('^commit ([0-9a-f]*)$') 430d24de9dSSimon Glass 440d24de9dSSimon Glass# We detect these since checkpatch doesn't always do it 450d24de9dSSimon Glassre_space_before_tab = re.compile('^[+].* \t') 460d24de9dSSimon Glass 470d24de9dSSimon Glass# States we can be in - can we use range() and still have comments? 480d24de9dSSimon GlassSTATE_MSG_HEADER = 0 # Still in the message header 490d24de9dSSimon GlassSTATE_PATCH_SUBJECT = 1 # In patch subject (first line of log for a commit) 500d24de9dSSimon GlassSTATE_PATCH_HEADER = 2 # In patch header (after the subject) 510d24de9dSSimon GlassSTATE_DIFFS = 3 # In the diff part (past --- line) 520d24de9dSSimon Glass 530d24de9dSSimon Glassclass PatchStream: 540d24de9dSSimon Glass """Class for detecting/injecting tags in a patch or series of patches 550d24de9dSSimon Glass 560d24de9dSSimon Glass We support processing the output of 'git log' to read out the tags we 570d24de9dSSimon Glass are interested in. We can also process a patch file in order to remove 580d24de9dSSimon Glass unwanted tags or inject additional ones. These correspond to the two 590d24de9dSSimon Glass phases of processing. 600d24de9dSSimon Glass """ 610d24de9dSSimon Glass def __init__(self, series, name=None, is_log=False): 620d24de9dSSimon Glass self.skip_blank = False # True to skip a single blank line 630d24de9dSSimon Glass self.found_test = False # Found a TEST= line 640d24de9dSSimon Glass self.lines_after_test = 0 # MNumber of lines found after TEST= 650d24de9dSSimon Glass self.warn = [] # List of warnings we have collected 660d24de9dSSimon Glass self.linenum = 1 # Output line number we are up to 670d24de9dSSimon Glass self.in_section = None # Name of start...END section we are in 680d24de9dSSimon Glass self.notes = [] # Series notes 690d24de9dSSimon Glass self.section = [] # The current section...END section 700d24de9dSSimon Glass self.series = series # Info about the patch series 710d24de9dSSimon Glass self.is_log = is_log # True if indent like git log 720d24de9dSSimon Glass self.in_change = 0 # Non-zero if we are in a change list 730d24de9dSSimon Glass self.blank_count = 0 # Number of blank lines stored up 740d24de9dSSimon Glass self.state = STATE_MSG_HEADER # What state are we in? 750d24de9dSSimon Glass self.signoff = [] # Contents of signoff line 760d24de9dSSimon Glass self.commit = None # Current commit 770d24de9dSSimon Glass 780d24de9dSSimon Glass def AddToSeries(self, line, name, value): 790d24de9dSSimon Glass """Add a new Series-xxx tag. 800d24de9dSSimon Glass 810d24de9dSSimon Glass When a Series-xxx tag is detected, we come here to record it, if we 820d24de9dSSimon Glass are scanning a 'git log'. 830d24de9dSSimon Glass 840d24de9dSSimon Glass Args: 850d24de9dSSimon Glass line: Source line containing tag (useful for debug/error messages) 860d24de9dSSimon Glass name: Tag name (part after 'Series-') 870d24de9dSSimon Glass value: Tag value (part after 'Series-xxx: ') 880d24de9dSSimon Glass """ 890d24de9dSSimon Glass if name == 'notes': 900d24de9dSSimon Glass self.in_section = name 910d24de9dSSimon Glass self.skip_blank = False 920d24de9dSSimon Glass if self.is_log: 930d24de9dSSimon Glass self.series.AddTag(self.commit, line, name, value) 940d24de9dSSimon Glass 955c8fdd91SAlbert ARIBAUD def AddToCommit(self, line, name, value): 965c8fdd91SAlbert ARIBAUD """Add a new Commit-xxx tag. 975c8fdd91SAlbert ARIBAUD 985c8fdd91SAlbert ARIBAUD When a Commit-xxx tag is detected, we come here to record it. 995c8fdd91SAlbert ARIBAUD 1005c8fdd91SAlbert ARIBAUD Args: 1015c8fdd91SAlbert ARIBAUD line: Source line containing tag (useful for debug/error messages) 1025c8fdd91SAlbert ARIBAUD name: Tag name (part after 'Commit-') 1035c8fdd91SAlbert ARIBAUD value: Tag value (part after 'Commit-xxx: ') 1045c8fdd91SAlbert ARIBAUD """ 1055c8fdd91SAlbert ARIBAUD if name == 'notes': 1065c8fdd91SAlbert ARIBAUD self.in_section = 'commit-' + name 1075c8fdd91SAlbert ARIBAUD self.skip_blank = False 1085c8fdd91SAlbert ARIBAUD 1090d24de9dSSimon Glass def CloseCommit(self): 1100d24de9dSSimon Glass """Save the current commit into our commit list, and reset our state""" 1110d24de9dSSimon Glass if self.commit and self.is_log: 1120d24de9dSSimon Glass self.series.AddCommit(self.commit) 1130d24de9dSSimon Glass self.commit = None 1140d24de9dSSimon Glass 1150d24de9dSSimon Glass def ProcessLine(self, line): 1160d24de9dSSimon Glass """Process a single line of a patch file or commit log 1170d24de9dSSimon Glass 1180d24de9dSSimon Glass This process a line and returns a list of lines to output. The list 1190d24de9dSSimon Glass may be empty or may contain multiple output lines. 1200d24de9dSSimon Glass 1210d24de9dSSimon Glass This is where all the complicated logic is located. The class's 1220d24de9dSSimon Glass state is used to move between different states and detect things 1230d24de9dSSimon Glass properly. 1240d24de9dSSimon Glass 1250d24de9dSSimon Glass We can be in one of two modes: 1260d24de9dSSimon Glass self.is_log == True: This is 'git log' mode, where most output is 1270d24de9dSSimon Glass indented by 4 characters and we are scanning for tags 1280d24de9dSSimon Glass 1290d24de9dSSimon Glass self.is_log == False: This is 'patch' mode, where we already have 1300d24de9dSSimon Glass all the tags, and are processing patches to remove junk we 1310d24de9dSSimon Glass don't want, and add things we think are required. 1320d24de9dSSimon Glass 1330d24de9dSSimon Glass Args: 1340d24de9dSSimon Glass line: text line to process 1350d24de9dSSimon Glass 1360d24de9dSSimon Glass Returns: 1370d24de9dSSimon Glass list of output lines, or [] if nothing should be output 1380d24de9dSSimon Glass """ 1390d24de9dSSimon Glass # Initially we have no output. Prepare the input line string 1400d24de9dSSimon Glass out = [] 1410d24de9dSSimon Glass line = line.rstrip('\n') 1420d24de9dSSimon Glass if self.is_log: 1430d24de9dSSimon Glass if line[:4] == ' ': 1440d24de9dSSimon Glass line = line[4:] 1450d24de9dSSimon Glass 1460d24de9dSSimon Glass # Handle state transition and skipping blank lines 1475c8fdd91SAlbert ARIBAUD series_tag_match = re_series_tag.match(line) 1485c8fdd91SAlbert ARIBAUD commit_tag_match = re_commit_tag.match(line) 1490d24de9dSSimon Glass commit_match = re_commit.match(line) if self.is_log else None 150fe2f8d9eSSimon Glass cover_cc_match = re_cover_cc.match(line) 151102061bdSSimon Glass signoff_match = re_signoff.match(line) 1520d24de9dSSimon Glass tag_match = None 1530d24de9dSSimon Glass if self.state == STATE_PATCH_HEADER: 1540d24de9dSSimon Glass tag_match = re_tag.match(line) 1550d24de9dSSimon Glass is_blank = not line.strip() 1560d24de9dSSimon Glass if is_blank: 1570d24de9dSSimon Glass if (self.state == STATE_MSG_HEADER 1580d24de9dSSimon Glass or self.state == STATE_PATCH_SUBJECT): 1590d24de9dSSimon Glass self.state += 1 1600d24de9dSSimon Glass 1610d24de9dSSimon Glass # We don't have a subject in the text stream of patch files 1620d24de9dSSimon Glass # It has its own line with a Subject: tag 1630d24de9dSSimon Glass if not self.is_log and self.state == STATE_PATCH_SUBJECT: 1640d24de9dSSimon Glass self.state += 1 1650d24de9dSSimon Glass elif commit_match: 1660d24de9dSSimon Glass self.state = STATE_MSG_HEADER 1670d24de9dSSimon Glass 1680d24de9dSSimon Glass # If we are in a section, keep collecting lines until we see END 1690d24de9dSSimon Glass if self.in_section: 1700d24de9dSSimon Glass if line == 'END': 1710d24de9dSSimon Glass if self.in_section == 'cover': 1720d24de9dSSimon Glass self.series.cover = self.section 1730d24de9dSSimon Glass elif self.in_section == 'notes': 1740d24de9dSSimon Glass if self.is_log: 1750d24de9dSSimon Glass self.series.notes += self.section 1765c8fdd91SAlbert ARIBAUD elif self.in_section == 'commit-notes': 1775c8fdd91SAlbert ARIBAUD if self.is_log: 1785c8fdd91SAlbert ARIBAUD self.commit.notes += self.section 1790d24de9dSSimon Glass else: 1800d24de9dSSimon Glass self.warn.append("Unknown section '%s'" % self.in_section) 1810d24de9dSSimon Glass self.in_section = None 1820d24de9dSSimon Glass self.skip_blank = True 1830d24de9dSSimon Glass self.section = [] 1840d24de9dSSimon Glass else: 1850d24de9dSSimon Glass self.section.append(line) 1860d24de9dSSimon Glass 1870d24de9dSSimon Glass # Detect the commit subject 1880d24de9dSSimon Glass elif not is_blank and self.state == STATE_PATCH_SUBJECT: 1890d24de9dSSimon Glass self.commit.subject = line 1900d24de9dSSimon Glass 1910d24de9dSSimon Glass # Detect the tags we want to remove, and skip blank lines 1925c8fdd91SAlbert ARIBAUD elif re_remove.match(line) and not commit_tag_match: 1930d24de9dSSimon Glass self.skip_blank = True 1940d24de9dSSimon Glass 1950d24de9dSSimon Glass # TEST= should be the last thing in the commit, so remove 1960d24de9dSSimon Glass # everything after it 1970d24de9dSSimon Glass if line.startswith('TEST='): 1980d24de9dSSimon Glass self.found_test = True 1990d24de9dSSimon Glass elif self.skip_blank and is_blank: 2000d24de9dSSimon Glass self.skip_blank = False 2010d24de9dSSimon Glass 2020d24de9dSSimon Glass # Detect the start of a cover letter section 2030d24de9dSSimon Glass elif re_cover.match(line): 2040d24de9dSSimon Glass self.in_section = 'cover' 2050d24de9dSSimon Glass self.skip_blank = False 2060d24de9dSSimon Glass 207fe2f8d9eSSimon Glass elif cover_cc_match: 208fe2f8d9eSSimon Glass value = cover_cc_match.group(1) 209fe2f8d9eSSimon Glass self.AddToSeries(line, 'cover-cc', value) 210fe2f8d9eSSimon Glass 2110d24de9dSSimon Glass # If we are in a change list, key collected lines until a blank one 2120d24de9dSSimon Glass elif self.in_change: 2130d24de9dSSimon Glass if is_blank: 2140d24de9dSSimon Glass # Blank line ends this change list 2150d24de9dSSimon Glass self.in_change = 0 216102061bdSSimon Glass elif line == '---': 21705e5b735SIlya Yanok self.in_change = 0 21805e5b735SIlya Yanok out = self.ProcessLine(line) 2190d24de9dSSimon Glass else: 220a8840cb2SIlya Yanok if self.is_log: 2210d24de9dSSimon Glass self.series.AddChange(self.in_change, self.commit, line) 2220d24de9dSSimon Glass self.skip_blank = False 2230d24de9dSSimon Glass 2240d24de9dSSimon Glass # Detect Series-xxx tags 2255c8fdd91SAlbert ARIBAUD elif series_tag_match: 2265c8fdd91SAlbert ARIBAUD name = series_tag_match.group(1) 2275c8fdd91SAlbert ARIBAUD value = series_tag_match.group(2) 2280d24de9dSSimon Glass if name == 'changes': 2290d24de9dSSimon Glass # value is the version number: e.g. 1, or 2 2300d24de9dSSimon Glass try: 2310d24de9dSSimon Glass value = int(value) 2320d24de9dSSimon Glass except ValueError as str: 2330d24de9dSSimon Glass raise ValueError("%s: Cannot decode version info '%s'" % 2340d24de9dSSimon Glass (self.commit.hash, line)) 2350d24de9dSSimon Glass self.in_change = int(value) 2360d24de9dSSimon Glass else: 2370d24de9dSSimon Glass self.AddToSeries(line, name, value) 2380d24de9dSSimon Glass self.skip_blank = True 2390d24de9dSSimon Glass 2405c8fdd91SAlbert ARIBAUD # Detect Commit-xxx tags 2415c8fdd91SAlbert ARIBAUD elif commit_tag_match: 2425c8fdd91SAlbert ARIBAUD name = commit_tag_match.group(1) 2435c8fdd91SAlbert ARIBAUD value = commit_tag_match.group(2) 2445c8fdd91SAlbert ARIBAUD if name == 'notes': 2455c8fdd91SAlbert ARIBAUD self.AddToCommit(line, name, value) 2465c8fdd91SAlbert ARIBAUD self.skip_blank = True 2475c8fdd91SAlbert ARIBAUD 2480d24de9dSSimon Glass # Detect the start of a new commit 2490d24de9dSSimon Glass elif commit_match: 2500d24de9dSSimon Glass self.CloseCommit() 251e62f905eSSimon Glass # TODO: We should store the whole hash, and just display a subset 252e62f905eSSimon Glass self.commit = commit.Commit(commit_match.group(1)[:8]) 2530d24de9dSSimon Glass 2540d24de9dSSimon Glass # Detect tags in the commit message 2550d24de9dSSimon Glass elif tag_match: 2560d24de9dSSimon Glass # Remove Tested-by self, since few will take much notice 257c7379149SIlya Yanok if (tag_match.group(1) == 'Tested-by' and 2580d24de9dSSimon Glass tag_match.group(2).find(os.getenv('USER') + '@') != -1): 2590d24de9dSSimon Glass self.warn.append("Ignoring %s" % line) 260659c89daSSimon Glass elif tag_match.group(1) == 'Patch-cc': 2610d24de9dSSimon Glass self.commit.AddCc(tag_match.group(2).split(',')) 2620d24de9dSSimon Glass else: 263*d0c5719dSSimon Glass out = [line] 2640d24de9dSSimon Glass 265102061bdSSimon Glass # Suppress duplicate signoffs 266102061bdSSimon Glass elif signoff_match: 267e752edcbSSimon Glass if (self.is_log or not self.commit or 2686be6b6bcSSimon Glass self.commit.CheckDuplicateSignoff(signoff_match.group(1))): 269102061bdSSimon Glass out = [line] 270102061bdSSimon Glass 2710d24de9dSSimon Glass # Well that means this is an ordinary line 2720d24de9dSSimon Glass else: 2730d24de9dSSimon Glass pos = 1 2740d24de9dSSimon Glass # Look for ugly ASCII characters 2750d24de9dSSimon Glass for ch in line: 2760d24de9dSSimon Glass # TODO: Would be nicer to report source filename and line 2770d24de9dSSimon Glass if ord(ch) > 0x80: 2780d24de9dSSimon Glass self.warn.append("Line %d/%d ('%s') has funny ascii char" % 2790d24de9dSSimon Glass (self.linenum, pos, line)) 2800d24de9dSSimon Glass pos += 1 2810d24de9dSSimon Glass 2820d24de9dSSimon Glass # Look for space before tab 2830d24de9dSSimon Glass m = re_space_before_tab.match(line) 2840d24de9dSSimon Glass if m: 2850d24de9dSSimon Glass self.warn.append('Line %d/%d has space before tab' % 2860d24de9dSSimon Glass (self.linenum, m.start())) 2870d24de9dSSimon Glass 2880d24de9dSSimon Glass # OK, we have a valid non-blank line 2890d24de9dSSimon Glass out = [line] 2900d24de9dSSimon Glass self.linenum += 1 2910d24de9dSSimon Glass self.skip_blank = False 2920d24de9dSSimon Glass if self.state == STATE_DIFFS: 2930d24de9dSSimon Glass pass 2940d24de9dSSimon Glass 2950d24de9dSSimon Glass # If this is the start of the diffs section, emit our tags and 2960d24de9dSSimon Glass # change log 2970d24de9dSSimon Glass elif line == '---': 2980d24de9dSSimon Glass self.state = STATE_DIFFS 2990d24de9dSSimon Glass 3000d24de9dSSimon Glass # Output the tags (signeoff first), then change list 3010d24de9dSSimon Glass out = [] 3020d24de9dSSimon Glass log = self.series.MakeChangeLog(self.commit) 303e752edcbSSimon Glass out += [line] 304e752edcbSSimon Glass if self.commit: 305e752edcbSSimon Glass out += self.commit.notes 306e752edcbSSimon Glass out += [''] + log 3070d24de9dSSimon Glass elif self.found_test: 3080d24de9dSSimon Glass if not re_allowed_after_test.match(line): 3090d24de9dSSimon Glass self.lines_after_test += 1 3100d24de9dSSimon Glass 3110d24de9dSSimon Glass return out 3120d24de9dSSimon Glass 3130d24de9dSSimon Glass def Finalize(self): 3140d24de9dSSimon Glass """Close out processing of this patch stream""" 3150d24de9dSSimon Glass self.CloseCommit() 3160d24de9dSSimon Glass if self.lines_after_test: 3170d24de9dSSimon Glass self.warn.append('Found %d lines after TEST=' % 3180d24de9dSSimon Glass self.lines_after_test) 3190d24de9dSSimon Glass 3200d24de9dSSimon Glass def ProcessStream(self, infd, outfd): 3210d24de9dSSimon Glass """Copy a stream from infd to outfd, filtering out unwanting things. 3220d24de9dSSimon Glass 3230d24de9dSSimon Glass This is used to process patch files one at a time. 3240d24de9dSSimon Glass 3250d24de9dSSimon Glass Args: 3260d24de9dSSimon Glass infd: Input stream file object 3270d24de9dSSimon Glass outfd: Output stream file object 3280d24de9dSSimon Glass """ 3290d24de9dSSimon Glass # Extract the filename from each diff, for nice warnings 3300d24de9dSSimon Glass fname = None 3310d24de9dSSimon Glass last_fname = None 3320d24de9dSSimon Glass re_fname = re.compile('diff --git a/(.*) b/.*') 3330d24de9dSSimon Glass while True: 3340d24de9dSSimon Glass line = infd.readline() 3350d24de9dSSimon Glass if not line: 3360d24de9dSSimon Glass break 3370d24de9dSSimon Glass out = self.ProcessLine(line) 3380d24de9dSSimon Glass 3390d24de9dSSimon Glass # Try to detect blank lines at EOF 3400d24de9dSSimon Glass for line in out: 3410d24de9dSSimon Glass match = re_fname.match(line) 3420d24de9dSSimon Glass if match: 3430d24de9dSSimon Glass last_fname = fname 3440d24de9dSSimon Glass fname = match.group(1) 3450d24de9dSSimon Glass if line == '+': 3460d24de9dSSimon Glass self.blank_count += 1 3470d24de9dSSimon Glass else: 3480d24de9dSSimon Glass if self.blank_count and (line == '-- ' or match): 3490d24de9dSSimon Glass self.warn.append("Found possible blank line(s) at " 3500d24de9dSSimon Glass "end of file '%s'" % last_fname) 3510d24de9dSSimon Glass outfd.write('+\n' * self.blank_count) 3520d24de9dSSimon Glass outfd.write(line + '\n') 3530d24de9dSSimon Glass self.blank_count = 0 3540d24de9dSSimon Glass self.Finalize() 3550d24de9dSSimon Glass 3560d24de9dSSimon Glass 357e62f905eSSimon Glassdef GetMetaDataForList(commit_range, git_dir=None, count=None, 358e62f905eSSimon Glass series = Series()): 359e62f905eSSimon Glass """Reads out patch series metadata from the commits 360e62f905eSSimon Glass 361e62f905eSSimon Glass This does a 'git log' on the relevant commits and pulls out the tags we 362e62f905eSSimon Glass are interested in. 363e62f905eSSimon Glass 364e62f905eSSimon Glass Args: 365e62f905eSSimon Glass commit_range: Range of commits to count (e.g. 'HEAD..base') 366e62f905eSSimon Glass git_dir: Path to git repositiory (None to use default) 367e62f905eSSimon Glass count: Number of commits to list, or None for no limit 368e62f905eSSimon Glass series: Series object to add information into. By default a new series 369e62f905eSSimon Glass is started. 370e62f905eSSimon Glass Returns: 371e62f905eSSimon Glass A Series object containing information about the commits. 372e62f905eSSimon Glass """ 373cda2a611SSimon Glass params = gitutil.LogCmd(commit_range,reverse=True, count=count, 374cda2a611SSimon Glass git_dir=git_dir) 375cda2a611SSimon Glass stdout = command.RunPipe([params], capture=True).stdout 376e62f905eSSimon Glass ps = PatchStream(series, is_log=True) 377e62f905eSSimon Glass for line in stdout.splitlines(): 378e62f905eSSimon Glass ps.ProcessLine(line) 379e62f905eSSimon Glass ps.Finalize() 380e62f905eSSimon Glass return series 381e62f905eSSimon Glass 3820d24de9dSSimon Glassdef GetMetaData(start, count): 3830d24de9dSSimon Glass """Reads out patch series metadata from the commits 3840d24de9dSSimon Glass 3850d24de9dSSimon Glass This does a 'git log' on the relevant commits and pulls out the tags we 3860d24de9dSSimon Glass are interested in. 3870d24de9dSSimon Glass 3880d24de9dSSimon Glass Args: 3890d24de9dSSimon Glass start: Commit to start from: 0=HEAD, 1=next one, etc. 3900d24de9dSSimon Glass count: Number of commits to list 3910d24de9dSSimon Glass """ 392e62f905eSSimon Glass return GetMetaDataForList('HEAD~%d' % start, None, count) 3930d24de9dSSimon Glass 3940d24de9dSSimon Glassdef FixPatch(backup_dir, fname, series, commit): 3950d24de9dSSimon Glass """Fix up a patch file, by adding/removing as required. 3960d24de9dSSimon Glass 3970d24de9dSSimon Glass We remove our tags from the patch file, insert changes lists, etc. 3980d24de9dSSimon Glass The patch file is processed in place, and overwritten. 3990d24de9dSSimon Glass 4000d24de9dSSimon Glass A backup file is put into backup_dir (if not None). 4010d24de9dSSimon Glass 4020d24de9dSSimon Glass Args: 4030d24de9dSSimon Glass fname: Filename to patch file to process 4040d24de9dSSimon Glass series: Series information about this patch set 4050d24de9dSSimon Glass commit: Commit object for this patch file 4060d24de9dSSimon Glass Return: 4070d24de9dSSimon Glass A list of errors, or [] if all ok. 4080d24de9dSSimon Glass """ 4090d24de9dSSimon Glass handle, tmpname = tempfile.mkstemp() 4100d24de9dSSimon Glass outfd = os.fdopen(handle, 'w') 4110d24de9dSSimon Glass infd = open(fname, 'r') 4120d24de9dSSimon Glass ps = PatchStream(series) 4130d24de9dSSimon Glass ps.commit = commit 4140d24de9dSSimon Glass ps.ProcessStream(infd, outfd) 4150d24de9dSSimon Glass infd.close() 4160d24de9dSSimon Glass outfd.close() 4170d24de9dSSimon Glass 4180d24de9dSSimon Glass # Create a backup file if required 4190d24de9dSSimon Glass if backup_dir: 4200d24de9dSSimon Glass shutil.copy(fname, os.path.join(backup_dir, os.path.basename(fname))) 4210d24de9dSSimon Glass shutil.move(tmpname, fname) 4220d24de9dSSimon Glass return ps.warn 4230d24de9dSSimon Glass 4240d24de9dSSimon Glassdef FixPatches(series, fnames): 4250d24de9dSSimon Glass """Fix up a list of patches identified by filenames 4260d24de9dSSimon Glass 4270d24de9dSSimon Glass The patch files are processed in place, and overwritten. 4280d24de9dSSimon Glass 4290d24de9dSSimon Glass Args: 4300d24de9dSSimon Glass series: The series object 4310d24de9dSSimon Glass fnames: List of patch files to process 4320d24de9dSSimon Glass """ 4330d24de9dSSimon Glass # Current workflow creates patches, so we shouldn't need a backup 4340d24de9dSSimon Glass backup_dir = None #tempfile.mkdtemp('clean-patch') 4350d24de9dSSimon Glass count = 0 4360d24de9dSSimon Glass for fname in fnames: 4370d24de9dSSimon Glass commit = series.commits[count] 4380d24de9dSSimon Glass commit.patch = fname 4390d24de9dSSimon Glass result = FixPatch(backup_dir, fname, series, commit) 4400d24de9dSSimon Glass if result: 4410d24de9dSSimon Glass print '%d warnings for %s:' % (len(result), fname) 4420d24de9dSSimon Glass for warn in result: 4430d24de9dSSimon Glass print '\t', warn 4440d24de9dSSimon Glass print 4450d24de9dSSimon Glass count += 1 4460d24de9dSSimon Glass print 'Cleaned %d patches' % count 4470d24de9dSSimon Glass return series 4480d24de9dSSimon Glass 4490d24de9dSSimon Glassdef InsertCoverLetter(fname, series, count): 4500d24de9dSSimon Glass """Inserts a cover letter with the required info into patch 0 4510d24de9dSSimon Glass 4520d24de9dSSimon Glass Args: 4530d24de9dSSimon Glass fname: Input / output filename of the cover letter file 4540d24de9dSSimon Glass series: Series object 4550d24de9dSSimon Glass count: Number of patches in the series 4560d24de9dSSimon Glass """ 4570d24de9dSSimon Glass fd = open(fname, 'r') 4580d24de9dSSimon Glass lines = fd.readlines() 4590d24de9dSSimon Glass fd.close() 4600d24de9dSSimon Glass 4610d24de9dSSimon Glass fd = open(fname, 'w') 4620d24de9dSSimon Glass text = series.cover 4630d24de9dSSimon Glass prefix = series.GetPatchPrefix() 4640d24de9dSSimon Glass for line in lines: 4650d24de9dSSimon Glass if line.startswith('Subject:'): 4660d24de9dSSimon Glass # TODO: if more than 10 patches this should save 00/xx, not 0/xx 4670d24de9dSSimon Glass line = 'Subject: [%s 0/%d] %s\n' % (prefix, count, text[0]) 4680d24de9dSSimon Glass 4690d24de9dSSimon Glass # Insert our cover letter 4700d24de9dSSimon Glass elif line.startswith('*** BLURB HERE ***'): 4710d24de9dSSimon Glass # First the blurb test 4720d24de9dSSimon Glass line = '\n'.join(text[1:]) + '\n' 4730d24de9dSSimon Glass if series.get('notes'): 4740d24de9dSSimon Glass line += '\n'.join(series.notes) + '\n' 4750d24de9dSSimon Glass 4760d24de9dSSimon Glass # Now the change list 4770d24de9dSSimon Glass out = series.MakeChangeLog(None) 4780d24de9dSSimon Glass line += '\n' + '\n'.join(out) 4790d24de9dSSimon Glass fd.write(line) 4800d24de9dSSimon Glass fd.close() 481