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

github: Format pull request messages more like issue messages

Browse Source 
(imported from commit cba3a84c3abb6f33495e5afbe8e03d1a7a7d046c)
This commit is contained in:
Zev Benjamin
2013-09-19 18:33:53 -04:00
parent f99cf15358
commit 1c82a9ecfa
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/tests.py
View File

@@ -3422,13 +3422,13 @@ class GithubHookTests(AuthedTestCase):
def test_pull_request_opened(self): def test_pull_request_opened(self):
self.basic_test('pull_request_opened', 'commits', self.basic_test('pull_request_opened', 'commits',
"zulip-test: pull request 7", "zulip-test: pull request 7: Counting is hard.",
"Pull request from lfaraone [opened](https://github.com/zbenjamin/zulip-test/pull/7):\n\n Counting is hard.\n\n~~~ quote\nOmitted something I think?\n~~~") "lfaraone opened [pull request 7](https://github.com/zbenjamin/zulip-test/pull/7)\n\n~~~ quote\nOmitted something I think?\n~~~")
def test_pull_request_closed(self): def test_pull_request_closed(self):
self.basic_test('pull_request_closed', 'commits', self.basic_test('pull_request_closed', 'commits',
"zulip-test: pull request 7", "zulip-test: pull request 7: Counting is hard.",
"Pull request from lfaraone [closed](https://github.com/zbenjamin/zulip-test/pull/7):\n\n Counting is hard.\n\n~~~ quote\nOmitted something I think?\n~~~") "lfaraone closed [pull request 7](https://github.com/zbenjamin/zulip-test/pull/7)")
class PivotalHookTests(AuthedTestCase): class PivotalHookTests(AuthedTestCase):

11
zerver/views/webhooks.py
View File

@@ -20,7 +20,7 @@ import ujson
from functools import wraps from functools import wraps
def github_pull_req_subject(repository, pull_req): def github_pull_req_subject(repository, pull_req):
return "%s: pull request %d" % (repository['name'], pull_req['number']) return "%s: pull request %d: %s" % (repository['name'], pull_req['number'], pull_req['title'])
def github_issue_subject(repository, issue): def github_issue_subject(repository, issue):
return "%s: issue %d: %s" % (repository['name'], issue['number'], issue['title']) return "%s: issue %d: %s" % (repository['name'], issue['number'], issue['title'])
@@ -51,12 +51,13 @@ def api_github_landing(request, user_profile, event=REQ,
pull_req = payload['pull_request'] pull_req = payload['pull_request']
subject = github_pull_req_subject(repository, pull_req) subject = github_pull_req_subject(repository, pull_req)
content = ("Pull request from %s [%s](%s):\n\n %s\n\n~~~ quote\n%s\n~~~" content = ("%s %s [pull request %s](%s)"
% (pull_req['user']['login'], % (pull_req['user']['login'],
payload['action'], payload['action'],
pull_req['html_url'], pull_req['number'],
pull_req['title'], pull_req['html_url']))
pull_req['body'])) if payload['action'] in ('opened', 'reopened'):
content += "\n\n~~~ quote\n%s\n~~~" % (pull_req['body'],)
elif event == 'push': elif event == 'push':
short_ref = re.sub(r'^refs/heads/', '', payload['ref']) short_ref = re.sub(r'^refs/heads/', '', payload['ref'])
# This is a bit hackish, but is basically so that CUSTOMER18 doesn't # This is a bit hackish, but is basically so that CUSTOMER18 doesn't