First stab at using Rietveld wrapper object in both gcl.py and git-cl.

gcl.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 """
 
-import getpass
 import optparse
 import os
 import random
 import re
 import string
 import subprocess
 import sys
 import tempfile
 import time
 from third_party import upload
@@ skipping 10 matching lines @@
     import simplejson as json  # pylint: disable=F0401
 
 import breakpad  # pylint: disable=W0611
 
 # gcl now depends on gclient.
 from scm import SVN
 
 import fix_encoding
 import gclient_utils
 import presubmit_support
+import rietveld
 import subprocess2
 
-__version__ = '1.2'
+__version__ = '1.2.1'
 
 
 CODEREVIEW_SETTINGS = {
   # 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
@@ skipping 221 matching lines @@
     description: the description.
     files: a list of 2 tuple containing (status, filename) of changed files,
            with paths being relative to the top repository directory.
     local_root: Local root directory
     rietveld: rietveld server for this change
   """
   # Kept for unit test support. This is for the old format, it's deprecated.
   _SEPARATOR = "\n-----\n"
 
   def __init__(self, name, issue, patchset, description, files, local_root,
-               rietveld, needs_upload=False):
+               rietveld_url, needs_upload=False):
     self.name = name
     self.issue = int(issue)
     self.patchset = int(patchset)
     self._description = None
     self._subject = None
     self._reviewers = None
     self._set_description(description)
     if files is None:
       files = []
     self._files = files
     self.patch = None
     self._local_root = local_root
     self.needs_upload = needs_upload
-    self.rietveld = rietveld
+    self.rietveld = rietveld_url
     if not self.rietveld:
       # Set the default value.
       self.rietveld = GetCodeReviewSetting('CODE_REVIEW_SERVER')
+    self._rpc_server = None
 
   def _get_description(self):
     return self._description
 
   def _set_description(self, description):
     # TODO(dpranke): Cloned from git_cl.py. These should be shared.
     if not description:
       self._description = description
       return
 
@@ skipping 63 matching lines @@
           'files': self.GetFiles(),
           'description': self.description,
           'rietveld': self.rietveld,
         }, sort_keys=True, indent=2)
     gclient_utils.FileWrite(GetChangelistInfoFile(self.name), data)
 
   def Delete(self):
     """Removes the changelist information from disk."""
     os.remove(GetChangelistInfoFile(self.name))
 
+  def RpcServer(self):
+    if not self._rpc_server:
+      if not self.rietveld:
+        ErrorExit(CODEREVIEW_SETTINGS_FILE_NOT_FOUND)
+      self._rpc_server = rietveld.Rietveld(self.rietveld, None, None)
+    return self._rpc_server
+
   def CloseIssue(self):
     """Closes the Rietveld issue for this changelist."""
     # Newer versions of Rietveld require us to pass an XSRF token to POST, so
     # we fetch it from the server.
     xsrf_token = self.SendToRietveld(
         '/xsrf_token',
         extra_headers={'X-Requesting-XSRF-Token': '1'})
 
     # You cannot close an issue with a GET.
     # We pass an empty string for the data so it is a POST rather than a GET.
@@ skipping 16 matching lines @@
 
   def PrimeLint(self):
     """Do background work on Rietveld to lint the file so that the results are
     ready when the issue is viewed."""
     if self.issue and self.patchset:
       self.SendToRietveld('/lint/issue%s_%s' % (self.issue, self.patchset),
           timeout=1)
 
   def SendToRietveld(self, request_path, timeout=None, **kwargs):
     """Send a POST/GET to Rietveld.  Returns the response body."""
-    if not self.rietveld:
-      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)' %
-          self.rietveld)
-      password = getpass.getpass('Password for %s: ' % email)
-      return email, password
-    rpc_server = upload.HttpRpcServer(self.rietveld,
-                                      GetUserCredentials,
-                                      save_cookies=True)
     try:
-      return rpc_server.Send(request_path, timeout=timeout, **kwargs)
+      return self.RpcServer().Send(request_path, timeout=timeout, **kwargs)
     except urllib2.URLError:
       if timeout is None:
         ErrorExit('Error accessing url %s' % request_path)
       else:
         return None
 
   def MissingTests(self):
     """Returns True if the change looks like it needs unit tests but has none.
 
     A change needs unit tests if it contains any new source files or methods.
@@ skipping 83 matching lines @@
         changelist doesn't exist.
       update_status: if True, the svn status will be updated for all the files
         and unchanged files will be removed.
 
     Returns: a ChangeInfo object.
     """
     info_file = GetChangelistInfoFile(changename)
     if not os.path.exists(info_file):
       if fail_on_not_found:
         ErrorExit("Changelist " + changename + " not found.")
-      return ChangeInfo(changename, 0, 0, '', None, local_root, rietveld=None,
-                        needs_upload=False)
+      return ChangeInfo(
+          changename, 0, 0, '', None, local_root, rietveld_url=None,
+          needs_upload=False)
     content = gclient_utils.FileRead(info_file, 'r')
     save = False
     try:
       values = ChangeInfo._LoadNewFormat(content)
     except ValueError:
       try:
         values = ChangeInfo._LoadOldFormat(content)
         save = True
       except ValueError:
         ErrorExit(
@@ skipping 664 matching lines @@
 
 def DoPresubmitChecks(change_info, committing, may_prompt):
   """Imports presubmit, then calls presubmit.DoPresubmitChecks."""
   root_presubmit = GetCachedFile('PRESUBMIT.py', use_root=True)
   change = presubmit_support.SvnChange(change_info.name,
                                        change_info.description,
                                        change_info.GetLocalRoot(),
                                        change_info.GetFiles(),
                                        change_info.issue,
                                        change_info.patchset)
-  output = presubmit_support.DoPresubmitChecks(change=change,
-                                               committing=committing,
-                                               verbose=False,
-                                               output_stream=sys.stdout,
-                                               input_stream=sys.stdin,
-                                               default_presubmit=root_presubmit,
-                                               may_prompt=may_prompt,
-                                               tbr=False,
-                                               host_url=change_info.rietveld)
+  output = presubmit_support.DoPresubmitChecks(
+      change=change,
+      committing=committing,
+      verbose=False,
+      output_stream=sys.stdout,
+      input_stream=sys.stdin,
+      default_presubmit=root_presubmit,
+      may_prompt=may_prompt,
+      tbr=False,
+      rietveld=change_info.RpcServer())
   if not output.should_continue() and may_prompt:
     # TODO(dpranke): move into DoPresubmitChecks(), unify cmd line args.
     print "\nPresubmit errors, can't continue (use --no_presubmit to bypass)"
 
   return output
 
 
 @no_args
 def CMDchanges():
   """Lists all the changelists and their files."""
@@ skipping 212 matching lines @@
       raise
     print >> sys.stderr, (
         'AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
         'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))
     return 1
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))