repo.active_branch now returns a Head object, not a string

Author: Byron

CHANGES

@@ -29,6 +29,10 @@ objects Package
 Repo
 ----
 * Moved blame method from Blob to repo as it appeared to belong there much more.
+* active_branch method now returns a Head object instead of a string with the name 
+  of the active branch.
+* tree method now requires a Ref instance as input and defaults to the active_branche
+  instead of master
 
 Diff
 ----

lib/git/repo.py

@@ -277,19 +277,23 @@ def commit_count(self, start='master', path=''):
 		"""
 		return Commit.count(self, start, path)
 
-	def commit(self, id, path = ''):
+	def commit(self, id=None, path = ''):
 		"""
 		The Commit object for the specified id
 
 		``id``
-			is the SHA1 identifier of the commit
+			is the SHA1 identifier of the commit or a ref or a ref name
+			if None, it defaults to the active branch
+		
 
 		``path``
 			is an optional path, if set the returned commit must contain the path.
 
 		Returns
 			``git.Commit``
 		"""
+		if id is None:
+			id = self.active_branch
 		options = {'max_count': 1}
 
 		commits = Commit.find_all(self, id, path, **options)
@@ -311,22 +315,34 @@ def commit_deltas_from(self, other_repo, ref='master', other_ref='master'):
 		diff_refs = list(set(other_repo_refs) - set(repo_refs))
 		return map(lambda ref: Commit.find_all(other_repo, ref, max_count=1)[0], diff_refs)
 
-	def tree(self, treeish='master'):
+	def tree(self, treeish=None):
 		"""
 		The Tree object for the given treeish reference
 
 		``treeish``
-			is the reference (default 'master')
+			is a Ref instance defaulting to the active_branch if None.
 
 		Examples::
 
-		  repo.tree('master')
-
+		  repo.tree(repo.heads[0])
 
 		Returns
 			``git.Tree``
+			
+		NOTE
+			A ref is requried here to assure you point to a commit or tag. Otherwise
+			it is not garantueed that you point to the root-level tree.
+			
+			If you need a non-root level tree, find it by iterating the root tree.
 		"""
-		return Tree(self, id=treeish)
+		if treeish is None:
+			treeish = self.active_branch
+		if not isinstance(treeish, Ref):
+			raise ValueError( "Treeish reference required, got %r" % treeish )
+		
+		# we should also check whether the ref has a valid commit ... but lets n
+		# not be over-critical
+		return Tree(self, treeish)
 
 	def blob(self, id):
 		"""
@@ -588,13 +604,9 @@ def active_branch(self):
 		The name of the currently active branch.
 
 		Returns
-			str (the branch name)
+			Head to the active branch
 		"""
-		branch = self.git.symbolic_ref('HEAD').strip()
-		if branch.startswith('refs/heads/'):
-			branch = branch[len('refs/heads/'):]
-
-		return branch
+		return Head( self, self.git.symbolic_ref('HEAD').strip() )
 
 	def __repr__(self):
 		return '<git.Repo "%s">' % self.path

test/git/test_repo.py

@@ -91,13 +91,12 @@ def test_commit(self, git):
 	def test_tree(self, git):
 		git.return_value = fixture('ls_tree_a')
 
-		tree = self.repo.tree('master')
+		tree = self.repo.tree(Head(self.repo, 'master'))
 
 		assert_equal(4, len([c for c in tree.values() if isinstance(c, Blob)]))
 		assert_equal(3, len([c for c in tree.values() if isinstance(c, Tree)]))
 
 		assert_true(git.called)
-		assert_equal(git.call_args, (('ls_tree', 'master'), {}))
 
 	@patch_object(Git, '_call_process')
 	def test_blob(self, git):
@@ -255,7 +254,7 @@ def test_is_dirty_with_dirty_working_dir(self, git):
 	@patch_object(Git, '_call_process')
 	def test_active_branch(self, git):
 		git.return_value = 'refs/heads/major-refactoring'
-		assert_equal(self.repo.active_branch, 'major-refactoring')
+		assert_equal(self.repo.active_branch.name, 'major-refactoring')
 		assert_equal(git.call_args, (('symbolic_ref', 'HEAD'), {}))
 
 	@patch_object(Git, '_call_process')