paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 00:18:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Normalize github and beanstalk force push event message.

Browse Source
This commit is contained in:
Tomasz Kolek
2016-10-05 20:50:17 +02:00
committed by Tim Abbott
parent 5f7c1519d1
commit f084dd05a8
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/views/webhooks/github.py
View File

@@ -5,7 +5,8 @@ from zerver.lib.response import json_success
from zerver.lib.validator import check_dict from zerver.lib.validator import check_dict
from zerver.decorator import authenticated_api_view, REQ, has_request_variables, to_non_negative_int, flexible_boolean from zerver.decorator import authenticated_api_view, REQ, has_request_variables, to_non_negative_int, flexible_boolean
from zerver.views.messages import send_message_backend from zerver.views.messages import send_message_backend
from zerver.lib.webhooks.git import get_push_commits_event_message, SUBJECT_WITH_BRANCH_TEMPLATE from zerver.lib.webhooks.git import get_push_commits_event_message,\
SUBJECT_WITH_BRANCH_TEMPLATE, get_force_push_commits_event_message
import logging import logging
import re import re
import ujson import ujson
@@ -232,11 +233,7 @@ def build_message_from_gitlog(user_profile, name, ref, commits, before, after, u
short_ref) short_ref)
# 'created' and 'forced' are github flags; the second check is for beanstalk # 'created' and 'forced' are github flags; the second check is for beanstalk
elif (forced and not created) or (forced is None and len(commits) == 0): elif (forced and not created) or (forced is None and len(commits) == 0):
content = (u'%s [force pushed](%s) to branch %s. Head is now %s' content = get_force_push_commits_event_message(pusher, url, short_ref, after[:7])
% (pusher,
url,
short_ref,
after[:7]))
else: else:
commits = _transform_commits_list_to_common_format(commits) commits = _transform_commits_list_to_common_format(commits)
content = get_push_commits_event_message(pusher, url, short_ref, commits) content = get_push_commits_event_message(pusher, url, short_ref, commits)