Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use 'forced' when available to determine if it's a force-push 

(imported from commit afbd1ed2efe2ce86ebd9639d514837211b7517b4)
This commit is contained in:
acrefoot 2014-02-21 12:15:15 -05:00 committed by Jessica McKellar
parent 1d601134ed
commit 7390b6ec53
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/views/webhooks.py
View File

@ -115,7 +115,8 @@ def api_github_v2(user_profile, event, payload, branches, default_stream, commit
payload['ref'], payload['commits'],
payload['before'], payload['after'],
payload['compare'],
payload['pusher']['name'])
payload['pusher']['name'],
forced=payload['forced'])
elif event == 'commit_comment':
comment = payload['comment']
subject = "%s: commit %s" % (topic_focus, comment['commit_id'])
@ -254,14 +255,14 @@ def build_commit_list_content(commits, branch, compare_url, pusher):
return content
def build_message_from_gitlog(user_profile, name, ref, commits, before, after, url, pusher):
def build_message_from_gitlog(user_profile, name, ref, commits, before, after, url, pusher, forced=None):
short_ref = re.sub(r'^refs/heads/', '', ref)
subject = name
if re.match(r'^0+$', after):
content = "%s deleted branch %s" % (pusher,
short_ref)
elif len(commits) == 0:
elif forced or (forced is None and len(commits) == 0):
content = ("%s [force pushed](%s) to branch %s. Head is now %s"
% (pusher,
url,