2018-11-20 06:20:46 +01:00
|
|
|
|
|
|
|
import requests
|
|
|
|
import subprocess
|
|
|
|
import sys
|
|
|
|
|
|
|
|
response = requests.get('https://api.github.com/repos/danmar/cppcheck/pulls/' + sys.argv[1])
|
|
|
|
if response.status_code == 200:
|
|
|
|
j = response.json()
|
|
|
|
login = j['user']['login']
|
|
|
|
title = j['title']
|
|
|
|
body = j['body']
|
|
|
|
branch = j['head']['ref']
|
|
|
|
sha = j['head']['sha']
|
|
|
|
|
|
|
|
subprocess.call('git checkout -b {}-{} master'.format(login, branch).split())
|
2019-04-16 20:13:38 +02:00
|
|
|
p = subprocess.Popen('git pull --rebase=true https://github.com/{}/cppcheck.git {}'.format(login, branch).split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
2019-04-15 06:59:28 +02:00
|
|
|
comm = p.communicate()
|
|
|
|
stdout = comm[0].decode(encoding='utf-8', errors='ignore')
|
|
|
|
stderr = comm[1].decode(encoding='utf-8', errors='ignore')
|
|
|
|
print(stdout)
|
|
|
|
print(stderr)
|
|
|
|
if stdout.find('CONFLICT') > 0 or stderr.find('CONFLICT') > 0:
|
|
|
|
print('FAIL; There was some conflict when rebasing the changes')
|
|
|
|
sys.exit(1)
|
2018-11-20 06:20:46 +01:00
|
|
|
|
2019-06-30 21:24:04 +02:00
|
|
|
if '-b' in sys.argv:
|
|
|
|
print('Done.')
|
|
|
|
sys.exit(1)
|
|
|
|
|
2018-11-20 06:20:46 +01:00
|
|
|
p = subprocess.Popen(['git', 'show', '--format=%an <%ae>', sha], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
|
|
|
comm = p.communicate()
|
|
|
|
author = comm[0].decode(encoding='utf-8', errors='ignore').split('\n')[0]
|
|
|
|
if login == 'pfultz2':
|
|
|
|
author = 'Paul Fultz II ' + author[author.find('<'):]
|
|
|
|
|
|
|
|
subprocess.call(['./runastyle'])
|
|
|
|
subprocess.call('git commit -a -m astyle'.split())
|
|
|
|
|
|
|
|
subprocess.call('git checkout master'.split())
|
|
|
|
subprocess.call('git merge --squash {}-{}'.format(login, branch).split())
|
|
|
|
subprocess.call(['git', 'commit', '-a', '--author='+author, '-m', title + '\n\n' + body])
|
|
|
|
subprocess.call('git branch -D {}-{}'.format(login, branch).split())
|
|
|
|
|
|
|
|
p = subprocess.Popen('git show --format=format:%h'.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
|
|
|
comm = p.communicate()
|
2019-08-15 20:36:25 +02:00
|
|
|
stdout = comm[0].decode(encoding='utf-8', errors='ignore')
|
2018-11-20 06:36:08 +01:00
|
|
|
if stdout.find('\n') > 0:
|
|
|
|
stdout = stdout[:stdout.find('\n')]
|
|
|
|
print('\nMessage: I merged this with ' + stdout)
|
2018-11-20 06:20:46 +01:00
|
|
|
|
|
|
|
|
|
|
|
|