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

pull_request: Increase debug logging around merge.

Browse source
This commit is contained in:
Johannes Bornhold 2016-06-09 00:19:16 +02:00
parent 5eae0d6f48
commit ebec853ea6
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rhodecode/model/pull_request.py
View file

@ -396,10 +396,15 @@ class PullRequestModel(BaseModel):
return commit_ids
def merge(self, pull_request, user, extras):
log.debug("Merging pull request %s", pull_request.pull_request_id)
merge_state = self._merge_pull_request(pull_request, user, extras)
if merge_state.executed:
log.debug(
"Merge was successful, updating the pull request comments.")
self._comment_and_close_pr(pull_request, user, merge_state)
self._log_action('user_merged_pull_request', user, pull_request)
else:
log.warn("Merge failed, not updating the pull request.")
return merge_state
def _merge_pull_request(self, pull_request, user, extras):