commit 2a229719c26bbf2cbc65c91b372ea03c6bef3b9c
author Aleksey Khoroshilov <akhoroshilov@brave.com> Thu Jun 02 16:24:11 2022 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jun 02 16:24:11 2022 +0000
tree 3967365ab20e3d20282b3dbd25e3556a2092b8f1
parent 8f1fea025d78c26046d3135e026f097dc2022698

Improve codereview.settings file lookup.

Remove unnecessary os.listdir call and fix infinite loop on Windows if
no file was found in a tree.

Change-Id: I82a8763e807bbc0ce6fcae6b35a370ffe3b34943
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3687234
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Auto-Submit: Aleksey Khoroshilov <akhoroshilov@brave.com>

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index 806dad2..c22c682 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -3003,14 +3003,18 @@
   cwd = os.getcwd()
   root = settings.GetRoot()
   if os.path.isfile(os.path.join(root, inherit_ok_file)):
-    root = '/'
+    root = None
   while True:
-    if filename in os.listdir(cwd):
-      if os.path.isfile(os.path.join(cwd, filename)):
-        return open(os.path.join(cwd, filename))
+    if os.path.isfile(os.path.join(cwd, filename)):
+      return open(os.path.join(cwd, filename))
     if cwd == root:
       break
-    cwd = os.path.dirname(cwd)
+    parent_dir = os.path.dirname(cwd)
+    if parent_dir == cwd:
+      # We hit the system root directory.
+      break
+    cwd = parent_dir
+  return None
 
 
 def LoadCodereviewSettingsFromFile(fileobj):