Merge branch 'hierarchyfix' into improvements

* hierarchyfix:
  Added remaining tests for new base classes and removed some methods whose existance was doubtful or unsafe
  Fixed remaining tests to deal with the changes
  commit: fixed failing commit tests as the mocked git command would always return the same thing which does not work anymore - re-implemented it in a more dynamic manner, but in the end tests will have to be revised anyway
  mode-only change for test system - this should be in a separate repository in fact so that changes are a little more self-contained and not depending on the actual source repository
  fixed issue in Ref.name implementation which would not handle components properly
  lazymixin system now supports per-attribute baking, it is up to the class whether it bakes more. This also leads to more efficient use of memory as values are only cached and set when required - the baking system does not require an own tracking variable anymore, and values are only to be cached once - then python will natively find the cache without involving any additional overhead. This works by using __getattr__ instead of __get_attribute__ which would always be called
  put Tree and Blob onto a new base class suitable to deal with IndexObjects
  blob tests fixed to deal with changes to the Blob type
  converted all spaces to tabs ( 4 spaces = 1 tab ) just to allow me and my editor to work with the files properly. Can convert it back for releaes
  Re-designed the tag testing - it does not use fixtures anymore but dyamically checks the existance of tags within the repository - it basically tests the interface and checks that expected return types are actually returned
  Intermediate commit: commit,tree and blob objects now derive from object - test is in place which still fails on purpose. Need to integrate tags which can be objects or just a special form of a ref
  Renamed lazy.py to base.py to have a file for base classes - lazy not yet changed to allow proper rename tracking

1 files changed, 94 insertions, 100 deletions

diff --git a/lib/git/tree.py b/lib/git/tree.py
index 1b546f85..597668ae 100644
--- a/lib/git/tree.py
+++ b/lib/git/tree.py
@@ -5,104 +5,98 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
 import os
-from lazy import LazyMixin
 import blob
-
-class Tree(LazyMixin):
-    def __init__(self, repo, id, mode=None, path=None):
-        LazyMixin.__init__(self)
-        self.repo = repo
-        self.id = id
-        self.mode = mode
-        self.path = path
-        self._contents = None
-
-    def __bake__(self):
-        # Ensure the treeish references directly a tree
-        treeish = self.id
-        if not treeish.endswith(':'):
-            treeish = treeish + ':'
-
-        # Read the tree contents.
-        self._contents = {}
-        for line in self.repo.git.ls_tree(self.id).splitlines():
-            obj = self.content_from_string(self.repo, line)
-            if obj is not None:
-                self._contents[obj.path] = obj
-
-    @staticmethod
-    def content_from_string(repo, text):
-        """
-        Parse a content item and create the appropriate object
-
-        ``repo``
-            is the Repo
-
-         ``text``
-            is the single line containing the items data in `git ls-tree` format
-
-        Returns
-            ``git.Blob`` or ``git.Tree``
-        """
-        try:
-            mode, typ, id, path = text.expandtabs(1).split(" ", 3)
-        except:
-            return None
-
-        if typ == "tree":
-            return Tree(repo, id=id, mode=mode, path=path)
-        elif typ == "blob":
-            return blob.Blob(repo, id=id, mode=mode, path=path)
-        elif typ == "commit":
-            return None
-        else:
-          raise(TypeError, "Invalid type: %s" % typ)
-
-    def __div__(self, file):
-        """
-        Find the named object in this tree's contents
-
-        Examples::
-
-            >>> Repo('/path/to/python-git').tree/'lib'
-            <git.Tree "6cc23ee138be09ff8c28b07162720018b244e95e">
-            >>> Repo('/path/to/python-git').tree/'README.txt'
-            <git.Blob "8b1e02c0fb554eed2ce2ef737a68bb369d7527df">
-
-        Returns
-            ``git.Blob`` or ``git.Tree`` or ``None`` if not found
-        """
-        return self.get(file)
-
-    @property
-    def basename(self):
-        os.path.basename(self.path)
-
-    def __repr__(self):
-        return '<git.Tree "%s">' % self.id
-
-    # Implement the basics of the dict protocol:
-    # directories/trees can be seen as object dicts.
-    def __getitem__(self, key):
-        return self._contents[key]
-
-    def __iter__(self):
-        return iter(self._contents)
-
-    def __len__(self):
-        return len(self._contents)
-
-    def __contains__(self, key):
-        return key in self._contents
-
-    def get(self, key):
-        return self._contents.get(key)
-
-    def items(self):
-        return self._contents.items()
-
-    def keys(self):
-        return self._contents.keys()
-
-    def values(self):
-        return self._contents.values()
+import base
+
+class Tree(base.IndexObject):
+	
+	type = "tree"
+	__slots__ = "_contents"
+	
+	def __init__(self, repo, id, mode=None, path=None):
+		super(Tree, self).__init__(repo, id, mode, path)
+
+	def _set_cache_(self, attr):
+		if attr == "_contents":
+			# Read the tree contents.
+			self._contents = {}
+			for line in self.repo.git.ls_tree(self.id).splitlines():
+				obj = self.content_from_string(self.repo, line)
+				if obj is not None:
+					self._contents[obj.path] = obj
+		else:
+			super(Tree, self)._set_cache_(attr)
+
+	@staticmethod
+	def content_from_string(repo, text):
+		"""
+		Parse a content item and create the appropriate object
+
+		``repo``
+			is the Repo
+
+		 ``text``
+			is the single line containing the items data in `git ls-tree` format
+
+		Returns
+			``git.Blob`` or ``git.Tree``
+		"""
+		try:
+			mode, typ, id, path = text.expandtabs(1).split(" ", 3)
+		except:
+			return None
+
+		if typ == "tree":
+			return Tree(repo, id, mode, path)
+		elif typ == "blob":
+			return blob.Blob(repo, id, mode, path)
+		elif typ == "commit":
+			return None 
+		else:
+		  raise(TypeError, "Invalid type: %s" % typ)
+
+	def __div__(self, file):
+		"""
+		Find the named object in this tree's contents
+
+		Examples::
+
+			>>> Repo('/path/to/python-git').tree/'lib'
+			<git.Tree "6cc23ee138be09ff8c28b07162720018b244e95e">
+			>>> Repo('/path/to/python-git').tree/'README.txt'
+			<git.Blob "8b1e02c0fb554eed2ce2ef737a68bb369d7527df">
+
+		Returns
+			``git.Blob`` or ``git.Tree`` or ``None`` if not found
+		"""
+		return self.get(file)
+
+
+	def __repr__(self):
+		return '<git.Tree "%s">' % self.id
+
+	# Implement the basics of the dict protocol:
+	# directories/trees can be seen as object dicts.
+	def __getitem__(self, key):
+		return self._contents[key]
+
+	def __iter__(self):
+		return iter(self._contents)
+
+	def __len__(self):
+		return len(self._contents)
+
+	def __contains__(self, key):
+		return key in self._contents
+
+	def get(self, key):
+		return self._contents.get(key)
+
+	def items(self):
+		return self._contents.items()
+
+	def keys(self):
+		return self._contents.keys()
+
+	def values(self):
+		return self._contents.values()