Reuse gcl.py's code review settings when running [gcl try], as gcl is ...

trychange.py

 #!/usr/bin/python
 # Copyright (c) 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.
 """Client-side script to send a try job to the try server. It communicates to
 the try server by either writting to a svn repository or by directly connecting
 to the server by HTTP.
 """
 
 import datetime
@@ skipping 15 matching lines @@
   try:
     import json
   except ImportError:
     json = None
 
 try:
   import breakpad
 except ImportError:
   pass
 
+# We try to use gcl.py's GetCodeReviewSettings function if available.
+GclGetCodeReviewSetting = None

[M-A Ruel, 2010/10/06 23:43:18]

I'd prefer gcl = None and use if gcl: return gcl.GetCodeReviewSetting(key)
around line 119.

[Jói, 2010/10/06 23:54:03]

Done.

+try:
+  import gcl
+  GclGetCodeReviewSetting = gcl.GetCodeReviewSetting
+except:

[M-A Ruel, 2010/10/06 23:43:18]

except ImportError:

[Jói, 2010/10/06 23:54:03]

Done.

+  pass
+
 import gclient_utils
 import scm
 
 __version__ = '1.2'
 
 
 # Constants
 HELP_STRING = "Sorry, Tryserver is not available."
 USAGE = r"""%prog [options]
 
@@ skipping 53 matching lines @@
     self.codereview_settings_file = 'codereview.settings'
     self.gclient_root = None
 
   def GetFileNames(self):
     """Return the list of files in the diff."""
     return self.files
 
   def GetCodeReviewSetting(self, key):
     """Returns a value for the given key for this repository.
 
-    Uses gcl-style settings from the repository."""
-    if self.codereview_settings is None:
-      self.codereview_settings = {}
-      settings_file = self.ReadRootFile(self.codereview_settings_file)
-      if settings_file:
-        for line in settings_file.splitlines():
-          if not line or line.lstrip().startswith('#'):
-            continue
-          k, v = line.split(":", 1)
-          self.codereview_settings[k.strip()] = v.strip()
-    return self.codereview_settings.get(key, '')
+    Uses gcl-style settings from the repository.
+    """
+    if GclGetCodeReviewSetting:
+      return GclGetCodeReviewSetting(key)
+    else:
+      if self.codereview_settings is None:
+        self.codereview_settings = {}
+        settings_file = self.ReadRootFile(self.codereview_settings_file)
+        if settings_file:
+          for line in settings_file.splitlines():
+            if not line or line.lstrip().startswith('#'):
+              continue
+            k, v = line.split(":", 1)
+            self.codereview_settings[k.strip()] = v.strip()
+      return self.codereview_settings.get(key, '')
 
   def _GclStyleSettings(self):
     """Set default settings based on the gcl-style settings from the
     repository."""
     settings = {
       'port': self.GetCodeReviewSetting('TRYSERVER_HTTP_PORT'),
       'host': self.GetCodeReviewSetting('TRYSERVER_HTTP_HOST'),
       'svn_repo': self.GetCodeReviewSetting('TRYSERVER_SVN_URL'),
       'project': self.GetCodeReviewSetting('TRYSERVER_PROJECT'),
       'root': self.GetCodeReviewSetting('TRYSERVER_ROOT'),
@@ skipping 605 matching lines @@
   except (InvalidScript, NoTryServerAccess), e:
     if swallow_exception:
       return 1
     print e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(TryChange(None, [], False))