Disable the use of -s or --server with gcl upload.

It contradicts the previous changes to enforce codereview.settings.

TEST=new unit test
BUG=none

Review URL: http://codereview.chromium.org/3171026

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@57195 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/gcl.py b/gcl.py
index ea91fda..dfe0209 100755
--- a/gcl.py
+++ b/gcl.py
@@ -722,6 +722,8 @@
 
   This does not submit a try job; use gcl try to submit a try job.
   """
+  if '-s' in args or '--server' in args:
+    ErrorExit('Don\'t use the -s flag, fix codereview.settings instead')
   if not change_info.GetFiles():
     print "Nothing to upload, changelist is empty."
     return 0