Making gcl upload do tryupload from the same place as gcl try....

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 groups files into
 # changelists.
 
 import getpass
 import os
@@ skipping 835 matching lines @@
     change_info.patchset = int(patchset)
     change_info.Save()
 
   if desc_file:
     os.remove(desc_file)
 
   # Do background work on Rietveld to lint the file so that the results are
   # ready when the issue is viewed.
   SendToRietveld("/lint/issue%s_%s" % (issue, patchset), timeout=0.5)
 
+  # Move back before considering try, so GetCodeReviewSettings is
+  # consistent.
+  os.chdir(previous_cwd)
+
   # Once uploaded to Rietveld, send it to the try server.
   if not no_try:
     try_on_upload = GetCodeReviewSetting('TRY_ON_UPLOAD')
     if try_on_upload and try_on_upload.lower() == 'true':
       trychange_args = []
       if clobber:
         trychange_args.append('--clobber')
       TryChange(change_info, trychange_args, swallow_exception=True)
 
-  os.chdir(previous_cwd)
 
 
 def PresubmitCL(change_info):
   """Reports what presubmit checks on the change would report."""
   if not change_info.GetFiles():
     print "Nothing to presubmit check, changelist is empty."
     return
 
   print "*** Presubmit checks for UPLOAD would report: ***"
   DoPresubmitChecks(change_info, False, False)
@@ skipping 360 matching lines @@
     # the files. This allows commands such as 'gcl diff xxx' to work.
     args =["svn", command]
     root = GetRepositoryRoot()
     args.extend([os.path.join(root, x) for x in change_info.GetFileNames()])
     RunShell(args, True)
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())