walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

tools/pr.py: add --rebase=true to pull command and abort if there are conflicts

This commit is contained in:
Daniel Marjamäki 2019-04-15 06:59:28 +02:00
parent a90caa7e5a
commit 0c3a6b44f8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/pr.py
View File

@ -13,7 +13,15 @@ if response.status_code == 200:
sha = j['head']['sha']
subprocess.call('git checkout -b {}-{} master'.format(login, branch).split())
subprocess.call('git pull https://github.com/{}/cppcheck.git {}'.format(login, branch).split())
p = subprocess.call('git pull --rebase=true https://github.com/{}/cppcheck.git {}'.format(login, branch).split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
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)
p = subprocess.Popen(['git', 'show', '--format=%an <%ae>', sha], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
comm = p.communicate()