ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update merge test to auto-check against github repo

Browse Source
This commit is contained in:
Luke Campagnola 2014-04-03 17:20:01 -04:00
parent d940b9560f
commit ebccf431bc
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/setupHelpers.py
View File

@ -244,16 +244,21 @@ def unitTests():
return ret return ret
def checkMergeSize(sourceBranch=None, targetBranch='develop', sourceRepo=None, targetRepo=None): def checkMergeSize(sourceBranch=None, targetBranch=None, sourceRepo=None, targetRepo=None):
""" """
Check that a git merge would not increase the repository size by MERGE_SIZE_LIMIT. Check that a git merge would not increase the repository size by MERGE_SIZE_LIMIT.
""" """
if sourceBranch is None: if sourceBranch is None:
sourceBranch = getGitBranch() sourceBranch = getGitBranch()
if sourceRepo is None:
sourceRepo = '..' sourceRepo = '..'
if targetRepo is None:
targetRepo = '..' if targetBranch is None:
if sourceBranch == 'develop':
targetBranch = 'develop'
targetRepo = 'https://github.com/pyqtgraph/pyqtgraph.git'
else:
targetBranch = 'develop'
targetRepo = '..'
workingDir = '__merge-test-clone' workingDir = '__merge-test-clone'
env = dict(TARGET_BRANCH=targetBranch, env = dict(TARGET_BRANCH=targetBranch,