# HG changeset patch # User Johannes Bornhold # Date 2016-06-08 21:26:02 # Node ID 8725ea73e54d816fbe2dcec9f004e70cc6db93ab # Parent fd19366cd1f5c15f4b7f2ab13f02fb9b570e2198 pull_request: Add debug logging around merge status calculation Goal is to see better traces of the business logic when trying to find out if a pull request can be merged or not. diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py --- a/rhodecode/model/pull_request.py +++ b/rhodecode/model/pull_request.py @@ -907,15 +907,20 @@ class PullRequestModel(BaseModel): """ Try to merge the pull request and return the merge status. """ + log.debug( + "Trying out if the pull request %s can be merged.", + pull_request.pull_request_id) target_vcs = pull_request.target_repo.scm_instance() target_ref = self._refresh_reference( pull_request.target_ref_parts, target_vcs) target_locked = pull_request.target_repo.locked if target_locked and target_locked[0]: + log.debug("The target repository is locked.") merge_state = MergeResponse( False, False, None, MergeFailureReason.TARGET_IS_LOCKED) elif self._needs_merge_state_refresh(pull_request, target_ref): + log.debug("Refreshing the merge status of the repository.") merge_state = self._refresh_merge_state( pull_request, target_vcs, target_ref) else: @@ -923,6 +928,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):