def merge(self, path, ref, msg, commit_msg, no_ff, env):
try:
repo = Jagare(path)
ret = repo.merge(ref=ref, msg=msg, commit_msg=commit_msg,
no_ff=no_ff, _env=env)
return ProcessResultConverter(**ret).convert()
except Exception as e:
raise ServiceUnavailable(repr(e))
def merge(self, path, ref, msg, commit_msg, no_ff, env):
try:
repo = Jagare(path)
ret = repo.merge(ref=ref,
msg=msg,
commit_msg=commit_msg,
no_ff=no_ff,
_env=env)
return ProcessResultConverter(**ret).convert()
except Exception as e:
raise ServiceUnavailable(repr(e))
def _merge(self, no_ff):
repo = Jagare(self.path)
BR = 'br_test_merge'
path = self.get_temp_path()
# repo has work-tree
repo.clone(path, branch=BARE_REPO_OTHER_BRANCH)
repo = Jagare(os.path.join(path, '.git'))
ret = repo.create_branch(BR, BARE_REPO_OTHER_BRANCH)
assert ret
sha1 = repo.sha(BARE_REPO_OTHER_BRANCH)
commit_something(path, branch=BR)
repo.update_head(BARE_REPO_OTHER_BRANCH)
ret = repo.merge(BR, no_ff=no_ff)
sha2 = repo.sha(BARE_REPO_OTHER_BRANCH)
assert sha1 != sha2
assert repo.sha(sha1) == sha1
def _merge(self, no_ff):
repo = Jagare(self.path)
BR = 'br_test_merge'
path = self.get_temp_path()
# repo has work-tree
repo.clone(path, branch=BARE_REPO_OTHER_BRANCH)
repo = Jagare(os.path.join(path, '.git'))
ret = repo.create_branch(BR, BARE_REPO_OTHER_BRANCH)
assert ret
sha1 = repo.sha(BARE_REPO_OTHER_BRANCH)
commit_something(path, branch=BR)
repo.update_head(BARE_REPO_OTHER_BRANCH)
ret = repo.merge(BR, no_ff=no_ff)
sha2 = repo.sha(BARE_REPO_OTHER_BRANCH)
assert sha1 != sha2
assert repo.sha(sha1) == sha1
