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 command 70d24de9dSSimon Glassimport re 80d24de9dSSimon Glassimport os 90d24de9dSSimon Glassimport series 100d24de9dSSimon Glassimport subprocess 110d24de9dSSimon Glassimport sys 120d24de9dSSimon Glassimport terminal 130d24de9dSSimon Glass 14757f64a8SSimon Glassimport checkpatch 155f6a1c42SSimon Glassimport settings 165f6a1c42SSimon Glass 17e49f14afSSimon Glass# True to use --no-decorate - we check this in Setup() 18e49f14afSSimon Glassuse_no_decorate = True 19e49f14afSSimon Glass 20cda2a611SSimon Glassdef LogCmd(commit_range, git_dir=None, oneline=False, reverse=False, 21cda2a611SSimon Glass count=None): 22cda2a611SSimon Glass """Create a command to perform a 'git log' 23cda2a611SSimon Glass 24cda2a611SSimon Glass Args: 25cda2a611SSimon Glass commit_range: Range expression to use for log, None for none 26cda2a611SSimon Glass git_dir: Path to git repositiory (None to use default) 27cda2a611SSimon Glass oneline: True to use --oneline, else False 28cda2a611SSimon Glass reverse: True to reverse the log (--reverse) 29cda2a611SSimon Glass count: Number of commits to list, or None for no limit 30cda2a611SSimon Glass Return: 31cda2a611SSimon Glass List containing command and arguments to run 32cda2a611SSimon Glass """ 33cda2a611SSimon Glass cmd = ['git'] 34cda2a611SSimon Glass if git_dir: 35cda2a611SSimon Glass cmd += ['--git-dir', git_dir] 36cda2a611SSimon Glass cmd += ['log', '--no-color'] 37cda2a611SSimon Glass if oneline: 38cda2a611SSimon Glass cmd.append('--oneline') 39e49f14afSSimon Glass if use_no_decorate: 40cda2a611SSimon Glass cmd.append('--no-decorate') 41042a732cSSimon Glass if reverse: 42042a732cSSimon Glass cmd.append('--reverse') 43cda2a611SSimon Glass if count is not None: 44cda2a611SSimon Glass cmd.append('-n%d' % count) 45cda2a611SSimon Glass if commit_range: 46cda2a611SSimon Glass cmd.append(commit_range) 47cda2a611SSimon Glass return cmd 480d24de9dSSimon Glass 490d24de9dSSimon Glassdef CountCommitsToBranch(): 500d24de9dSSimon Glass """Returns number of commits between HEAD and the tracking branch. 510d24de9dSSimon Glass 520d24de9dSSimon Glass This looks back to the tracking branch and works out the number of commits 530d24de9dSSimon Glass since then. 540d24de9dSSimon Glass 550d24de9dSSimon Glass Return: 560d24de9dSSimon Glass Number of patches that exist on top of the branch 570d24de9dSSimon Glass """ 58cda2a611SSimon Glass pipe = [LogCmd('@{upstream}..', oneline=True), 590d24de9dSSimon Glass ['wc', '-l']] 60a10fd93cSSimon Glass stdout = command.RunPipe(pipe, capture=True, oneline=True).stdout 610d24de9dSSimon Glass patch_count = int(stdout) 620d24de9dSSimon Glass return patch_count 630d24de9dSSimon Glass 645f6a1c42SSimon Glassdef GetUpstream(git_dir, branch): 655f6a1c42SSimon Glass """Returns the name of the upstream for a branch 665f6a1c42SSimon Glass 675f6a1c42SSimon Glass Args: 685f6a1c42SSimon Glass git_dir: Git directory containing repo 695f6a1c42SSimon Glass branch: Name of branch 705f6a1c42SSimon Glass 715f6a1c42SSimon Glass Returns: 725f6a1c42SSimon Glass Name of upstream branch (e.g. 'upstream/master') or None if none 735f6a1c42SSimon Glass """ 74cce717a9SSimon Glass try: 755f6a1c42SSimon Glass remote = command.OutputOneLine('git', '--git-dir', git_dir, 'config', 765f6a1c42SSimon Glass 'branch.%s.remote' % branch) 775f6a1c42SSimon Glass merge = command.OutputOneLine('git', '--git-dir', git_dir, 'config', 785f6a1c42SSimon Glass 'branch.%s.merge' % branch) 79cce717a9SSimon Glass except: 80cce717a9SSimon Glass return None 81cce717a9SSimon Glass 825f6a1c42SSimon Glass if remote == '.': 835f6a1c42SSimon Glass return merge 845f6a1c42SSimon Glass elif remote and merge: 855f6a1c42SSimon Glass leaf = merge.split('/')[-1] 865f6a1c42SSimon Glass return '%s/%s' % (remote, leaf) 875f6a1c42SSimon Glass else: 885f6a1c42SSimon Glass raise ValueError, ("Cannot determine upstream branch for branch " 895f6a1c42SSimon Glass "'%s' remote='%s', merge='%s'" % (branch, remote, merge)) 905f6a1c42SSimon Glass 915f6a1c42SSimon Glass 925f6a1c42SSimon Glassdef GetRangeInBranch(git_dir, branch, include_upstream=False): 935f6a1c42SSimon Glass """Returns an expression for the commits in the given branch. 945f6a1c42SSimon Glass 955f6a1c42SSimon Glass Args: 965f6a1c42SSimon Glass git_dir: Directory containing git repo 975f6a1c42SSimon Glass branch: Name of branch 985f6a1c42SSimon Glass Return: 995f6a1c42SSimon Glass Expression in the form 'upstream..branch' which can be used to 100cce717a9SSimon Glass access the commits. If the branch does not exist, returns None. 1015f6a1c42SSimon Glass """ 1025f6a1c42SSimon Glass upstream = GetUpstream(git_dir, branch) 103cce717a9SSimon Glass if not upstream: 104cce717a9SSimon Glass return None 1055f6a1c42SSimon Glass return '%s%s..%s' % (upstream, '~' if include_upstream else '', branch) 1065f6a1c42SSimon Glass 1075f6a1c42SSimon Glassdef CountCommitsInBranch(git_dir, branch, include_upstream=False): 1085f6a1c42SSimon Glass """Returns the number of commits in the given branch. 1095f6a1c42SSimon Glass 1105f6a1c42SSimon Glass Args: 1115f6a1c42SSimon Glass git_dir: Directory containing git repo 1125f6a1c42SSimon Glass branch: Name of branch 1135f6a1c42SSimon Glass Return: 114cce717a9SSimon Glass Number of patches that exist on top of the branch, or None if the 115cce717a9SSimon Glass branch does not exist. 1165f6a1c42SSimon Glass """ 1175f6a1c42SSimon Glass range_expr = GetRangeInBranch(git_dir, branch, include_upstream) 118cce717a9SSimon Glass if not range_expr: 119cce717a9SSimon Glass return None 120cda2a611SSimon Glass pipe = [LogCmd(range_expr, git_dir=git_dir, oneline=True), 1215f6a1c42SSimon Glass ['wc', '-l']] 1225f6a1c42SSimon Glass result = command.RunPipe(pipe, capture=True, oneline=True) 1235f6a1c42SSimon Glass patch_count = int(result.stdout) 1245f6a1c42SSimon Glass return patch_count 1255f6a1c42SSimon Glass 1265f6a1c42SSimon Glassdef CountCommits(commit_range): 1275f6a1c42SSimon Glass """Returns the number of commits in the given range. 1285f6a1c42SSimon Glass 1295f6a1c42SSimon Glass Args: 1305f6a1c42SSimon Glass commit_range: Range of commits to count (e.g. 'HEAD..base') 1315f6a1c42SSimon Glass Return: 1325f6a1c42SSimon Glass Number of patches that exist on top of the branch 1335f6a1c42SSimon Glass """ 134cda2a611SSimon Glass pipe = [LogCmd(commit_range, oneline=True), 1355f6a1c42SSimon Glass ['wc', '-l']] 1365f6a1c42SSimon Glass stdout = command.RunPipe(pipe, capture=True, oneline=True).stdout 1375f6a1c42SSimon Glass patch_count = int(stdout) 1385f6a1c42SSimon Glass return patch_count 1395f6a1c42SSimon Glass 1405f6a1c42SSimon Glassdef Checkout(commit_hash, git_dir=None, work_tree=None, force=False): 1415f6a1c42SSimon Glass """Checkout the selected commit for this build 1425f6a1c42SSimon Glass 1435f6a1c42SSimon Glass Args: 1445f6a1c42SSimon Glass commit_hash: Commit hash to check out 1455f6a1c42SSimon Glass """ 1465f6a1c42SSimon Glass pipe = ['git'] 1475f6a1c42SSimon Glass if git_dir: 1485f6a1c42SSimon Glass pipe.extend(['--git-dir', git_dir]) 1495f6a1c42SSimon Glass if work_tree: 1505f6a1c42SSimon Glass pipe.extend(['--work-tree', work_tree]) 1515f6a1c42SSimon Glass pipe.append('checkout') 1525f6a1c42SSimon Glass if force: 1535f6a1c42SSimon Glass pipe.append('-f') 1545f6a1c42SSimon Glass pipe.append(commit_hash) 1555f6a1c42SSimon Glass result = command.RunPipe([pipe], capture=True, raise_on_error=False) 1565f6a1c42SSimon Glass if result.return_code != 0: 1575f6a1c42SSimon Glass raise OSError, 'git checkout (%s): %s' % (pipe, result.stderr) 1585f6a1c42SSimon Glass 1595f6a1c42SSimon Glassdef Clone(git_dir, output_dir): 1605f6a1c42SSimon Glass """Checkout the selected commit for this build 1615f6a1c42SSimon Glass 1625f6a1c42SSimon Glass Args: 1635f6a1c42SSimon Glass commit_hash: Commit hash to check out 1645f6a1c42SSimon Glass """ 1655f6a1c42SSimon Glass pipe = ['git', 'clone', git_dir, '.'] 1665f6a1c42SSimon Glass result = command.RunPipe([pipe], capture=True, cwd=output_dir) 1675f6a1c42SSimon Glass if result.return_code != 0: 1685f6a1c42SSimon Glass raise OSError, 'git clone: %s' % result.stderr 1695f6a1c42SSimon Glass 1705f6a1c42SSimon Glassdef Fetch(git_dir=None, work_tree=None): 1715f6a1c42SSimon Glass """Fetch from the origin repo 1725f6a1c42SSimon Glass 1735f6a1c42SSimon Glass Args: 1745f6a1c42SSimon Glass commit_hash: Commit hash to check out 1755f6a1c42SSimon Glass """ 1765f6a1c42SSimon Glass pipe = ['git'] 1775f6a1c42SSimon Glass if git_dir: 1785f6a1c42SSimon Glass pipe.extend(['--git-dir', git_dir]) 1795f6a1c42SSimon Glass if work_tree: 1805f6a1c42SSimon Glass pipe.extend(['--work-tree', work_tree]) 1815f6a1c42SSimon Glass pipe.append('fetch') 1825f6a1c42SSimon Glass result = command.RunPipe([pipe], capture=True) 1835f6a1c42SSimon Glass if result.return_code != 0: 1845f6a1c42SSimon Glass raise OSError, 'git fetch: %s' % result.stderr 1855f6a1c42SSimon Glass 1860d24de9dSSimon Glassdef CreatePatches(start, count, series): 1870d24de9dSSimon Glass """Create a series of patches from the top of the current branch. 1880d24de9dSSimon Glass 1890d24de9dSSimon Glass The patch files are written to the current directory using 1900d24de9dSSimon Glass git format-patch. 1910d24de9dSSimon Glass 1920d24de9dSSimon Glass Args: 1930d24de9dSSimon Glass start: Commit to start from: 0=HEAD, 1=next one, etc. 1940d24de9dSSimon Glass count: number of commits to include 1950d24de9dSSimon Glass Return: 1960d24de9dSSimon Glass Filename of cover letter 1970d24de9dSSimon Glass List of filenames of patch files 1980d24de9dSSimon Glass """ 1990d24de9dSSimon Glass if series.get('version'): 2000d24de9dSSimon Glass version = '%s ' % series['version'] 2010d24de9dSSimon Glass cmd = ['git', 'format-patch', '-M', '--signoff'] 2020d24de9dSSimon Glass if series.get('cover'): 2030d24de9dSSimon Glass cmd.append('--cover-letter') 2040d24de9dSSimon Glass prefix = series.GetPatchPrefix() 2050d24de9dSSimon Glass if prefix: 2060d24de9dSSimon Glass cmd += ['--subject-prefix=%s' % prefix] 2070d24de9dSSimon Glass cmd += ['HEAD~%d..HEAD~%d' % (start + count, start)] 2080d24de9dSSimon Glass 2090d24de9dSSimon Glass stdout = command.RunList(cmd) 2100d24de9dSSimon Glass files = stdout.splitlines() 2110d24de9dSSimon Glass 2120d24de9dSSimon Glass # We have an extra file if there is a cover letter 2130d24de9dSSimon Glass if series.get('cover'): 2140d24de9dSSimon Glass return files[0], files[1:] 2150d24de9dSSimon Glass else: 2160d24de9dSSimon Glass return None, files 2170d24de9dSSimon Glass 2180d24de9dSSimon Glassdef ApplyPatch(verbose, fname): 2190d24de9dSSimon Glass """Apply a patch with git am to test it 2200d24de9dSSimon Glass 2210d24de9dSSimon Glass TODO: Convert these to use command, with stderr option 2220d24de9dSSimon Glass 2230d24de9dSSimon Glass Args: 2240d24de9dSSimon Glass fname: filename of patch file to apply 2250d24de9dSSimon Glass """ 226757f64a8SSimon Glass col = terminal.Color() 2270d24de9dSSimon Glass cmd = ['git', 'am', fname] 2280d24de9dSSimon Glass pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE, 2290d24de9dSSimon Glass stderr=subprocess.PIPE) 2300d24de9dSSimon Glass stdout, stderr = pipe.communicate() 2310d24de9dSSimon Glass re_error = re.compile('^error: patch failed: (.+):(\d+)') 2320d24de9dSSimon Glass for line in stderr.splitlines(): 2330d24de9dSSimon Glass if verbose: 2340d24de9dSSimon Glass print line 2350d24de9dSSimon Glass match = re_error.match(line) 2360d24de9dSSimon Glass if match: 237757f64a8SSimon Glass print checkpatch.GetWarningMsg(col, 'warning', match.group(1), 238757f64a8SSimon Glass int(match.group(2)), 'Patch failed') 2390d24de9dSSimon Glass return pipe.returncode == 0, stdout 2400d24de9dSSimon Glass 2410d24de9dSSimon Glassdef ApplyPatches(verbose, args, start_point): 2420d24de9dSSimon Glass """Apply the patches with git am to make sure all is well 2430d24de9dSSimon Glass 2440d24de9dSSimon Glass Args: 2450d24de9dSSimon Glass verbose: Print out 'git am' output verbatim 2460d24de9dSSimon Glass args: List of patch files to apply 2470d24de9dSSimon Glass start_point: Number of commits back from HEAD to start applying. 2480d24de9dSSimon Glass Normally this is len(args), but it can be larger if a start 2490d24de9dSSimon Glass offset was given. 2500d24de9dSSimon Glass """ 2510d24de9dSSimon Glass error_count = 0 2520d24de9dSSimon Glass col = terminal.Color() 2530d24de9dSSimon Glass 2540d24de9dSSimon Glass # Figure out our current position 2550d24de9dSSimon Glass cmd = ['git', 'name-rev', 'HEAD', '--name-only'] 2560d24de9dSSimon Glass pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE) 2570d24de9dSSimon Glass stdout, stderr = pipe.communicate() 2580d24de9dSSimon Glass if pipe.returncode: 2590d24de9dSSimon Glass str = 'Could not find current commit name' 2600d24de9dSSimon Glass print col.Color(col.RED, str) 2610d24de9dSSimon Glass print stdout 2620d24de9dSSimon Glass return False 2630d24de9dSSimon Glass old_head = stdout.splitlines()[0] 2644251978aSSimon Glass if old_head == 'undefined': 2654251978aSSimon Glass str = "Invalid HEAD '%s'" % stdout.strip() 2664251978aSSimon Glass print col.Color(col.RED, str) 2674251978aSSimon Glass return False 2680d24de9dSSimon Glass 2690d24de9dSSimon Glass # Checkout the required start point 2700d24de9dSSimon Glass cmd = ['git', 'checkout', 'HEAD~%d' % start_point] 2710d24de9dSSimon Glass pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE, 2720d24de9dSSimon Glass stderr=subprocess.PIPE) 2730d24de9dSSimon Glass stdout, stderr = pipe.communicate() 2740d24de9dSSimon Glass if pipe.returncode: 2750d24de9dSSimon Glass str = 'Could not move to commit before patch series' 2760d24de9dSSimon Glass print col.Color(col.RED, str) 2770d24de9dSSimon Glass print stdout, stderr 2780d24de9dSSimon Glass return False 2790d24de9dSSimon Glass 2800d24de9dSSimon Glass # Apply all the patches 2810d24de9dSSimon Glass for fname in args: 2820d24de9dSSimon Glass ok, stdout = ApplyPatch(verbose, fname) 2830d24de9dSSimon Glass if not ok: 2840d24de9dSSimon Glass print col.Color(col.RED, 'git am returned errors for %s: will ' 2850d24de9dSSimon Glass 'skip this patch' % fname) 2860d24de9dSSimon Glass if verbose: 2870d24de9dSSimon Glass print stdout 2880d24de9dSSimon Glass error_count += 1 2890d24de9dSSimon Glass cmd = ['git', 'am', '--skip'] 2900d24de9dSSimon Glass pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE) 2910d24de9dSSimon Glass stdout, stderr = pipe.communicate() 2920d24de9dSSimon Glass if pipe.returncode != 0: 2930d24de9dSSimon Glass print col.Color(col.RED, 'Unable to skip patch! Aborting...') 2940d24de9dSSimon Glass print stdout 2950d24de9dSSimon Glass break 2960d24de9dSSimon Glass 2970d24de9dSSimon Glass # Return to our previous position 2980d24de9dSSimon Glass cmd = ['git', 'checkout', old_head] 2990d24de9dSSimon Glass pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 3000d24de9dSSimon Glass stdout, stderr = pipe.communicate() 3010d24de9dSSimon Glass if pipe.returncode: 3020d24de9dSSimon Glass print col.Color(col.RED, 'Could not move back to head commit') 3030d24de9dSSimon Glass print stdout, stderr 3040d24de9dSSimon Glass return error_count == 0 3050d24de9dSSimon Glass 306a1318f7cSSimon Glassdef BuildEmailList(in_list, tag=None, alias=None, raise_on_error=True): 3070d24de9dSSimon Glass """Build a list of email addresses based on an input list. 3080d24de9dSSimon Glass 3090d24de9dSSimon Glass Takes a list of email addresses and aliases, and turns this into a list 3100d24de9dSSimon Glass of only email address, by resolving any aliases that are present. 3110d24de9dSSimon Glass 3120d24de9dSSimon Glass If the tag is given, then each email address is prepended with this 3130d24de9dSSimon Glass tag and a space. If the tag starts with a minus sign (indicating a 3140d24de9dSSimon Glass command line parameter) then the email address is quoted. 3150d24de9dSSimon Glass 3160d24de9dSSimon Glass Args: 3170d24de9dSSimon Glass in_list: List of aliases/email addresses 3180d24de9dSSimon Glass tag: Text to put before each address 319a1318f7cSSimon Glass alias: Alias dictionary 320a1318f7cSSimon Glass raise_on_error: True to raise an error when an alias fails to match, 321a1318f7cSSimon Glass False to just print a message. 3220d24de9dSSimon Glass 3230d24de9dSSimon Glass Returns: 3240d24de9dSSimon Glass List of email addresses 3250d24de9dSSimon Glass 3260d24de9dSSimon Glass >>> alias = {} 3270d24de9dSSimon Glass >>> alias['fred'] = ['f.bloggs@napier.co.nz'] 3280d24de9dSSimon Glass >>> alias['john'] = ['j.bloggs@napier.co.nz'] 3290d24de9dSSimon Glass >>> alias['mary'] = ['Mary Poppins <m.poppins@cloud.net>'] 3300d24de9dSSimon Glass >>> alias['boys'] = ['fred', ' john'] 3310d24de9dSSimon Glass >>> alias['all'] = ['fred ', 'john', ' mary '] 3320d24de9dSSimon Glass >>> BuildEmailList(['john', 'mary'], None, alias) 3330d24de9dSSimon Glass ['j.bloggs@napier.co.nz', 'Mary Poppins <m.poppins@cloud.net>'] 3340d24de9dSSimon Glass >>> BuildEmailList(['john', 'mary'], '--to', alias) 3350d24de9dSSimon Glass ['--to "j.bloggs@napier.co.nz"', \ 3360d24de9dSSimon Glass'--to "Mary Poppins <m.poppins@cloud.net>"'] 3370d24de9dSSimon Glass >>> BuildEmailList(['john', 'mary'], 'Cc', alias) 3380d24de9dSSimon Glass ['Cc j.bloggs@napier.co.nz', 'Cc Mary Poppins <m.poppins@cloud.net>'] 3390d24de9dSSimon Glass """ 3400d24de9dSSimon Glass quote = '"' if tag and tag[0] == '-' else '' 3410d24de9dSSimon Glass raw = [] 3420d24de9dSSimon Glass for item in in_list: 343a1318f7cSSimon Glass raw += LookupEmail(item, alias, raise_on_error=raise_on_error) 3440d24de9dSSimon Glass result = [] 3450d24de9dSSimon Glass for item in raw: 3460d24de9dSSimon Glass if not item in result: 3470d24de9dSSimon Glass result.append(item) 3480d24de9dSSimon Glass if tag: 3490d24de9dSSimon Glass return ['%s %s%s%s' % (tag, quote, email, quote) for email in result] 3500d24de9dSSimon Glass return result 3510d24de9dSSimon Glass 352a1318f7cSSimon Glassdef EmailPatches(series, cover_fname, args, dry_run, raise_on_error, cc_fname, 3536d819925SDoug Anderson self_only=False, alias=None, in_reply_to=None): 3540d24de9dSSimon Glass """Email a patch series. 3550d24de9dSSimon Glass 3560d24de9dSSimon Glass Args: 3570d24de9dSSimon Glass series: Series object containing destination info 3580d24de9dSSimon Glass cover_fname: filename of cover letter 3590d24de9dSSimon Glass args: list of filenames of patch files 3600d24de9dSSimon Glass dry_run: Just return the command that would be run 361a1318f7cSSimon Glass raise_on_error: True to raise an error when an alias fails to match, 362a1318f7cSSimon Glass False to just print a message. 3630d24de9dSSimon Glass cc_fname: Filename of Cc file for per-commit Cc 3640d24de9dSSimon Glass self_only: True to just email to yourself as a test 3656d819925SDoug Anderson in_reply_to: If set we'll pass this to git as --in-reply-to. 3666d819925SDoug Anderson Should be a message ID that this is in reply to. 3670d24de9dSSimon Glass 3680d24de9dSSimon Glass Returns: 3690d24de9dSSimon Glass Git command that was/would be run 3700d24de9dSSimon Glass 371a970048eSDoug Anderson # For the duration of this doctest pretend that we ran patman with ./patman 372a970048eSDoug Anderson >>> _old_argv0 = sys.argv[0] 373a970048eSDoug Anderson >>> sys.argv[0] = './patman' 374a970048eSDoug Anderson 3750d24de9dSSimon Glass >>> alias = {} 3760d24de9dSSimon Glass >>> alias['fred'] = ['f.bloggs@napier.co.nz'] 3770d24de9dSSimon Glass >>> alias['john'] = ['j.bloggs@napier.co.nz'] 3780d24de9dSSimon Glass >>> alias['mary'] = ['m.poppins@cloud.net'] 3790d24de9dSSimon Glass >>> alias['boys'] = ['fred', ' john'] 3800d24de9dSSimon Glass >>> alias['all'] = ['fred ', 'john', ' mary '] 3810d24de9dSSimon Glass >>> alias[os.getenv('USER')] = ['this-is-me@me.com'] 3820d24de9dSSimon Glass >>> series = series.Series() 3830d24de9dSSimon Glass >>> series.to = ['fred'] 3840d24de9dSSimon Glass >>> series.cc = ['mary'] 385a1318f7cSSimon Glass >>> EmailPatches(series, 'cover', ['p1', 'p2'], True, True, 'cc-fname', \ 386a1318f7cSSimon Glass False, alias) 3870d24de9dSSimon Glass 'git send-email --annotate --to "f.bloggs@napier.co.nz" --cc \ 3880d24de9dSSimon Glass"m.poppins@cloud.net" --cc-cmd "./patman --cc-cmd cc-fname" cover p1 p2' 389a1318f7cSSimon Glass >>> EmailPatches(series, None, ['p1'], True, True, 'cc-fname', False, \ 390a1318f7cSSimon Glass alias) 3910d24de9dSSimon Glass 'git send-email --annotate --to "f.bloggs@napier.co.nz" --cc \ 3920d24de9dSSimon Glass"m.poppins@cloud.net" --cc-cmd "./patman --cc-cmd cc-fname" p1' 3930d24de9dSSimon Glass >>> series.cc = ['all'] 394a1318f7cSSimon Glass >>> EmailPatches(series, 'cover', ['p1', 'p2'], True, True, 'cc-fname', \ 395a1318f7cSSimon Glass True, alias) 3960d24de9dSSimon Glass 'git send-email --annotate --to "this-is-me@me.com" --cc-cmd "./patman \ 3970d24de9dSSimon Glass--cc-cmd cc-fname" cover p1 p2' 398a1318f7cSSimon Glass >>> EmailPatches(series, 'cover', ['p1', 'p2'], True, True, 'cc-fname', \ 399a1318f7cSSimon Glass False, alias) 4000d24de9dSSimon Glass 'git send-email --annotate --to "f.bloggs@napier.co.nz" --cc \ 4010d24de9dSSimon Glass"f.bloggs@napier.co.nz" --cc "j.bloggs@napier.co.nz" --cc \ 4020d24de9dSSimon Glass"m.poppins@cloud.net" --cc-cmd "./patman --cc-cmd cc-fname" cover p1 p2' 403a970048eSDoug Anderson 404a970048eSDoug Anderson # Restore argv[0] since we clobbered it. 405a970048eSDoug Anderson >>> sys.argv[0] = _old_argv0 4060d24de9dSSimon Glass """ 407a1318f7cSSimon Glass to = BuildEmailList(series.get('to'), '--to', alias, raise_on_error) 4080d24de9dSSimon Glass if not to: 409ee860c60SMasahiro Yamada git_config_to = command.Output('git', 'config', 'sendemail.to') 410ee860c60SMasahiro Yamada if not git_config_to: 411ee860c60SMasahiro Yamada print ("No recipient.\n" 412ee860c60SMasahiro Yamada "Please add something like this to a commit\n" 413ee860c60SMasahiro Yamada "Series-to: Fred Bloggs <f.blogs@napier.co.nz>\n" 414ee860c60SMasahiro Yamada "Or do something like this\n" 415ee860c60SMasahiro Yamada "git config sendemail.to u-boot@lists.denx.de") 4160d24de9dSSimon Glass return 417a1318f7cSSimon Glass cc = BuildEmailList(series.get('cc'), '--cc', alias, raise_on_error) 4180d24de9dSSimon Glass if self_only: 419a1318f7cSSimon Glass to = BuildEmailList([os.getenv('USER')], '--to', alias, raise_on_error) 4200d24de9dSSimon Glass cc = [] 4210d24de9dSSimon Glass cmd = ['git', 'send-email', '--annotate'] 4226d819925SDoug Anderson if in_reply_to: 4236d819925SDoug Anderson cmd.append('--in-reply-to="%s"' % in_reply_to) 4246d819925SDoug Anderson 4250d24de9dSSimon Glass cmd += to 4260d24de9dSSimon Glass cmd += cc 4270d24de9dSSimon Glass cmd += ['--cc-cmd', '"%s --cc-cmd %s"' % (sys.argv[0], cc_fname)] 4280d24de9dSSimon Glass if cover_fname: 4290d24de9dSSimon Glass cmd.append(cover_fname) 4300d24de9dSSimon Glass cmd += args 4310d24de9dSSimon Glass str = ' '.join(cmd) 4320d24de9dSSimon Glass if not dry_run: 4330d24de9dSSimon Glass os.system(str) 4340d24de9dSSimon Glass return str 4350d24de9dSSimon Glass 4360d24de9dSSimon Glass 437a1318f7cSSimon Glassdef LookupEmail(lookup_name, alias=None, raise_on_error=True, level=0): 4380d24de9dSSimon Glass """If an email address is an alias, look it up and return the full name 4390d24de9dSSimon Glass 4400d24de9dSSimon Glass TODO: Why not just use git's own alias feature? 4410d24de9dSSimon Glass 4420d24de9dSSimon Glass Args: 4430d24de9dSSimon Glass lookup_name: Alias or email address to look up 444a1318f7cSSimon Glass alias: Dictionary containing aliases (None to use settings default) 445a1318f7cSSimon Glass raise_on_error: True to raise an error when an alias fails to match, 446a1318f7cSSimon Glass False to just print a message. 4470d24de9dSSimon Glass 4480d24de9dSSimon Glass Returns: 4490d24de9dSSimon Glass tuple: 4500d24de9dSSimon Glass list containing a list of email addresses 4510d24de9dSSimon Glass 4520d24de9dSSimon Glass Raises: 4530d24de9dSSimon Glass OSError if a recursive alias reference was found 4540d24de9dSSimon Glass ValueError if an alias was not found 4550d24de9dSSimon Glass 4560d24de9dSSimon Glass >>> alias = {} 4570d24de9dSSimon Glass >>> alias['fred'] = ['f.bloggs@napier.co.nz'] 4580d24de9dSSimon Glass >>> alias['john'] = ['j.bloggs@napier.co.nz'] 4590d24de9dSSimon Glass >>> alias['mary'] = ['m.poppins@cloud.net'] 4600d24de9dSSimon Glass >>> alias['boys'] = ['fred', ' john', 'f.bloggs@napier.co.nz'] 4610d24de9dSSimon Glass >>> alias['all'] = ['fred ', 'john', ' mary '] 4620d24de9dSSimon Glass >>> alias['loop'] = ['other', 'john', ' mary '] 4630d24de9dSSimon Glass >>> alias['other'] = ['loop', 'john', ' mary '] 4640d24de9dSSimon Glass >>> LookupEmail('mary', alias) 4650d24de9dSSimon Glass ['m.poppins@cloud.net'] 4660d24de9dSSimon Glass >>> LookupEmail('arthur.wellesley@howe.ro.uk', alias) 4670d24de9dSSimon Glass ['arthur.wellesley@howe.ro.uk'] 4680d24de9dSSimon Glass >>> LookupEmail('boys', alias) 4690d24de9dSSimon Glass ['f.bloggs@napier.co.nz', 'j.bloggs@napier.co.nz'] 4700d24de9dSSimon Glass >>> LookupEmail('all', alias) 4710d24de9dSSimon Glass ['f.bloggs@napier.co.nz', 'j.bloggs@napier.co.nz', 'm.poppins@cloud.net'] 4720d24de9dSSimon Glass >>> LookupEmail('odd', alias) 4730d24de9dSSimon Glass Traceback (most recent call last): 4740d24de9dSSimon Glass ... 4750d24de9dSSimon Glass ValueError: Alias 'odd' not found 4760d24de9dSSimon Glass >>> LookupEmail('loop', alias) 4770d24de9dSSimon Glass Traceback (most recent call last): 4780d24de9dSSimon Glass ... 4790d24de9dSSimon Glass OSError: Recursive email alias at 'other' 480a1318f7cSSimon Glass >>> LookupEmail('odd', alias, raise_on_error=False) 481*e752edcbSSimon Glass Alias 'odd' not found 482a1318f7cSSimon Glass [] 483a1318f7cSSimon Glass >>> # In this case the loop part will effectively be ignored. 484a1318f7cSSimon Glass >>> LookupEmail('loop', alias, raise_on_error=False) 485*e752edcbSSimon Glass Recursive email alias at 'other' 486*e752edcbSSimon Glass Recursive email alias at 'john' 487*e752edcbSSimon Glass Recursive email alias at 'mary' 488a1318f7cSSimon Glass ['j.bloggs@napier.co.nz', 'm.poppins@cloud.net'] 4890d24de9dSSimon Glass """ 4900d24de9dSSimon Glass if not alias: 4910d24de9dSSimon Glass alias = settings.alias 4920d24de9dSSimon Glass lookup_name = lookup_name.strip() 4930d24de9dSSimon Glass if '@' in lookup_name: # Perhaps a real email address 4940d24de9dSSimon Glass return [lookup_name] 4950d24de9dSSimon Glass 4960d24de9dSSimon Glass lookup_name = lookup_name.lower() 497a1318f7cSSimon Glass col = terminal.Color() 4980d24de9dSSimon Glass 4990d24de9dSSimon Glass out_list = [] 500a1318f7cSSimon Glass if level > 10: 501a1318f7cSSimon Glass msg = "Recursive email alias at '%s'" % lookup_name 502a1318f7cSSimon Glass if raise_on_error: 503a1318f7cSSimon Glass raise OSError, msg 504a1318f7cSSimon Glass else: 505a1318f7cSSimon Glass print col.Color(col.RED, msg) 506a1318f7cSSimon Glass return out_list 507a1318f7cSSimon Glass 5080d24de9dSSimon Glass if lookup_name: 5090d24de9dSSimon Glass if not lookup_name in alias: 510a1318f7cSSimon Glass msg = "Alias '%s' not found" % lookup_name 511a1318f7cSSimon Glass if raise_on_error: 512a1318f7cSSimon Glass raise ValueError, msg 513a1318f7cSSimon Glass else: 514a1318f7cSSimon Glass print col.Color(col.RED, msg) 515a1318f7cSSimon Glass return out_list 5160d24de9dSSimon Glass for item in alias[lookup_name]: 517a1318f7cSSimon Glass todo = LookupEmail(item, alias, raise_on_error, level + 1) 5180d24de9dSSimon Glass for new_item in todo: 5190d24de9dSSimon Glass if not new_item in out_list: 5200d24de9dSSimon Glass out_list.append(new_item) 5210d24de9dSSimon Glass 5220d24de9dSSimon Glass #print "No match for alias '%s'" % lookup_name 5230d24de9dSSimon Glass return out_list 5240d24de9dSSimon Glass 5250d24de9dSSimon Glassdef GetTopLevel(): 5260d24de9dSSimon Glass """Return name of top-level directory for this git repo. 5270d24de9dSSimon Glass 5280d24de9dSSimon Glass Returns: 5290d24de9dSSimon Glass Full path to git top-level directory 5300d24de9dSSimon Glass 5310d24de9dSSimon Glass This test makes sure that we are running tests in the right subdir 5320d24de9dSSimon Glass 533a970048eSDoug Anderson >>> os.path.realpath(os.path.dirname(__file__)) == \ 534a970048eSDoug Anderson os.path.join(GetTopLevel(), 'tools', 'patman') 5350d24de9dSSimon Glass True 5360d24de9dSSimon Glass """ 5370d24de9dSSimon Glass return command.OutputOneLine('git', 'rev-parse', '--show-toplevel') 5380d24de9dSSimon Glass 5390d24de9dSSimon Glassdef GetAliasFile(): 5400d24de9dSSimon Glass """Gets the name of the git alias file. 5410d24de9dSSimon Glass 5420d24de9dSSimon Glass Returns: 5430d24de9dSSimon Glass Filename of git alias file, or None if none 5440d24de9dSSimon Glass """ 545dc191505SSimon Glass fname = command.OutputOneLine('git', 'config', 'sendemail.aliasesfile', 546dc191505SSimon Glass raise_on_error=False) 5470d24de9dSSimon Glass if fname: 5480d24de9dSSimon Glass fname = os.path.join(GetTopLevel(), fname.strip()) 5490d24de9dSSimon Glass return fname 5500d24de9dSSimon Glass 55187d65558SVikram Narayanandef GetDefaultUserName(): 55287d65558SVikram Narayanan """Gets the user.name from .gitconfig file. 55387d65558SVikram Narayanan 55487d65558SVikram Narayanan Returns: 55587d65558SVikram Narayanan User name found in .gitconfig file, or None if none 55687d65558SVikram Narayanan """ 55787d65558SVikram Narayanan uname = command.OutputOneLine('git', 'config', '--global', 'user.name') 55887d65558SVikram Narayanan return uname 55987d65558SVikram Narayanan 56087d65558SVikram Narayanandef GetDefaultUserEmail(): 56187d65558SVikram Narayanan """Gets the user.email from the global .gitconfig file. 56287d65558SVikram Narayanan 56387d65558SVikram Narayanan Returns: 56487d65558SVikram Narayanan User's email found in .gitconfig file, or None if none 56587d65558SVikram Narayanan """ 56687d65558SVikram Narayanan uemail = command.OutputOneLine('git', 'config', '--global', 'user.email') 56787d65558SVikram Narayanan return uemail 56887d65558SVikram Narayanan 5690d24de9dSSimon Glassdef Setup(): 5700d24de9dSSimon Glass """Set up git utils, by reading the alias files.""" 5710d24de9dSSimon Glass # Check for a git alias file also 5720d24de9dSSimon Glass alias_fname = GetAliasFile() 5730d24de9dSSimon Glass if alias_fname: 5740d24de9dSSimon Glass settings.ReadGitAliases(alias_fname) 575e49f14afSSimon Glass cmd = LogCmd(None, count=0) 576e49f14afSSimon Glass use_no_decorate = (command.RunPipe([cmd], raise_on_error=False) 577e49f14afSSimon Glass .return_code == 0) 5780d24de9dSSimon Glass 5795f6a1c42SSimon Glassdef GetHead(): 5805f6a1c42SSimon Glass """Get the hash of the current HEAD 5815f6a1c42SSimon Glass 5825f6a1c42SSimon Glass Returns: 5835f6a1c42SSimon Glass Hash of HEAD 5845f6a1c42SSimon Glass """ 5855f6a1c42SSimon Glass return command.OutputOneLine('git', 'show', '-s', '--pretty=format:%H') 5865f6a1c42SSimon Glass 5870d24de9dSSimon Glassif __name__ == "__main__": 5880d24de9dSSimon Glass import doctest 5890d24de9dSSimon Glass 5900d24de9dSSimon Glass doctest.testmod() 591