fixed issue in Ref.name implementation which would not handle components properly

Author: Byron

lib/git/base.py

@@ -222,9 +222,15 @@ def __hash__(self):
 	def name(self):
 		"""
 		Returns
-			Name of this reference
+			(shortest) Name of this reference - it may contain path components
 		"""
-		return os.path.basename(self.path)
+		# first two path tokens are can be removed as they are 
+		# refs/heads or refs/tags or refs/remotes
+		tokens = self.path.split('/')
+		if len(tokens) < 3:
+			return self.path	# could be refs/HEAD
+		
+		return '/'.join(tokens[2:])
 
 	@classmethod
 	def find_all(cls, repo, common_path = "refs", **kwargs):

lib/git/tree.py

@@ -47,11 +47,11 @@ def content_from_string(repo, text):
 			return None
 
 		if typ == "tree":
-			return Tree(repo, id=id, mode=mode, path=path)
+			return Tree(repo, id, mode, path)
 		elif typ == "blob":
-			return blob.Blob(repo, id=id, mode=mode, path=path)
+			return blob.Blob(repo, id, mode, path)
 		elif typ == "commit":
-			return None
+			return None 
 		else:
 		  raise(TypeError, "Invalid type: %s" % typ)
 

test/fixtures/for_each_ref_with_path_component

@@ -11,16 +11,11 @@ class TestHead(object):
 	def setup(self):
 		self.repo = Repo(GIT_REPO)
 
-	@patch_object(Git, '_call_process')
-	def test_repr(self, git):
-		git.return_value = fixture('for_each_ref')
-		
-		head = self.repo.heads[0]
-		
-		assert_equal('<git.Head "%s">' % head.name, repr(head))
-		
-		assert_true(git.called)
-		assert_equal(git.call_args, (('for_each_ref', 'refs/heads'), {'sort': 'committerdate', 'format': '%(refname)%00%(objectname)'}))
+	def test_base(self):
+		for head in self.repo.heads:
+			assert head.name
+			assert "refs/heads" in head.path
+		# END for each head
 
 	@patch_object(Git, '_call_process')
 	def test_ref_with_path_component(self, git):
@@ -29,4 +24,3 @@ def test_ref_with_path_component(self, git):
 
 		assert_equal('refactoring/feature1', head.name)
 		assert_true(git.called)
-		assert_equal(git.call_args, (('for_each_ref', 'refs/heads'), {'sort': 'committerdate', 'format': '%(refname)%00%(objectname)'}))

test/git/test_head.py

@@ -18,7 +18,7 @@ def test_tag_base(self):
 		tag_object_refs = list()
 		for tag in self.repo.tags:
 			assert "refs/tags" in tag.path
-			assert "/" not in tag.name
+			assert tag.name
 			assert isinstance( tag.commit, Commit )
 			if tag.tag is not None:
 				tag_object_refs.append( tag )

test/git/test_tag.py

@@ -23,11 +23,11 @@ def assert_not_instance_of(expected, actual, msg=None):
 
 def assert_none(actual, msg=None):
 	"""verify that item is None"""
-	assert_equal(None, actual, msg)
+	assert actual is None, msg
 
 def assert_not_none(actual, msg=None):
 	"""verify that item is None"""
-	assert_not_equal(None, actual, msg)
+	assert actual is not None, msg
 
 def assert_match(pattern, string, msg=None):
 	"""verify that the pattern matches the string"""