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

gcl.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
@@ skipping 704 matching lines @@
   return ListFiles(True)
 
 
 @need_change_and_args
 @attrs(usage='[--no_presubmit] [--clobber] [--no_watchlists]')
 def CMDupload(change_info, args):
   """Uploads the changelist to the server for review.
 
   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
   if not OptionallyDoPresubmitChecks(change_info, False, args):
     return 1
   no_watchlists = (FilterFlag(args, "--no_watchlists") or
                    FilterFlag(args, "--no-watchlists"))
 
   # Map --send-mail to --send_mail
   if FilterFlag(args, "--send-mail"):
@@ skipping 579 matching lines @@
     if command:
       return command(argv[1:])
     # Unknown command, try to pass that to svn
     return CMDpassthru(argv)
   except gclient_utils.Error, e:
     print('Got an exception')
     print(str(e))
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv[1:]))