##// END OF EJS Templates
pull_request: Increase debug logging around merge.
johbo -
r149:14cb409d default
parent child Browse files
Show More
@@ -396,10 +396,15 b' class PullRequestModel(BaseModel):'
396 return commit_ids
396 return commit_ids
397
397
398 def merge(self, pull_request, user, extras):
398 def merge(self, pull_request, user, extras):
399 log.debug("Merging pull request %s", pull_request.pull_request_id)
399 merge_state = self._merge_pull_request(pull_request, user, extras)
400 merge_state = self._merge_pull_request(pull_request, user, extras)
400 if merge_state.executed:
401 if merge_state.executed:
402 log.debug(
403 "Merge was successful, updating the pull request comments.")
401 self._comment_and_close_pr(pull_request, user, merge_state)
404 self._comment_and_close_pr(pull_request, user, merge_state)
402 self._log_action('user_merged_pull_request', user, pull_request)
405 self._log_action('user_merged_pull_request', user, pull_request)
406 else:
407 log.warn("Merge failed, not updating the pull request.")
403 return merge_state
408 return merge_state
404
409
405 def _merge_pull_request(self, pull_request, user, extras):
410 def _merge_pull_request(self, pull_request, user, extras):
General Comments 0
You need to be logged in to leave comments. Login now