From 9faec9d778817d187033e1b74d8ff8115acb4a38 Mon Sep 17 00:00:00 2001
From: Waseem Daher <wdaher@zulip.com>
Date: Wed, 11 Dec 2013 11:41:54 -0500
Subject: [PATCH] Shorter topics for git/svn integration.

(imported from commit 6c9822f6ba383d885e48d3bb64c30e49ea8cf1e5)
---
 bots/zulip_git_config.py             | 4 ++--
 integrations/git/zulip_git_config.py | 4 ++--
 integrations/svn/zulip_svn_config.py | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bots/zulip_git_config.py b/bots/zulip_git_config.py
index a93c67c..1ac9ab8 100644
--- a/bots/zulip_git_config.py
+++ b/bots/zulip_git_config.py
@@ -20,12 +20,12 @@ ZULIP_API_KEY = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 #
 # The default code below will send every commit pushed to "master" to
 # * stream "commits"
-# * subject "deploy => master" (using a pretty unicode right arrow)
+# * topic "master"
 # And similarly for branch "test-post-receive" (for use when testing).
 def commit_notice_destination(repo, branch, commit):
     if branch in ["master", "prod", "test-post-receive"]:
         return dict(stream  = 'test' if 'test-' in branch else 'commits',
-                    subject = u"deploy \u21D2 %s" % (branch,))
+                    subject = u"%s" % (branch,))
 
     # Return None for cases where you don't want a notice sent
     return None
diff --git a/integrations/git/zulip_git_config.py b/integrations/git/zulip_git_config.py
index 992b130..6af3abc 100644
--- a/integrations/git/zulip_git_config.py
+++ b/integrations/git/zulip_git_config.py
@@ -39,12 +39,12 @@ ZULIP_API_KEY = "0123456789abcdef0123456789abcdef"
 #
 # The default code below will send every commit pushed to "master" to
 # * stream "commits"
-# * subject "deploy => master" (using a pretty unicode right arrow)
+# * topic "master"
 # And similarly for branch "test-post-receive" (for use when testing).
 def commit_notice_destination(repo, branch, commit):
     if branch in ["master", "test-post-receive"]:
         return dict(stream  = "commits",
-                    subject = u"deploy \u21D2 %s" % (branch,))
+                    subject = u"%s" % (branch,))
 
     # Return None for cases where you don't want a notice sent
     return None
diff --git a/integrations/svn/zulip_svn_config.py b/integrations/svn/zulip_svn_config.py
index 92104fc..7c6e2d5 100644
--- a/integrations/svn/zulip_svn_config.py
+++ b/integrations/svn/zulip_svn_config.py
@@ -36,15 +36,15 @@ ZULIP_API_KEY = "0123456789abcdef0123456789abcdef"
 # Returns a dictionary encoding the stream and subject to send the
 # notification to (or None to send no notification).
 #
-# The default code below will send every commit except for the "master-plan"
-# and "secret" repos to
+# The default code below will send every commit except for the "evil-master-plan"
+# and "my-super-secret-repository" repos to
 # * stream "commits"
-# * subject "deploy => branch_name" (using a pretty unicode right arrow)
+# * topic "branch_name"
 def commit_notice_destination(path, commit):
     repo = path.split('/')[-1]
     if repo not in ["evil-master-plan", "my-super-secret-repository"]:
         return dict(stream  = "commits",
-                    subject = u"deploy \u21D2 %s" % (repo,))
+                    subject = u"%s" % (repo,))
 
     # Return None for cases where you don't want a notice sent
     return None