Remove the default values and add a comprehensible error message.

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 14 matching lines @@
 __pychecker__ = ''
 
 # gcl now depends on gclient.
 from scm import SVN
 import gclient_utils
 
 __version__ = '1.2'
 
 
 CODEREVIEW_SETTINGS = {
-  # Ideally, we want to set |CODE_REVIEW_SERVER| to a generic server like
-  # codereview.appspot.com and remove |CC_LIST| and |VIEW_VC|. In practice, we
-  # need these settings so developers making changes in directories such as
-  # Chromium's src/third_party/WebKit will send change lists to the correct
-  # server.
-  #
-  # To make gcl send reviews to a different server, check in a file named
+  # To make gcl send reviews to a server, check in a file named
   # "codereview.settings" (see |CODEREVIEW_SETTINGS_FILE| below) to your
   # project's base directory and add the following line to codereview.settings:
   # CODE_REVIEW_SERVER: codereview.yourserver.org
-  #
-  # Default values.
-  "CODE_REVIEW_SERVER": "codereview.chromium.org",
-  "CC_LIST": "chromium-reviews@chromium.org",
-  "VIEW_VC": "http://src.chromium.org/viewvc/chrome?view=rev&revision=",
 }
 
 # globals that store the root of the current repository and the directory where
 # we store information about changelists.
 REPOSITORY_ROOT = ""
 
 # Filename where we store repository specific information for gcl.
 CODEREVIEW_SETTINGS_FILE = "codereview.settings"
+CODEREVIEW_SETTINGS_FILE_NOT_FOUND = (
+    'No %s file found. Please add one.' % CODEREVIEW_SETTINGS_FILE)
 
 # Warning message when the change appears to be missing tests.
 MISSING_TEST_MSG = "Change contains new or modified methods, but no new tests!"
 
 # Global cache of files cached in GetCacheDir().
 FILES_CACHE = {}
 
 # Valid extensions for files we want to lint.
 DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
 DEFAULT_LINT_IGNORE_REGEX = r"$^"
@@ skipping 495 matching lines @@
   modified_files = GetModifiedFiles()
   if "" not in modified_files:
     return []
   return modified_files[""]
 
 
 def SendToRietveld(request_path, payload=None,
                    content_type="application/octet-stream", timeout=None):
   """Send a POST/GET to Rietveld.  Returns the response body."""
   server = GetCodeReviewSetting("CODE_REVIEW_SERVER")
+  if not server:
+    ErrorExit(CODEREVIEW_SETTINGS_FILE_NOT_FOUND)
   def GetUserCredentials():
     """Prompts the user for a username and password."""
     email = upload.GetEmail("Email (login for uploading to %s)" % server)
     password = getpass.getpass("Password for %s: " % email)
     return email, password
   rpc_server = upload.HttpRpcServer(server,
                                     GetUserCredentials,
                                     save_cookies=True)
   try:
     return rpc_server.Send(request_path, payload, content_type, timeout)
@@ skipping 140 matching lines @@
                    FilterFlag(args, "--no-watchlists"))
 
   # Map --send-mail to --send_mail
   if FilterFlag(args, "--send-mail"):
     args.append("--send_mail")
 
   # Supports --clobber for the try server.
   clobber = FilterFlag(args, "--clobber")
 
   upload_arg = ["upload.py", "-y"]
-  upload_arg.append("--server=" + GetCodeReviewSetting("CODE_REVIEW_SERVER"))
+  server = GetCodeReviewSetting("CODE_REVIEW_SERVER")
+  if not server:
+    ErrorExit(CODEREVIEW_SETTINGS_FILE_NOT_FOUND)
+  upload_arg.append("--server=%s" % server)
   upload_arg.extend(args)
 
   desc_file = ""
   if change_info.issue:  # Uploading a new patchset.
     found_message = False
     for arg in args:
       if arg.startswith("--message") or arg.startswith("-m"):
         found_message = True
         break
 
@@ skipping 131 matching lines @@
   # you'll get "svn: Cannot non-recursively commit a directory deletion of a
   # directory with child nodes". Yay...
   commit_cmd = ["svn", "commit"]
   if change_info.issue:
     # Get the latest description from Rietveld.
     change_info.description = GetIssueDescription(change_info.issue)
 
   commit_message = change_info.description.replace('\r\n', '\n')
   if change_info.issue:
     server = GetCodeReviewSetting("CODE_REVIEW_SERVER")
+    if not server:
+      ErrorExit(CODEREVIEW_SETTINGS_FILE_NOT_FOUND)
     if not server.startswith("http://") and not server.startswith("https://"):
       server = "http://" + server
     commit_message += ('\nReview URL: %s/%d' % (server, change_info.issue))
 
   handle, commit_filename = tempfile.mkstemp(text=True)
   os.write(handle, commit_message)
   os.close(handle)
 
   handle, targets_filename = tempfile.mkstemp(text=True)
   os.write(handle, "\n".join(change_info.GetFileNames()))
@@ skipping 406 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:]))