git_cl: Allow server overriding.

git_cl.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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld and Gerrit."""
 
 from __future__ import print_function
@@ skipping 632 matching lines @@
       stdout=stdout, env=env)
 
 
 class BuildbucketResponseException(Exception):
   pass
 
 
 class Settings(object):
   def __init__(self):
     self.default_server = None
+    self.server_override = None
     self.cc = None
     self.root = None
     self.is_git_svn = None
     self.svn_branch = None
     self.tree_status_url = None
     self.viewvc_url = None
     self.updated = False
     self.is_gerrit = None
     self.squash_gerrit_uploads = None
     self.gerrit_skip_ensure_authenticated = None
@@ skipping 1068 matching lines @@
     assert settings, 'must be initialized in _ChangelistCodereviewBase'
     if not rietveld_server:
       settings.GetDefaultServerUrl()
 
     self._rietveld_server = rietveld_server
     self._auth_config = auth_config
     self._props = None
     self._rpc_server = None
 
   def GetCodereviewServer(self):
+    global settings
+    if settings and settings.server_override:
+      return gclient_utils.UpgradeToHttps(settings.server_override)
+
     if not self._rietveld_server:
       # If we're on a branch then get the server potentially associated
       # with that branch.
       if self.GetIssue():
         self._rietveld_server = gclient_utils.UpgradeToHttps(
             self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
       if not self._rietveld_server:
         self._rietveld_server = settings.GetDefaultServerUrl()
     return self._rietveld_server
 
@@ skipping 453 matching lines @@
               '  Your current remote is: %s'  % self.GetRemoteUrl())
         self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
         self._gerrit_server = 'https://%s' % self._gerrit_host
     return self._gerrit_host
 
   def _GetGitHost(self):
     """Returns git host to be used when uploading change to Gerrit."""
     return urlparse.urlparse(self.GetRemoteUrl()).netloc
 
   def GetCodereviewServer(self):
+    global settings
+    if settings and settings.server_override:
+      return gclient_utils.UpgradeToHttps(settings.server_override)
+
     if not self._gerrit_server:
       # If we're on a branch then get the server potentially associated
       # with that branch.
       if self.GetIssue():
         self._gerrit_server = self._GitGetBranchConfigValue(
             self.CodereviewServerConfigKey())
         if self._gerrit_server:
           self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
       if not self._gerrit_server:
         # We assume repo to be hosted on Gerrit, and hence Gerrit server
@@ skipping 588 matching lines @@
   """Appends --gerrit and --rietveld options to force specific codereview."""
   parser.codereview_group = optparse.OptionGroup(
       parser, 'EXPERIMENTAL! Codereview override options')
   parser.add_option_group(parser.codereview_group)
   parser.codereview_group.add_option(
       '--gerrit', action='store_true',
       help='Force the use of Gerrit for codereview')
   parser.codereview_group.add_option(
       '--rietveld', action='store_true',
       help='Force the use of Rietveld for codereview')
+  parser.codereview_group.add_option(
+      '--force-codereview-server', action='store', metavar='URL',
+      help='Use this codereview server instead of the default.')
 
 
 def _process_codereview_select_options(parser, options):
   if options.gerrit and options.rietveld:
     parser.error('Options --gerrit and --rietveld are mutually exclusive')
   options.forced_codereview = None
   if options.gerrit:
     options.forced_codereview = 'gerrit'
   elif options.rietveld:
     options.forced_codereview = 'rietveld'
 
+  if options.force_codereview_server:
+    global settings
+    if settings:
+      settings.server_override = options.force_codereview_server
+
 
 def _get_bug_line_values(default_project, bugs):
   """Given default_project and comma separated list of bugs, yields bug line
   values.
 
   Each bug can be either:
     * a number, which is combined with default_project
     * string, which is left as is.
 
   This function may produce more than one line, because bugdroid expects one
@@ skipping 668 matching lines @@
                     help='Do not retrieve review status')
   parser.add_option(
       '-j', '--maxjobs', action='store', type=int,
       help='The maximum number of jobs to use when retrieving review status')
 
   auth.add_auth_options(parser)
   _add_codereview_issue_select_options(
     parser, 'Must be in conjunction with --field.')
   options, args = parser.parse_args(args)
   _process_codereview_issue_select_options(parser, options)
+  _process_codereview_select_options(parser, options)
   if args:
     parser.error('Unsupported args: %s' % args)
   auth_config = auth.extract_auth_config_from_options(options)
 
   if options.issue is not None and not options.field:
     parser.error('--field must be specified with --issue')
 
   if options.field:
     cl = Changelist(auth_config=auth_config, issue=options.issue,
                     codereview=options.forced_codereview)
@@ skipping 1842 matching lines @@
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)