AuroraMiddleware/fmtlegacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle fast forward in update-coverity-branch.py

Browse Source
This commit is contained in:
vitaut 2015-10-20 07:14:40 -07:00
parent 49382a0aa7
commit 3814a07c44
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
support/update-converity-branch.py
View File

@ -5,23 +5,26 @@
from __future__ import print_function from __future__ import print_function
import shutil, tempfile import shutil, tempfile
from subprocess import check_call from subprocess import check_output, STDOUT
class Git: class Git:
def __init__(self, dir): def __init__(self, dir):
self.dir = dir self.dir = dir
def __call__(self, *args): def __call__(self, *args):
check_call(['git'] + list(args), cwd=self.dir) output = check_output(['git'] + list(args), cwd=self.dir, stderr=STDOUT)
print(output)
return output
dir = tempfile.mkdtemp() dir = tempfile.mkdtemp()
try: try:
git = Git(dir) git = Git(dir)
git('clone', '-b', 'coverity', 'git@github.com:cppformat/cppformat.git', dir) git('clone', '-b', 'coverity', 'git@github.com:cppformat/cppformat.git', dir)
git('merge', '-X', 'theirs', '--no-commit', 'origin/master') output = git('merge', '-X', 'theirs', '--no-commit', 'origin/master')
git('reset', 'HEAD', '.travis.yml') if 'Fast-forward' not in output:
git('checkout', '--', '.travis.yml') git('reset', 'HEAD', '.travis.yml')
git('commit', '-m', 'Update coverity branch') git('checkout', '--', '.travis.yml')
git('commit', '-m', 'Update coverity branch')
git('push') git('push')
finally: finally:
shutil.rmtree(dir) shutil.rmtree(dir)