commit fc62f768247f49acac31fdd9ab430c3e5f13ec53
author Aaron Gable <agable@chromium.org> Mon Jul 17 11:12:07 2017 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Jul 18 16:31:49 2017 +0000
tree 7aa88b7242336aa6023dbbf7bd7ef58da9c65894
parent cfbb775f9401c47dd78d521be52a3fcda34d449d

Simplify notify behavior in git-cl

Change-Id: I872658970c04cdadda2b0eaffd95e10717c09493
Reviewed-on: https://chromium-review.googlesource.com/575009
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Aaron Gable <agable@chromium.org>

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index 2933b00..2c4b4bf 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -3117,7 +3117,7 @@
       print('Adding self-LGTM (Code-Review +1) because of TBRs.')
       gerrit_util.SetReview(
           self._GetGerritHost(), self.GetIssue(),
-          labels={'Code-Review': 1}, notify=bool(options.send_mail))
+          msg='Self-approving for TBR', labels={'Code-Review': 1})
 
     return 0
 
@@ -3202,11 +3202,10 @@
         _CQState.DRY_RUN: 1,
         _CQState.COMMIT:  2,
     }
-    kwargs = {'labels': {'Commit-Queue': vote_map[new_state]}}
-    if new_state == _CQState.DRY_RUN:
-      # Don't spam everybody reviewer/owner.
-      kwargs['notify'] = False
-    gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), **kwargs)
+    labels = {'Commit-Queue': vote_map[new_state]}
+    notify = False if new_state == _CQState.DRY_RUN else None
+    gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
+                          labels=labels, notify=notify)
 
   def CannotTriggerTryJobReason(self):
     try: