xref: /rk3399_rockchip-uboot/tools/patman/patchstream.py (revision fe2f8d9e2f1bc00f143a22191a1d7076667ff436)
10d24de9dSSimon Glass# Copyright (c) 2011 The Chromium OS Authors.
20d24de9dSSimon Glass#
30d24de9dSSimon Glass# See file CREDITS for list of people who contributed to this
40d24de9dSSimon Glass# project.
50d24de9dSSimon Glass#
60d24de9dSSimon Glass# This program is free software; you can redistribute it and/or
70d24de9dSSimon Glass# modify it under the terms of the GNU General Public License as
80d24de9dSSimon Glass# published by the Free Software Foundation; either version 2 of
90d24de9dSSimon Glass# the License, or (at your option) any later version.
100d24de9dSSimon Glass#
110d24de9dSSimon Glass# This program is distributed in the hope that it will be useful,
120d24de9dSSimon Glass# but WITHOUT ANY WARRANTY; without even the implied warranty of
130d24de9dSSimon Glass# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
140d24de9dSSimon Glass# GNU General Public License for more details.
150d24de9dSSimon Glass#
160d24de9dSSimon Glass# You should have received a copy of the GNU General Public License
170d24de9dSSimon Glass# along with this program; if not, write to the Free Software
180d24de9dSSimon Glass# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
190d24de9dSSimon Glass# MA 02111-1307 USA
200d24de9dSSimon Glass#
210d24de9dSSimon Glass
220d24de9dSSimon Glassimport os
230d24de9dSSimon Glassimport re
240d24de9dSSimon Glassimport shutil
250d24de9dSSimon Glassimport tempfile
260d24de9dSSimon Glass
270d24de9dSSimon Glassimport command
280d24de9dSSimon Glassimport commit
290d24de9dSSimon Glassimport gitutil
300d24de9dSSimon Glassfrom series import Series
310d24de9dSSimon Glass
320d24de9dSSimon Glass# Tags that we detect and remove
33619dd5deSSimon Glassre_remove = re.compile('^BUG=|^TEST=|^BRANCH=|^Change-Id:|^Review URL:'
3428b3594eSDoug Anderson    '|Reviewed-on:|Commit-Ready:')
350d24de9dSSimon Glass
360d24de9dSSimon Glass# Lines which are allowed after a TEST= line
370d24de9dSSimon Glassre_allowed_after_test = re.compile('^Signed-off-by:')
380d24de9dSSimon Glass
3905e5b735SIlya Yanok# Signoffs
4005e5b735SIlya Yanokre_signoff = re.compile('^Signed-off-by:')
4105e5b735SIlya Yanok
420d24de9dSSimon Glass# The start of the cover letter
430d24de9dSSimon Glassre_cover = re.compile('^Cover-letter:')
440d24de9dSSimon Glass
45*fe2f8d9eSSimon Glass# A cover letter Cc
46*fe2f8d9eSSimon Glassre_cover_cc = re.compile('^Cover-letter-cc: *(.*)')
47*fe2f8d9eSSimon Glass
480d24de9dSSimon Glass# Patch series tag
490d24de9dSSimon Glassre_series = re.compile('^Series-(\w*): *(.*)')
500d24de9dSSimon Glass
510d24de9dSSimon Glass# Commit tags that we want to collect and keep
5228b3594eSDoug Andersonre_tag = re.compile('^(Tested-by|Acked-by|Reviewed-by|Cc): (.*)')
530d24de9dSSimon Glass
540d24de9dSSimon Glass# The start of a new commit in the git log
550d24de9dSSimon Glassre_commit = re.compile('^commit (.*)')
560d24de9dSSimon Glass
570d24de9dSSimon Glass# We detect these since checkpatch doesn't always do it
580d24de9dSSimon Glassre_space_before_tab = re.compile('^[+].* \t')
590d24de9dSSimon Glass
600d24de9dSSimon Glass# States we can be in - can we use range() and still have comments?
610d24de9dSSimon GlassSTATE_MSG_HEADER = 0        # Still in the message header
620d24de9dSSimon GlassSTATE_PATCH_SUBJECT = 1     # In patch subject (first line of log for a commit)
630d24de9dSSimon GlassSTATE_PATCH_HEADER = 2      # In patch header (after the subject)
640d24de9dSSimon GlassSTATE_DIFFS = 3             # In the diff part (past --- line)
650d24de9dSSimon Glass
660d24de9dSSimon Glassclass PatchStream:
670d24de9dSSimon Glass    """Class for detecting/injecting tags in a patch or series of patches
680d24de9dSSimon Glass
690d24de9dSSimon Glass    We support processing the output of 'git log' to read out the tags we
700d24de9dSSimon Glass    are interested in. We can also process a patch file in order to remove
710d24de9dSSimon Glass    unwanted tags or inject additional ones. These correspond to the two
720d24de9dSSimon Glass    phases of processing.
730d24de9dSSimon Glass    """
740d24de9dSSimon Glass    def __init__(self, series, name=None, is_log=False):
750d24de9dSSimon Glass        self.skip_blank = False          # True to skip a single blank line
760d24de9dSSimon Glass        self.found_test = False          # Found a TEST= line
770d24de9dSSimon Glass        self.lines_after_test = 0        # MNumber of lines found after TEST=
780d24de9dSSimon Glass        self.warn = []                   # List of warnings we have collected
790d24de9dSSimon Glass        self.linenum = 1                 # Output line number we are up to
800d24de9dSSimon Glass        self.in_section = None           # Name of start...END section we are in
810d24de9dSSimon Glass        self.notes = []                  # Series notes
820d24de9dSSimon Glass        self.section = []                # The current section...END section
830d24de9dSSimon Glass        self.series = series             # Info about the patch series
840d24de9dSSimon Glass        self.is_log = is_log             # True if indent like git log
850d24de9dSSimon Glass        self.in_change = 0               # Non-zero if we are in a change list
860d24de9dSSimon Glass        self.blank_count = 0             # Number of blank lines stored up
870d24de9dSSimon Glass        self.state = STATE_MSG_HEADER    # What state are we in?
880d24de9dSSimon Glass        self.tags = []                   # Tags collected, like Tested-by...
890d24de9dSSimon Glass        self.signoff = []                # Contents of signoff line
900d24de9dSSimon Glass        self.commit = None               # Current commit
910d24de9dSSimon Glass
920d24de9dSSimon Glass    def AddToSeries(self, line, name, value):
930d24de9dSSimon Glass        """Add a new Series-xxx tag.
940d24de9dSSimon Glass
950d24de9dSSimon Glass        When a Series-xxx tag is detected, we come here to record it, if we
960d24de9dSSimon Glass        are scanning a 'git log'.
970d24de9dSSimon Glass
980d24de9dSSimon Glass        Args:
990d24de9dSSimon Glass            line: Source line containing tag (useful for debug/error messages)
1000d24de9dSSimon Glass            name: Tag name (part after 'Series-')
1010d24de9dSSimon Glass            value: Tag value (part after 'Series-xxx: ')
1020d24de9dSSimon Glass        """
1030d24de9dSSimon Glass        if name == 'notes':
1040d24de9dSSimon Glass            self.in_section = name
1050d24de9dSSimon Glass            self.skip_blank = False
1060d24de9dSSimon Glass        if self.is_log:
1070d24de9dSSimon Glass            self.series.AddTag(self.commit, line, name, value)
1080d24de9dSSimon Glass
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 FormatTags(self, tags):
1160d24de9dSSimon Glass        out_list = []
1170d24de9dSSimon Glass        for tag in sorted(tags):
1180d24de9dSSimon Glass            if tag.startswith('Cc:'):
1190d24de9dSSimon Glass                tag_list = tag[4:].split(',')
1200d24de9dSSimon Glass                out_list += gitutil.BuildEmailList(tag_list, 'Cc:')
1210d24de9dSSimon Glass            else:
1220d24de9dSSimon Glass                out_list.append(tag)
1230d24de9dSSimon Glass        return out_list
1240d24de9dSSimon Glass
1250d24de9dSSimon Glass    def ProcessLine(self, line):
1260d24de9dSSimon Glass        """Process a single line of a patch file or commit log
1270d24de9dSSimon Glass
1280d24de9dSSimon Glass        This process a line and returns a list of lines to output. The list
1290d24de9dSSimon Glass        may be empty or may contain multiple output lines.
1300d24de9dSSimon Glass
1310d24de9dSSimon Glass        This is where all the complicated logic is located. The class's
1320d24de9dSSimon Glass        state is used to move between different states and detect things
1330d24de9dSSimon Glass        properly.
1340d24de9dSSimon Glass
1350d24de9dSSimon Glass        We can be in one of two modes:
1360d24de9dSSimon Glass            self.is_log == True: This is 'git log' mode, where most output is
1370d24de9dSSimon Glass                indented by 4 characters and we are scanning for tags
1380d24de9dSSimon Glass
1390d24de9dSSimon Glass            self.is_log == False: This is 'patch' mode, where we already have
1400d24de9dSSimon Glass                all the tags, and are processing patches to remove junk we
1410d24de9dSSimon Glass                don't want, and add things we think are required.
1420d24de9dSSimon Glass
1430d24de9dSSimon Glass        Args:
1440d24de9dSSimon Glass            line: text line to process
1450d24de9dSSimon Glass
1460d24de9dSSimon Glass        Returns:
1470d24de9dSSimon Glass            list of output lines, or [] if nothing should be output
1480d24de9dSSimon Glass        """
1490d24de9dSSimon Glass        # Initially we have no output. Prepare the input line string
1500d24de9dSSimon Glass        out = []
1510d24de9dSSimon Glass        line = line.rstrip('\n')
1520d24de9dSSimon Glass        if self.is_log:
1530d24de9dSSimon Glass            if line[:4] == '    ':
1540d24de9dSSimon Glass                line = line[4:]
1550d24de9dSSimon Glass
1560d24de9dSSimon Glass        # Handle state transition and skipping blank lines
1570d24de9dSSimon Glass        series_match = re_series.match(line)
1580d24de9dSSimon Glass        commit_match = re_commit.match(line) if self.is_log else None
159*fe2f8d9eSSimon Glass        cover_cc_match = re_cover_cc.match(line)
1600d24de9dSSimon Glass        tag_match = None
1610d24de9dSSimon Glass        if self.state == STATE_PATCH_HEADER:
1620d24de9dSSimon Glass            tag_match = re_tag.match(line)
1630d24de9dSSimon Glass        is_blank = not line.strip()
1640d24de9dSSimon Glass        if is_blank:
1650d24de9dSSimon Glass            if (self.state == STATE_MSG_HEADER
1660d24de9dSSimon Glass                    or self.state == STATE_PATCH_SUBJECT):
1670d24de9dSSimon Glass                self.state += 1
1680d24de9dSSimon Glass
1690d24de9dSSimon Glass            # We don't have a subject in the text stream of patch files
1700d24de9dSSimon Glass            # It has its own line with a Subject: tag
1710d24de9dSSimon Glass            if not self.is_log and self.state == STATE_PATCH_SUBJECT:
1720d24de9dSSimon Glass                self.state += 1
1730d24de9dSSimon Glass        elif commit_match:
1740d24de9dSSimon Glass            self.state = STATE_MSG_HEADER
1750d24de9dSSimon Glass
1760d24de9dSSimon Glass        # If we are in a section, keep collecting lines until we see END
1770d24de9dSSimon Glass        if self.in_section:
1780d24de9dSSimon Glass            if line == 'END':
1790d24de9dSSimon Glass                if self.in_section == 'cover':
1800d24de9dSSimon Glass                    self.series.cover = self.section
1810d24de9dSSimon Glass                elif self.in_section == 'notes':
1820d24de9dSSimon Glass                    if self.is_log:
1830d24de9dSSimon Glass                        self.series.notes += self.section
1840d24de9dSSimon Glass                else:
1850d24de9dSSimon Glass                    self.warn.append("Unknown section '%s'" % self.in_section)
1860d24de9dSSimon Glass                self.in_section = None
1870d24de9dSSimon Glass                self.skip_blank = True
1880d24de9dSSimon Glass                self.section = []
1890d24de9dSSimon Glass            else:
1900d24de9dSSimon Glass                self.section.append(line)
1910d24de9dSSimon Glass
1920d24de9dSSimon Glass        # Detect the commit subject
1930d24de9dSSimon Glass        elif not is_blank and self.state == STATE_PATCH_SUBJECT:
1940d24de9dSSimon Glass            self.commit.subject = line
1950d24de9dSSimon Glass
1960d24de9dSSimon Glass        # Detect the tags we want to remove, and skip blank lines
1970d24de9dSSimon Glass        elif re_remove.match(line):
1980d24de9dSSimon Glass            self.skip_blank = True
1990d24de9dSSimon Glass
2000d24de9dSSimon Glass            # TEST= should be the last thing in the commit, so remove
2010d24de9dSSimon Glass            # everything after it
2020d24de9dSSimon Glass            if line.startswith('TEST='):
2030d24de9dSSimon Glass                self.found_test = True
2040d24de9dSSimon Glass        elif self.skip_blank and is_blank:
2050d24de9dSSimon Glass            self.skip_blank = False
2060d24de9dSSimon Glass
2070d24de9dSSimon Glass        # Detect the start of a cover letter section
2080d24de9dSSimon Glass        elif re_cover.match(line):
2090d24de9dSSimon Glass            self.in_section = 'cover'
2100d24de9dSSimon Glass            self.skip_blank = False
2110d24de9dSSimon Glass
212*fe2f8d9eSSimon Glass        elif cover_cc_match:
213*fe2f8d9eSSimon Glass            value = cover_cc_match.group(1)
214*fe2f8d9eSSimon Glass            self.AddToSeries(line, 'cover-cc', value)
215*fe2f8d9eSSimon Glass
2160d24de9dSSimon Glass        # If we are in a change list, key collected lines until a blank one
2170d24de9dSSimon Glass        elif self.in_change:
2180d24de9dSSimon Glass            if is_blank:
2190d24de9dSSimon Glass                # Blank line ends this change list
2200d24de9dSSimon Glass                self.in_change = 0
22105e5b735SIlya Yanok            elif line == '---' or re_signoff.match(line):
22205e5b735SIlya Yanok                self.in_change = 0
22305e5b735SIlya Yanok                out = self.ProcessLine(line)
2240d24de9dSSimon Glass            else:
225a8840cb2SIlya Yanok                if self.is_log:
2260d24de9dSSimon Glass                    self.series.AddChange(self.in_change, self.commit, line)
2270d24de9dSSimon Glass            self.skip_blank = False
2280d24de9dSSimon Glass
2290d24de9dSSimon Glass        # Detect Series-xxx tags
2300d24de9dSSimon Glass        elif series_match:
2310d24de9dSSimon Glass            name = series_match.group(1)
2320d24de9dSSimon Glass            value = series_match.group(2)
2330d24de9dSSimon Glass            if name == 'changes':
2340d24de9dSSimon Glass                # value is the version number: e.g. 1, or 2
2350d24de9dSSimon Glass                try:
2360d24de9dSSimon Glass                    value = int(value)
2370d24de9dSSimon Glass                except ValueError as str:
2380d24de9dSSimon Glass                    raise ValueError("%s: Cannot decode version info '%s'" %
2390d24de9dSSimon Glass                        (self.commit.hash, line))
2400d24de9dSSimon Glass                self.in_change = int(value)
2410d24de9dSSimon Glass            else:
2420d24de9dSSimon Glass                self.AddToSeries(line, name, value)
2430d24de9dSSimon Glass                self.skip_blank = True
2440d24de9dSSimon Glass
2450d24de9dSSimon Glass        # Detect the start of a new commit
2460d24de9dSSimon Glass        elif commit_match:
2470d24de9dSSimon Glass            self.CloseCommit()
248e62f905eSSimon Glass            # TODO: We should store the whole hash, and just display a subset
249e62f905eSSimon Glass            self.commit = commit.Commit(commit_match.group(1)[:8])
2500d24de9dSSimon Glass
2510d24de9dSSimon Glass        # Detect tags in the commit message
2520d24de9dSSimon Glass        elif tag_match:
2530d24de9dSSimon Glass            # Remove Tested-by self, since few will take much notice
254c7379149SIlya Yanok            if (tag_match.group(1) == 'Tested-by' and
2550d24de9dSSimon Glass                    tag_match.group(2).find(os.getenv('USER') + '@') != -1):
2560d24de9dSSimon Glass                self.warn.append("Ignoring %s" % line)
2570d24de9dSSimon Glass            elif tag_match.group(1) == 'Cc':
2580d24de9dSSimon Glass                self.commit.AddCc(tag_match.group(2).split(','))
2590d24de9dSSimon Glass            else:
2600d24de9dSSimon Glass                self.tags.append(line);
2610d24de9dSSimon Glass
2620d24de9dSSimon Glass        # Well that means this is an ordinary line
2630d24de9dSSimon Glass        else:
2640d24de9dSSimon Glass            pos = 1
2650d24de9dSSimon Glass            # Look for ugly ASCII characters
2660d24de9dSSimon Glass            for ch in line:
2670d24de9dSSimon Glass                # TODO: Would be nicer to report source filename and line
2680d24de9dSSimon Glass                if ord(ch) > 0x80:
2690d24de9dSSimon Glass                    self.warn.append("Line %d/%d ('%s') has funny ascii char" %
2700d24de9dSSimon Glass                        (self.linenum, pos, line))
2710d24de9dSSimon Glass                pos += 1
2720d24de9dSSimon Glass
2730d24de9dSSimon Glass            # Look for space before tab
2740d24de9dSSimon Glass            m = re_space_before_tab.match(line)
2750d24de9dSSimon Glass            if m:
2760d24de9dSSimon Glass                self.warn.append('Line %d/%d has space before tab' %
2770d24de9dSSimon Glass                    (self.linenum, m.start()))
2780d24de9dSSimon Glass
2790d24de9dSSimon Glass            # OK, we have a valid non-blank line
2800d24de9dSSimon Glass            out = [line]
2810d24de9dSSimon Glass            self.linenum += 1
2820d24de9dSSimon Glass            self.skip_blank = False
2830d24de9dSSimon Glass            if self.state == STATE_DIFFS:
2840d24de9dSSimon Glass                pass
2850d24de9dSSimon Glass
2860d24de9dSSimon Glass            # If this is the start of the diffs section, emit our tags and
2870d24de9dSSimon Glass            # change log
2880d24de9dSSimon Glass            elif line == '---':
2890d24de9dSSimon Glass                self.state = STATE_DIFFS
2900d24de9dSSimon Glass
2910d24de9dSSimon Glass                # Output the tags (signeoff first), then change list
2920d24de9dSSimon Glass                out = []
2930d24de9dSSimon Glass                log = self.series.MakeChangeLog(self.commit)
2940d24de9dSSimon Glass                out += self.FormatTags(self.tags)
2950d24de9dSSimon Glass                out += [line] + log
2960d24de9dSSimon Glass            elif self.found_test:
2970d24de9dSSimon Glass                if not re_allowed_after_test.match(line):
2980d24de9dSSimon Glass                    self.lines_after_test += 1
2990d24de9dSSimon Glass
3000d24de9dSSimon Glass        return out
3010d24de9dSSimon Glass
3020d24de9dSSimon Glass    def Finalize(self):
3030d24de9dSSimon Glass        """Close out processing of this patch stream"""
3040d24de9dSSimon Glass        self.CloseCommit()
3050d24de9dSSimon Glass        if self.lines_after_test:
3060d24de9dSSimon Glass            self.warn.append('Found %d lines after TEST=' %
3070d24de9dSSimon Glass                    self.lines_after_test)
3080d24de9dSSimon Glass
3090d24de9dSSimon Glass    def ProcessStream(self, infd, outfd):
3100d24de9dSSimon Glass        """Copy a stream from infd to outfd, filtering out unwanting things.
3110d24de9dSSimon Glass
3120d24de9dSSimon Glass        This is used to process patch files one at a time.
3130d24de9dSSimon Glass
3140d24de9dSSimon Glass        Args:
3150d24de9dSSimon Glass            infd: Input stream file object
3160d24de9dSSimon Glass            outfd: Output stream file object
3170d24de9dSSimon Glass        """
3180d24de9dSSimon Glass        # Extract the filename from each diff, for nice warnings
3190d24de9dSSimon Glass        fname = None
3200d24de9dSSimon Glass        last_fname = None
3210d24de9dSSimon Glass        re_fname = re.compile('diff --git a/(.*) b/.*')
3220d24de9dSSimon Glass        while True:
3230d24de9dSSimon Glass            line = infd.readline()
3240d24de9dSSimon Glass            if not line:
3250d24de9dSSimon Glass                break
3260d24de9dSSimon Glass            out = self.ProcessLine(line)
3270d24de9dSSimon Glass
3280d24de9dSSimon Glass            # Try to detect blank lines at EOF
3290d24de9dSSimon Glass            for line in out:
3300d24de9dSSimon Glass                match = re_fname.match(line)
3310d24de9dSSimon Glass                if match:
3320d24de9dSSimon Glass                    last_fname = fname
3330d24de9dSSimon Glass                    fname = match.group(1)
3340d24de9dSSimon Glass                if line == '+':
3350d24de9dSSimon Glass                    self.blank_count += 1
3360d24de9dSSimon Glass                else:
3370d24de9dSSimon Glass                    if self.blank_count and (line == '-- ' or match):
3380d24de9dSSimon Glass                        self.warn.append("Found possible blank line(s) at "
3390d24de9dSSimon Glass                                "end of file '%s'" % last_fname)
3400d24de9dSSimon Glass                    outfd.write('+\n' * self.blank_count)
3410d24de9dSSimon Glass                    outfd.write(line + '\n')
3420d24de9dSSimon Glass                    self.blank_count = 0
3430d24de9dSSimon Glass        self.Finalize()
3440d24de9dSSimon Glass
3450d24de9dSSimon Glass
346e62f905eSSimon Glassdef GetMetaDataForList(commit_range, git_dir=None, count=None,
347e62f905eSSimon Glass                       series = Series()):
348e62f905eSSimon Glass    """Reads out patch series metadata from the commits
349e62f905eSSimon Glass
350e62f905eSSimon Glass    This does a 'git log' on the relevant commits and pulls out the tags we
351e62f905eSSimon Glass    are interested in.
352e62f905eSSimon Glass
353e62f905eSSimon Glass    Args:
354e62f905eSSimon Glass        commit_range: Range of commits to count (e.g. 'HEAD..base')
355e62f905eSSimon Glass        git_dir: Path to git repositiory (None to use default)
356e62f905eSSimon Glass        count: Number of commits to list, or None for no limit
357e62f905eSSimon Glass        series: Series object to add information into. By default a new series
358e62f905eSSimon Glass            is started.
359e62f905eSSimon Glass    Returns:
360e62f905eSSimon Glass        A Series object containing information about the commits.
361e62f905eSSimon Glass    """
362e62f905eSSimon Glass    params = ['git', 'log', '--no-color', '--reverse', commit_range]
363e62f905eSSimon Glass    if count is not None:
364e62f905eSSimon Glass        params[2:2] = ['-n%d' % count]
365e62f905eSSimon Glass    if git_dir:
366e62f905eSSimon Glass        params[1:1] = ['--git-dir', git_dir]
367e62f905eSSimon Glass    pipe = [params]
368e62f905eSSimon Glass    stdout = command.RunPipe(pipe, capture=True).stdout
369e62f905eSSimon Glass    ps = PatchStream(series, is_log=True)
370e62f905eSSimon Glass    for line in stdout.splitlines():
371e62f905eSSimon Glass        ps.ProcessLine(line)
372e62f905eSSimon Glass    ps.Finalize()
373e62f905eSSimon Glass    return series
374e62f905eSSimon Glass
3750d24de9dSSimon Glassdef GetMetaData(start, count):
3760d24de9dSSimon Glass    """Reads out patch series metadata from the commits
3770d24de9dSSimon Glass
3780d24de9dSSimon Glass    This does a 'git log' on the relevant commits and pulls out the tags we
3790d24de9dSSimon Glass    are interested in.
3800d24de9dSSimon Glass
3810d24de9dSSimon Glass    Args:
3820d24de9dSSimon Glass        start: Commit to start from: 0=HEAD, 1=next one, etc.
3830d24de9dSSimon Glass        count: Number of commits to list
3840d24de9dSSimon Glass    """
385e62f905eSSimon Glass    return GetMetaDataForList('HEAD~%d' % start, None, count)
3860d24de9dSSimon Glass
3870d24de9dSSimon Glassdef FixPatch(backup_dir, fname, series, commit):
3880d24de9dSSimon Glass    """Fix up a patch file, by adding/removing as required.
3890d24de9dSSimon Glass
3900d24de9dSSimon Glass    We remove our tags from the patch file, insert changes lists, etc.
3910d24de9dSSimon Glass    The patch file is processed in place, and overwritten.
3920d24de9dSSimon Glass
3930d24de9dSSimon Glass    A backup file is put into backup_dir (if not None).
3940d24de9dSSimon Glass
3950d24de9dSSimon Glass    Args:
3960d24de9dSSimon Glass        fname: Filename to patch file to process
3970d24de9dSSimon Glass        series: Series information about this patch set
3980d24de9dSSimon Glass        commit: Commit object for this patch file
3990d24de9dSSimon Glass    Return:
4000d24de9dSSimon Glass        A list of errors, or [] if all ok.
4010d24de9dSSimon Glass    """
4020d24de9dSSimon Glass    handle, tmpname = tempfile.mkstemp()
4030d24de9dSSimon Glass    outfd = os.fdopen(handle, 'w')
4040d24de9dSSimon Glass    infd = open(fname, 'r')
4050d24de9dSSimon Glass    ps = PatchStream(series)
4060d24de9dSSimon Glass    ps.commit = commit
4070d24de9dSSimon Glass    ps.ProcessStream(infd, outfd)
4080d24de9dSSimon Glass    infd.close()
4090d24de9dSSimon Glass    outfd.close()
4100d24de9dSSimon Glass
4110d24de9dSSimon Glass    # Create a backup file if required
4120d24de9dSSimon Glass    if backup_dir:
4130d24de9dSSimon Glass        shutil.copy(fname, os.path.join(backup_dir, os.path.basename(fname)))
4140d24de9dSSimon Glass    shutil.move(tmpname, fname)
4150d24de9dSSimon Glass    return ps.warn
4160d24de9dSSimon Glass
4170d24de9dSSimon Glassdef FixPatches(series, fnames):
4180d24de9dSSimon Glass    """Fix up a list of patches identified by filenames
4190d24de9dSSimon Glass
4200d24de9dSSimon Glass    The patch files are processed in place, and overwritten.
4210d24de9dSSimon Glass
4220d24de9dSSimon Glass    Args:
4230d24de9dSSimon Glass        series: The series object
4240d24de9dSSimon Glass        fnames: List of patch files to process
4250d24de9dSSimon Glass    """
4260d24de9dSSimon Glass    # Current workflow creates patches, so we shouldn't need a backup
4270d24de9dSSimon Glass    backup_dir = None  #tempfile.mkdtemp('clean-patch')
4280d24de9dSSimon Glass    count = 0
4290d24de9dSSimon Glass    for fname in fnames:
4300d24de9dSSimon Glass        commit = series.commits[count]
4310d24de9dSSimon Glass        commit.patch = fname
4320d24de9dSSimon Glass        result = FixPatch(backup_dir, fname, series, commit)
4330d24de9dSSimon Glass        if result:
4340d24de9dSSimon Glass            print '%d warnings for %s:' % (len(result), fname)
4350d24de9dSSimon Glass            for warn in result:
4360d24de9dSSimon Glass                print '\t', warn
4370d24de9dSSimon Glass            print
4380d24de9dSSimon Glass        count += 1
4390d24de9dSSimon Glass    print 'Cleaned %d patches' % count
4400d24de9dSSimon Glass    return series
4410d24de9dSSimon Glass
4420d24de9dSSimon Glassdef InsertCoverLetter(fname, series, count):
4430d24de9dSSimon Glass    """Inserts a cover letter with the required info into patch 0
4440d24de9dSSimon Glass
4450d24de9dSSimon Glass    Args:
4460d24de9dSSimon Glass        fname: Input / output filename of the cover letter file
4470d24de9dSSimon Glass        series: Series object
4480d24de9dSSimon Glass        count: Number of patches in the series
4490d24de9dSSimon Glass    """
4500d24de9dSSimon Glass    fd = open(fname, 'r')
4510d24de9dSSimon Glass    lines = fd.readlines()
4520d24de9dSSimon Glass    fd.close()
4530d24de9dSSimon Glass
4540d24de9dSSimon Glass    fd = open(fname, 'w')
4550d24de9dSSimon Glass    text = series.cover
4560d24de9dSSimon Glass    prefix = series.GetPatchPrefix()
4570d24de9dSSimon Glass    for line in lines:
4580d24de9dSSimon Glass        if line.startswith('Subject:'):
4590d24de9dSSimon Glass            # TODO: if more than 10 patches this should save 00/xx, not 0/xx
4600d24de9dSSimon Glass            line = 'Subject: [%s 0/%d] %s\n' % (prefix, count, text[0])
4610d24de9dSSimon Glass
4620d24de9dSSimon Glass        # Insert our cover letter
4630d24de9dSSimon Glass        elif line.startswith('*** BLURB HERE ***'):
4640d24de9dSSimon Glass            # First the blurb test
4650d24de9dSSimon Glass            line = '\n'.join(text[1:]) + '\n'
4660d24de9dSSimon Glass            if series.get('notes'):
4670d24de9dSSimon Glass                line += '\n'.join(series.notes) + '\n'
4680d24de9dSSimon Glass
4690d24de9dSSimon Glass            # Now the change list
4700d24de9dSSimon Glass            out = series.MakeChangeLog(None)
4710d24de9dSSimon Glass            line += '\n' + '\n'.join(out)
4720d24de9dSSimon Glass        fd.write(line)
4730d24de9dSSimon Glass    fd.close()
474