Move more members as property

gclient.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Meta checkout manager supporting both Subversion and GIT.
 
 Files
   .gclient      : Current client configuration, written by 'config' command.
                   Format is a Python script defining 'solutions', a list whose
@@ skipping 145 matching lines @@
     # This is in both .gclient and DEPS files:
     self.url = url
 
     # These are only set in .gclient and not in DEPS files.
     # 'managed' determines whether or not this dependency is synced/updated by
     # gclient after gclient checks it out initially.  The difference between
     # 'managed' and 'should_process' (defined below) is that the user specifies
     # 'managed' via the --unmanaged command-line flag or a .gclient config,
     # where 'should_process' is dynamically set by gclient if it goes over its
     # recursion limit and controls gclient's behavior so it does not misbehave.
-    self.managed = managed
-    self.custom_vars = custom_vars or {}
-    self.custom_deps = custom_deps or {}
+    self._managed = managed
+    self._custom_vars = custom_vars or {}
+    self._custom_deps = custom_deps or {}
     self.deps_hooks = []
 
     # Calculates properties:
     self.parsed_url = None
     self.dependencies = []
     # A cache of the files affected by the current operation, necessary for
     # hooks.
     self._file_list = []
     # If it is not set to True, the dependency wasn't processed for its child
     # dependency, i.e. its DEPS wasn't read.
@@ skipping 40 matching lines @@
     # thus unsorted, while the .gclient format is a list thus sorted.
     #
     # * _recursion_limit is hard coded 2 and there is no hope to change this
     # value.
     #
     # Interestingly enough, the following condition only works in the case we
     # want: self is a 2nd level node. 3nd level node wouldn't need this since
     # they already have their parent as a requirement.
     root_deps = self.root.dependencies
     if self.parent in root_deps:
-      for i in range(0, root_deps.index(self.parent)):
-        value = root_deps[i]
-        if value.name:
-          self._requirements.add(value.name)
+      for i in root_deps:
+        if i is self.parent:
+          break
+        if i.name:
+          self._requirements.add(i.name)
 
     if isinstance(self.url, self.FromImpl):
       self._requirements.add(self.url.module_name)
 
     if self.name and self.should_process:
       def yield_full_tree(root):
         """Depth-first recursion."""
         yield root
         for i in root.dependencies:
           for j in yield_full_tree(i):
@@ skipping 107 matching lines @@
       logging.debug(deps_content)
       # Eval the content.
       try:
         exec(deps_content, global_scope, local_scope)
       except SyntaxError, e:
         gclient_utils.SyntaxErrorToError(filepath, e)
     deps = local_scope.get('deps', {})
     # load os specific dependencies if defined.  these dependencies may
     # override or extend the values defined by the 'deps' member.
     if 'deps_os' in local_scope:
-      for deps_os_key in self.root.enforced_os:
+      enforced_os = self.root.enforced_os
+      for deps_os_key in enforced_os:
         os_deps = local_scope['deps_os'].get(deps_os_key, {})
-        if len(self.root.enforced_os) > 1:
+        if len(enforced_os) > 1:
           # Ignore any conflict when including deps for more than one
           # platform, so we collect the broadest set of dependencies
           # available. We may end up with the wrong revision of something for
           # our platform, but this is the best we can do.
           deps.update([x for x in os_deps.items() if not x[0] in deps])
         else:
           deps.update(os_deps)
 
     self.deps_hooks.extend(local_scope.get('hooks', []))
 
@@ skipping 186 matching lines @@
     except (gclient_utils.Error, subprocess2.CalledProcessError), e:
       # Use a discrete exit status code of 2 to indicate that a hook action
       # failed.  Users of this script may wish to treat hook action failures
       # differently from VC failures.
       print >> sys.stderr, 'Error: %s' % str(e)
       sys.exit(2)
 
   def subtree(self, include_all):
     """Breadth first"""
     result = []
-    for d in self.dependencies:
+    dependencies = self.dependencies
+    for d in dependencies:
       if d.should_process or include_all:
         result.append(d)
-    for d in self.dependencies:
+    for d in dependencies:
       result.extend(d.subtree(include_all))
     return result
 
   def get_custom_deps(self, name, url):
     """Returns a custom deps if applicable."""
     if self.parent:
       url = self.parent.get_custom_deps(name, url)
     # None is a valid return value to disable a dependency.
     return self.custom_deps.get(name, url)
 
   @property
   def recursion_limit(self):
-    """Returns > 0 if this dependency is not too recursed to be processed."""
+    """Returns > 0 if this dependency is not too recursed to be processed.
+
+    Immutable so no need to lock."""
     return max(self.parent.recursion_limit - 1, 0)
 
   @property
   def deps_file(self):
+    """Immutable so no need to lock."""
     return self._deps_file
 
   @property
+  def managed(self):
+    """Immutable so no need to lock."""
+    return self._managed
+
+  @property
   def safesync_url(self):
+    """Immutable so no need to lock."""
     return self._safesync_url
 
   @property
   def should_process(self):
     """True if this dependency should be processed, i.e. checked out."""
     return self._should_process
 
   @property
   def parent(self):
+    """Immutable so no need to lock."""
     return self._parent
 
   @property
+  def custom_vars(self):
+    """Immutable so no need to lock."""
+    return self._custom_vars.copy()
+
+  @property
+  def custom_deps(self):
+    """Immutable so no need to lock."""
+    return self._custom_deps.copy()
+
+  @property
+  @gclient_utils.lockedmethod
   def file_list(self):
     result = self._file_list[:]
     for d in self.dependencies:
       result.extend(d.file_list)
     return tuple(result)
 
   def __str__(self):
     out = []
     for i in ('name', 'url', 'parsed_url', 'safesync_url', 'custom_deps',
               'custom_vars', 'deps_hooks', 'file_list', 'should_process',
@@ skipping 89 matching lines @@
       enforced_os = options.deps_os.split(',')
     else:
       enforced_os = [self.DEPS_OS_CHOICES.get(sys.platform, 'unix')]
     if 'all' in enforced_os:
       enforced_os = self.DEPS_OS_CHOICES.itervalues()
     self._enforced_os = tuple(set(enforced_os))
     self._root_dir = root_dir
     self.config_content = None
 
   def SetConfig(self, content):
-    assert self.dependencies == []
+    assert not self.dependencies
     config_dict = {}
     self.config_content = content
     try:
       exec(content, config_dict)
     except SyntaxError, e:
       gclient_utils.SyntaxErrorToError('.gclient', e)
     for s in config_dict.get('solutions', []):
       try:
         tree = dict((d.name, d) for d in self.root.subtree(False))
         if s['name'] in tree:
@@ skipping 675 matching lines @@
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   fix_encoding.fix_encoding()
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: