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

pr: Move log statement to allow early return and still log merge response.

Browse source
This commit is contained in:
Martin Bornhold 2016-10-27 10:22:54 +02:00
parent 66c56a50d1
commit e9b40b0f19
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rhodecode/model/pull_request.py
View file

@ -924,6 +924,7 @@ class PullRequestModel(BaseModel):
try:
resp = self._try_merge(pull_request)
log.debug("Merge response: %s", resp)
status = resp.possible, self.merge_status_message(
resp.failure_reason)
except NotImplementedError:
@ -983,7 +984,7 @@ class PullRequestModel(BaseModel):
_last_merge_status == MergeFailureReason.NONE
merge_state = MergeResponse(
possible, False, None, pull_request._last_merge_status)
log.debug("Merge response: %s", merge_state)
return merge_state
def _refresh_reference(self, reference, vcs_repository):