engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pr: Catch errors if target or source reference are missing during commit update. #3950

Browse source
This commit is contained in:
Martin Bornhold 2016-10-27 10:37:51 +02:00
parent e7dd0a5526
commit 667cf04058
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
rhodecode/model/pull_request.py
View file

@ -526,7 +526,14 @@ class PullRequestModel(BaseModel):
old=pull_request, new=None, changes=None)
source_repo = pull_request.source_repo.scm_instance()
source_commit = source_repo.get_commit(commit_id=source_ref_name)
try:
source_commit = source_repo.get_commit(commit_id=source_ref_name)
except CommitDoesNotExistError:
return UpdateResponse(
success=False,
reason=UpdateFailureReason.MISSING_SOURCE_REF,
old=pull_request, new=None, changes=None)
if source_ref_id == source_commit.raw_id:
log.debug("Nothing changed in pull request %s", pull_request)
return UpdateResponse(
@ -543,10 +550,16 @@ class PullRequestModel(BaseModel):
target_ref_id = pull_request.target_ref_parts.commit_id
target_repo = pull_request.target_repo.scm_instance()
if target_ref_type in ('tag', 'branch', 'book'):
target_commit = target_repo.get_commit(target_ref_name)
else:
target_commit = target_repo.get_commit(target_ref_id)
try:
if target_ref_type in ('tag', 'branch', 'book'):
target_commit = target_repo.get_commit(target_ref_name)
else:
target_commit = target_repo.get_commit(target_ref_id)
except CommitDoesNotExistError:
return UpdateResponse(
success=False,
reason=UpdateFailureReason.MISSING_TARGET_REF,
old=pull_request, new=None, changes=None)
# re-compute commit ids
old_commit_ids = set(pull_request.revisions)