Incremental changes towards more efficient refactoring of gclient.py

gclient_utils.py

 # Copyright 2009 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 283 matching lines @@
 
 
 def IsUsingGit(root, paths):
   """Returns True if we're using git to manage any of our checkouts.
   |entries| is a list of paths to check."""
   for path in paths:
     if os.path.exists(os.path.join(root, path, '.git')):
       return True
   return False
 
-def FindGclientRoot(from_dir):
+def FindGclientRoot(from_dir, filename='.gclient'):
   """Tries to find the gclient root."""
   path = os.path.realpath(from_dir)
-  while not os.path.exists(os.path.join(path, '.gclient')):
+  while not os.path.exists(os.path.join(path, filename)):
     next = os.path.split(path)
     if not next[1]:
       return None
     path = next[0]
   logging.info('Found gclient root at ' + path)
   return path
 
+
 def PathDifference(root, subpath):
   """Returns the difference subpath minus root."""
   root = os.path.realpath(root)
   subpath = os.path.realpath(subpath)
   if not subpath.startswith(root):
     return None
   # If the root does not have a trailing \ or /, we add it so the returned
   # path starts immediately after the seperator regardless of whether it is
   # provided.
   root = os.path.join(root, '')
@@ skipping 21 matching lines @@
   config_path = FindFileUpwards(config_file, path)
 
   if not config_path:
     print "Can't find %s" % config_file
     return None
 
   env = {}
   execfile(config_path, env)
   config_dir = os.path.dirname(config_path)
   return config_dir, env['entries']