Python merge_with_base示例

示例#1

文件： sync.py 项目： joest67/codecli

def main(args):
    branch = get_current_branch_name()
    if args.action == 'pull':
        merge_with_base(branch,
                        rebase=args.rebase,
                        remote_branch=args.base,
                        remote=args.remote)
    else:
        sync_to_remote(branch,
                       remote=args.remote,
                       remote_branch=args.base,
                       force=args.force)

示例#2

文件： pullreq.py 项目： kirk91/codecli

def submit_new_pullreq(remote='upstream', remote_branch=None, no_merge=False):
    branch = get_current_branch_name()
    if branch == 'master':
        print_log('Pull request should never be from master')
        return 1

    if not no_merge:
        rebase = not branch_is_published_already(branch)
        merge_with_base(branch, rebase=rebase, remote=remote,
                        remote_branch=remote_branch)
    push_to_my_fork(branch)
    send_pullreq(branch, remote=remote, remote_branch=remote_branch)

示例#3

文件： pullreq.py 项目： CCv5/codecli

def submit_new_pullreq(remote='upstream', remote_branch=None, no_merge=False):
    branch = get_current_branch_name()
    if branch == 'master':
        print_log('Pull request should never be from master')
        return 1

    if not no_merge:
        rebase = not branch_is_published_already(branch)
        merge_with_base(branch,
                        rebase=rebase,
                        remote=remote,
                        remote_branch=remote_branch)
    push_to_my_fork(branch)
    send_pullreq(branch, remote=remote, remote_branch=remote_branch)

示例#4

文件： sync.py 项目： wooparadog/codecli

def main(args):
    branch = get_current_branch_name()
    merge_with_base(branch, rebase=args.rebase)