def checkout(args):
"Checks out a tracked code review branch."
g = GitRepo()
cr_data_file = get_cr_data_file(g)
safe_create_code_review_data_file(cr_data_file)
crconf = CodeReviewConfiguration(cr_data_file)
if args._branch_name in crconf.branches:
try:
g.checkout(args._branch_name)
logger.info('checked out: ' + args._branch_name)
except:
logger.error('could not checkout branch: ' + args._branch_name)
else:
m = "no branch named {0} tracked. Please use another method to checkout this branch"
logger.warning(m.format(args._branch_name))
def checkout(args):
"Checks out a tracked code review branch."
g = GitRepo()
cr_data_file = get_cr_data_file(g)
safe_create_code_review_data_file(cr_data_file)
crconf = CodeReviewConfiguration(cr_data_file)
if args._branch_name in crconf.branches:
try:
g.checkout(args._branch_name)
logger.info('checked out: ' + args._branch_name)
except:
logger.error('could not checkout branch: ' + args._branch_name)
else:
m = "no branch named {0} tracked. Please use another method to checkout this branch"
logger.warning(m.format(args._branch_name))
def merge(args):
c = fetch_config(args)
g = GitRepo(c.paths.projectroot)
from_branch = g.current_branch()
branch_name = str(id(c.runstate.git_branch))
g.checkout_branch(branch_name, c.runstate.git_branch)
try:
g.checkout(branch_name)
g.rebase(from_branch)
g.checkout(from_branch)
g.merge(c.runstate.git_branch)
logger.info('rebased and merged {0} into {1}'.format(
c.runstate.git_branch, from_branch))
except Exception as e:
logger.warning('error attempting to merge branch: ' +
c.runstate.git_branch)
logger.error(e)
finally:
if g.current_branch != from_branch:
g.checkout(from_branch)
g.remove_branch(branch_name, force=False)
def merge(args):
c = fetch_config(args)
g = GitRepo(c.paths.projectroot)
from_branch = g.current_branch()
branch_name = str(id(c.runstate.git_branch))
g.checkout_branch(branch_name, c.runstate.git_branch)
try:
g.checkout(branch_name)
g.rebase(from_branch)
g.checkout(from_branch)
g.merge(c.runstate.git_branch)
logger.info('rebased and merged {0} into {1}'.format(c.runstate.git_branch, from_branch))
except Exception as e:
logger.warning('error attempting to merge branch: ' + c.runstate.git_branch)
logger.error(e)
finally:
if g.current_branch != from_branch:
g.checkout(from_branch)
g.remove_branch(branch_name, force=False)
