blob: 56dcbb34d3b90aaf94786e6ea78a00233c5db9f6 [file] [log] [blame]
Chris Withersfb1f5b32019-04-26 20:29:03 +01001import re
2from argparse import ArgumentParser
Chris Withers871b5262019-04-27 15:04:13 +01003from os.path import dirname, abspath, join
Chris Withersfb1f5b32019-04-26 20:29:03 +01004from subprocess import check_output, call
5
6
7def git(command, repo):
8 return check_output('git '+command, cwd=repo, shell=True).decode()
9
10
11def repo_state_bad(mock_repo):
12 status = git('status', mock_repo)
13 if 'You are in the middle of an am session' in status:
14 print(f'Mock repo at {mock_repo} needs cleanup:\n')
15 call('git status', shell=True)
16 return True
17
18
19def cleanup_old_patches(mock_repo):
20 print('cleaning up old patches:')
21 call('rm -vf /tmp/*.mock.patch', shell=True)
22 call('find . -name "*.rej" -print -delete', shell=True, cwd=mock_repo)
23
24
25def find_initial_cpython_rev():
26 with open('lastsync.txt') as source:
27 return source.read().strip()
28
29
30def cpython_revs_affecting_mock(cpython_repo, start):
31 revs = git(f'log --no-merges --format=%H {start}.. '
32 f'-- Lib/unittest/mock.py Lib/unittest/test/testmock/',
33 repo=cpython_repo).split()
34 revs.reverse()
Chris Withers76523d32019-04-27 15:47:35 +010035 print(f'{len(revs)} patches that may need backporting')
Chris Withersfb1f5b32019-04-26 20:29:03 +010036 return revs
37
38
39def has_been_backported(mock_repo, cpython_rev):
40 backport_rev = git(f'log --format=%H --grep "Backports: {cpython_rev}"',
41 repo=mock_repo).strip()
42 if backport_rev:
43 print(f'{cpython_rev} backported in {backport_rev}')
44 return True
45 print(f'{cpython_rev} has not been backported')
46
47
48def extract_patch_for(cpython_repo, rev):
49 return git(f'format-patch -1 --no-stat --keep-subject --signoff --stdout {rev}',
50 repo=cpython_repo)
51
52
53def munge(rev, patch):
54
55 sign_off = 'Signed-off-by:'
56 patch = patch.replace(sign_off, f'Backports: {rev}\n{sign_off}', 1)
57
58 for pattern, sub in (
59 ('(a|b)/Lib/unittest/mock.py', r'\1/mock/mock.py'),
60 ('(a|b)/Lib/unittest/test/testmock/(.+)', r'\1/mock/tests/\2'),
61 ('(a|b)/Misc/NEWS', r'\1/NEWS'),
62 ):
63 patch = re.sub(pattern, sub, patch)
64 return patch
65
66
67def apply_patch(mock_repo, rev, patch):
68 patch_path = f'/tmp/{rev}.mock.patch'
69
70 with open(patch_path, 'w') as target:
71 target.write(patch)
72 print(f'wrote {patch_path}')
73
74 call(f'git am -k --reject {patch_path}', cwd=mock_repo, shell=True)
75
76
Chris Withers871b5262019-04-27 15:04:13 +010077def update_last_sync(mock_repo, rev):
78 with open(join(mock_repo, 'lastsync.txt'), 'w') as target:
79 target.write(rev+'\n')
80 print(f'update lastsync.txt to {rev}')
81
Chris Withersa3365182019-04-27 17:35:49 +010082
83def rev_from_mock_patch(text):
84 match = re.search('Backports: ([a-z0-9]+)', text)
85 return match.group(1)
86
87
88def skip_current(mock_repo, reason):
89 text = git('am --show-current-patch', repo=mock_repo)
90 rev = rev_from_mock_patch(text)
91 git('am --abort', repo=mock_repo)
92 print(f'skipping {rev}')
93 update_last_sync(mock_repo, rev)
94 call(f'git commit -m "skip {rev}, {reason}" lastsync.txt', shell=True, cwd=mock_repo)
95 cleanup_old_patches(mock_repo)
96
97
Chris Withersfb1f5b32019-04-26 20:29:03 +010098def main():
99 args = parse_args()
100
Chris Withersa3365182019-04-27 17:35:49 +0100101 if args.skip_current:
102 return skip_current(args.mock, args.skip_reason)
103
Chris Withersfb1f5b32019-04-26 20:29:03 +0100104 if repo_state_bad(args.mock):
105 return
106
107 cleanup_old_patches(args.mock)
108
109 initial_cpython_rev = find_initial_cpython_rev()
110
111 revs = cpython_revs_affecting_mock(args.cpython, initial_cpython_rev)
112 for rev in revs:
113
114 if has_been_backported(args.mock, rev):
Chris Withers871b5262019-04-27 15:04:13 +0100115 update_last_sync(args.mock, rev)
Chris Withersfb1f5b32019-04-26 20:29:03 +0100116 continue
117
118 patch = extract_patch_for(args.cpython, rev)
119 patch = munge(rev, patch)
120 apply_patch(args.mock, rev, patch)
121 break
122
123
124def parse_args():
125 parser = ArgumentParser()
126 parser.add_argument('--cpython', default='../cpython')
127 parser.add_argument('--mock', default=abspath(dirname(__file__)))
Chris Withersa3365182019-04-27 17:35:49 +0100128 parser.add_argument('--skip-current', action='store_true')
129 parser.add_argument('--skip-reason', default='it has no changes needed here.')
Chris Withersfb1f5b32019-04-26 20:29:03 +0100130 return parser.parse_args()
131
132
133if __name__ == '__main__':
134 main()