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

trychange.py

Index: trychange.py
diff --git a/trychange.py b/trychange.py
index c381b1058d6fd8d331b78a03c0ee2179aba7b4b0..1cc6ac957357dabac07b55f6ce69cefa76658254 100755
--- a/trychange.py
+++ b/trychange.py
@@ -114,18 +114,19 @@ class SCM(object):
     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