commit 0b2d70724f1319bf251e14d4c223f2dd7fc2090d
author tandrii@chromium.org <tandrii@chromium.org> Mon Apr 18 16:19:03 2016 +0000
committer tandrii@chromium.org <tandrii@chromium.org> Mon Apr 18 16:19:03 2016 +0000
tree 50df7b1d4168cf4cb2d57e02d9ffc862d955e997
parent cb66fce9a27144cf138ece9481cad3f54156899c

Gerrit git cl: temporary disable cc option on upload.

Gerrit doesn't allow arbitrary non-member emails for now,
thus removign this feature until either Gerrit allows it,
or we have a per-repo opt-in way.

TBR=andybons@chromium.org
BUG=604377

Review URL: https://codereview.chromium.org/1895863002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299988 0039d316-1c4b-4281-b951-d872f2087c98

tests/git_cl_test.py

diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index a78c738..8b00ac7 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -809,13 +809,17 @@
         ((['git', 'config', 'rietveld.cc'],), '')
         ]
     # Add cc from watch list.
-    if ref_suffix == '':
-      ref_suffix = '%cc=joe@example.com'
-    else:
-      ref_suffix += ',cc=joe@example.com'
+    # TODO(tandrii): bring this back after http://crbug.com/604377.
+    # if ref_suffix == '':
+    #   ref_suffix = '%cc=joe@example.com'
+    # else:
+    #   ref_suffix += ',cc=joe@example.com'
     if reviewers:
-      ref_suffix += ',' + ','.join('r=%s' % email
-                                   for email in sorted(reviewers))
+      if ref_suffix:
+        ref_suffix += ','
+      else:
+        ref_suffix = '%'
+      ref_suffix += ','.join('r=%s' % email for email in sorted(reviewers))
     calls += [
         ((['git', 'push', 'origin',
            ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),