Move more immutable members to DependencySettings.

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 161 matching lines @@
         (self.FromImpl, self.FileImpl, None.__class__)):
       raise gclient_utils.Error(
           ('dependency url must be either a string, None, '
            'File() or From() instead of %s') % self._url.__class__.__name__)
     if '/' in self._deps_file or '\\' in self._deps_file:
       raise gclient_utils.Error('deps_file name must not be a path, just a '
                                 'filename. %s' % self._deps_file)
 
   @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 parent(self):
-    """Immutable so no need to lock."""
     return self._parent
 
   @property
+  def root(self):
+    """Returns the root node, a GClient object."""
+    if not self.parent:
+      # This line is to signal pylint that it could be a GClient instance.
+      return self or GClient(None, None)
+    return self.parent.root
+
+  @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 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
   def url(self):
     return self._url
 
+  @property
+  def recursion_limit(self):
+    """Returns > 0 if this dependency is not too recursed to be processed.
+
+    Immutable so no need to lock.

[Dirk Pranke, 2011/10/03 21:10:04]

Nit: if you're deleting the "immutable" comments from the other lines (which
makes sense), might as well delete it here, too.

[M-A Ruel, 2011/10/03 21:29:48]

Thanks, copy-paste fail.

+    """
+    return max(self.parent.recursion_limit - 1, 0)
+
+  def get_custom_deps(self, name, url):

[Dirk Pranke, 2011/10/03 21:10:04]

Should this be a property (i.e., @property def custom_deps) as well?

[M-A Ruel, 2011/10/03 21:29:48]

there's already a custom_deps property. This one is a function since it needs 2
args and it'd be wasteful to consrtuct a temporary dict with all the parent just
to do a lookup.

+    """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)
+
 
 class Dependency(gclient_utils.WorkItem, DependencySettings):
   """Object that represents a dependency checkout."""
 
   def __init__(self, parent, name, url, safesync_url, managed, custom_deps,
                custom_vars, deps_file, should_process):
     gclient_utils.WorkItem.__init__(self, name)
     DependencySettings.__init__(
         self, parent, url, safesync_url, managed, custom_deps, custom_vars,
         deps_file, should_process)
@@ skipping 383 matching lines @@
         yield i
 
   def depth_first_tree(self):
     """Depth-first recursion including the root node."""
     yield self
     for i in self.dependencies:
       for j in i.depth_first_tree():
         if j.should_process:
           yield j
 
-  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.
-
-    Immutable so no need to lock.
-    """
-    return max(self.parent.recursion_limit - 1, 0)
-
   @property
   def dependencies(self):
     return tuple(self._dependencies)
 
   @property
   def deps_hooks(self):
     return tuple(self._deps_hooks)
 
   @property
   def parsed_url(self):
@@ skipping 41 matching lines @@
 
   def hierarchy(self):
     """Returns a human-readable hierarchical reference to a Dependency."""
     out = '%s(%s)' % (self.name, self.url)
     i = self.parent
     while i and i.name:
       out = '%s(%s) -> %s' % (i.name, i.url, out)
       i = i.parent
     return out
 
-  @property
-  def root(self):
-    """Returns the root node, a GClient object."""
-    if not self.parent:
-      # This line is to signal pylint that it could be a GClient instance.
-      return self or GClient(None, None)
-    return self.parent.root
-
 
 class GClient(Dependency):
   """Object that represent a gclient checkout. A tree of Dependency(), one per
   solution or DEPS entry."""
 
   DEPS_OS_CHOICES = {
     "win32": "win",
     "win": "win",
     "cygwin": "win",
     "darwin": "mac",
@@ skipping 744 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: