SymbolicReference.delete: Now takes SymbolicReference instances as well, not only paths

diff.__str__: fixed incorrect message generation error

Author: Byron

lib/git/diff.py

@@ -248,7 +248,7 @@ def __str__(self):
 		h = "%s"
 		if self.a_blob:
 			h %= self.a_blob.path
-		if self.b_blob:                    
+		elif self.b_blob:          
 			h %= self.b_blob.path
 
 		msg = ''

lib/git/refs.py

@@ -236,6 +236,8 @@ def from_path(cls, repo, path):
 
 	@classmethod
 	def _to_full_path(cls, repo, path):
+		if isinstance(path, SymbolicReference):
+			path = path.path
 		full_ref_path = path
 		if not cls._common_path_default:
 			return full_ref_path
@@ -253,6 +255,7 @@ def delete(cls, repo, path):
 		``path``
 			Short or full path pointing to the reference, i.e. refs/myreference
 			or just "myreference", hence 'refs/' is implied.
+			Alternatively the symbolic reference to be deleted
 		"""
 		full_ref_path = cls._to_full_path(repo, path)
 		abs_path = os.path.join(repo.path, full_ref_path)

test/git/test_refs.py

@@ -233,6 +233,7 @@ def test_head_reset(self, rw_repo):
 		far_away_head = rw_repo.create_head("far_head",'HEAD~100')
 		self.failUnlessRaises(GitCommandError, far_away_head.checkout)
 		assert active_branch == active_branch.checkout(force=True)
+		assert rw_repo.head.reference != far_away_head
 
 		# test reference creation
 		partial_ref = 'sub/ref'
@@ -261,8 +262,8 @@ def test_head_reset(self, rw_repo):
 		assert symref.reference == cur_head.reference
 
 		self.failUnlessRaises(OSError, SymbolicReference.create, rw_repo, symref_path, cur_head.reference)
-		SymbolicReference.delete(rw_repo, symref_path)
-		# would raise if the symref wouldn't have been deleted
+		SymbolicReference.delete(rw_repo, symref)
+		# would raise if the symref wouldn't have been deletedpbl
 		symref = SymbolicReference.create(rw_repo, symref_path, cur_head.reference)
 
 		# test symbolic references which are not at default locations like HEAD