Fall back to our own codereview settings if a key is not found in gcl's settings.

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 96 matching lines @@
   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 gcl:
-      return gcl.GetCodeReviewSetting(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, '')
+      gcl_setting = gcl.GetCodeReviewSetting(key)
+      if gcl_setting != '':
+        return gcl_setting
+    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))