Make gcl uploading work again.

gcl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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 29 matching lines @@
   # 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
 }
 
 # globals that store the root of the current repository and the directory where
 # we store information about changelists.
 REPOSITORY_ROOT = ""
 
-# Replacement for project name.
-SWITCH_TO_GIT = "SWITCH_TO_GIT_ALREADY"
+# Printed when people upload patches using svn.
+SWITCH_TO_GIT = """You're using svn to work on depot_tools.
+Consider switching to git today, so that you're ready when svn stops working
+and you need a functional checkout for a future fire."""
 
 # 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().
@@ skipping 815 matching lines @@
   upload_arg.extend(args)
 
   desc_file = None
   try:
     if change_info.issue:
       # Uploading a new patchset.
       upload_arg.append("--issue=%d" % change_info.issue)
 
       project = GetCodeReviewSetting("PROJECT")
       if project:
-        upload_arg.append("--project=%s" % SWITCH_TO_GIT)
+        print SWITCH_TO_GIT
+        upload_arg.append("--project=%s" % project)
 
       if not any(i.startswith('--title') or i.startswith('-t') for i in args):
         upload_arg.append('--title= ')
     else:
       # First time we upload.
       handle, desc_file = tempfile.mkstemp(text=True)
       os.write(handle, change_info.description)
       os.close(handle)
 
       # Watchlist processing -- CC people interested in this changeset
@@ skipping 21 matching lines @@
         cc_list = ','.join(filter(None, [cc_list] + watchers))
       if cc_list:
         upload_arg.append("--cc=" + cc_list)
       upload_arg.append("--file=%s" % desc_file)
 
       if GetCodeReviewSetting("PRIVATE") == "True":
         upload_arg.append("--private")
 
       project = GetCodeReviewSetting("PROJECT")
       if project:
-        upload_arg.append("--project=%s" % SWITCH_TO_GIT)
+        print SWITCH_TO_GIT
+        upload_arg.append("--project=%s" % project)
 
     # If we have a lot of files with long paths, then we won't be able to fit
     # the command to "svn diff".  Instead, we generate the diff manually for
     # each file and concatenate them before passing it to upload.py.
     if change_info.patch is None:
       change_info.patch = GenerateDiff(change_info.GetFileNames())
 
     # Change the current working directory before calling upload.py so that it
     # shows the correct base.
     previous_cwd = os.getcwd()
@@ skipping 584 matching lines @@
     return 1
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)