From ebccf431bc1ce6d01526169769e15bfbc720c9ae Mon Sep 17 00:00:00 2001 From: Luke Campagnola Date: Thu, 3 Apr 2014 17:20:01 -0400 Subject: [PATCH] Update merge test to auto-check against github repo --- tools/setupHelpers.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/setupHelpers.py b/tools/setupHelpers.py index 3cf0122a..b23fea0a 100644 --- a/tools/setupHelpers.py +++ b/tools/setupHelpers.py @@ -244,16 +244,21 @@ def unitTests(): 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. """ if sourceBranch is None: sourceBranch = getGitBranch() - if sourceRepo is None: 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' env = dict(TARGET_BRANCH=targetBranch,