def git_merge(merge_branch):
return ex.run_cmd('git merge %s' % merge_branch)
def git_remove_merge(merge_branch):
return ex.run_cmd('git branch -D %s' % merge_branch)
def git_rebase_on_master():
return ex.run_cmd('git rebase master')
def git_checkout_master():
return ex.run_cmd('git checkout master')
def git_fetch_remote(fork_name, branch_name):
remote_name = get_merge_remote_name(fork_name, branch_name)
return ex.run_cmd('git fetch %s' % remote_name)
def git_checkout_for_merge(fork_name, branch_name):
merge_branch = get_merge_branch_name(fork_name, branch_name)
remote_name = get_merge_remote_name(fork_name, branch_name)
return ex.run_cmd('git checkout -b %s %s/%s' %
(merge_branch, remote_name, branch_name))
def git_rebase_origin_master():
return ex.run_cmd('git rebase origin/master')
def git_add_remote(fork_name, branch_name):
remote_name = get_merge_remote_name(fork_name, branch_name)
remote_url = get_repo_url(fork_name)
return ex.run_cmd('git remote add %s %s' % (remote_name, remote_url))
def git_fetch_origin():
return ex.run_cmd('git fetch origin')
def git_push():
return ex.run_cmd('git push origin master')
def check_build():
return (ex.run_cmd(BUILD_SCRIPT_DEBUG) or ex.run_cmd(BUILD_SCRIPT_RELEASE))
def git_remove_remote(fork_name, branch_name):
remote_name = get_merge_remote_name(fork_name, branch_name)
return ex.run_cmd('git remote remove %s' % remote_name)
def run_checktest():
# iot.js executable
iotjs = fs.join(build_root, 'iotjs', 'iotjs')
return ex.run_cmd(path.CHECKTEST_PATH, [iotjs]) == 0