Moved partial_to_complete_sha_hex from gitdb to compounddb, its fitting there better

Author: Byron

db/base.py

@@ -2,10 +2,14 @@
 from gitdb.util import (
 		pool,
 		join, 
-		LazyMixin 
+		LazyMixin, 
+		hex_to_bin
 	)
 
-from gitdb.exc import BadObject
+from gitdb.exc import (
+						BadObject, 
+						AmbiguousObjectName
+						)
 
 from async import (
 		ChannelThreadTask
@@ -186,6 +190,22 @@ def update_cache(self, force=False):
 	# END interface
 
 
+
+
+def _databases_recursive(database, output):
+	"""Fill output list with database from db, in order. Deals with Loose, Packed 
+	and compound databases."""
+	if isinstance(database, CompoundDB):
+		compounds = list()
+		dbs = database.databases()
+		output.extend(db for db in dbs if not isinstance(db, CompoundDB))
+		for cdb in (db for db in dbs if isinstance(db, CompoundDB)):
+			_databases_recursive(cdb, output)
+	else:
+		output.append(database)
+	# END handle database type
+	
+
 class CompoundDB(ObjectDBR, LazyMixin, CachingDB):
 	"""A database which delegates calls to sub-databases.
 	
@@ -258,6 +278,43 @@ def update_cache(self, force=False):
 			# END if is caching db
 		# END for each database to update
 		return stat
+		
+	def partial_to_complete_sha_hex(self, partial_hexsha):
+		"""
+		:return: 20 byte binary sha1 from the given less-than-40 byte hexsha
+		:param partial_hexsha: hexsha with less than 40 byte
+		:raise AmbiguousObjectName: """
+		databases = list()
+		_databases_recursive(self, databases)
+		
+		if len(partial_hexsha) % 2 != 0:
+			partial_binsha = hex_to_bin(partial_hexsha + "0")
+		else:
+			partial_binsha = hex_to_bin(partial_hexsha)
+		# END assure successful binary conversion 
+		
+		candidate = None
+		for db in databases:
+			full_bin_sha = None
+			try:
+				if hasattr(db, 'partial_to_complete_sha_hex'):
+					full_bin_sha = db.partial_to_complete_sha_hex(partial_hexsha)
+				else:
+					full_bin_sha = db.partial_to_complete_sha(partial_binsha)
+				# END handle database type
+			except BadObject:
+				continue
+			# END ignore bad objects
+			if full_bin_sha:
+				if candidate and candidate != full_bin_sha:
+					raise AmbiguousObjectName(partial_hexsha)
+				candidate = full_bin_sha
+			# END handle candidate
+		# END for each db
+		if not candidate:
+			raise BadObject(partial_binsha)
+		return candidate
+		
 	#} END interface
 
 

db/git.py

@@ -16,26 +16,9 @@
 						)
 import os
 
-from gitdb.util import hex_to_bin
-
 __all__ = ('GitDB', )
 
 
-def _databases_recursive(database, output):
-	"""Fill output list with database from db, in order. Deals with Loose, Packed 
-	and compound databases."""
-	if isinstance(database, CompoundDB):
-		compounds = list()
-		dbs = database.databases()
-		output.extend(db for db in dbs if not isinstance(db, CompoundDB))
-		for cdb in (db for db in dbs if isinstance(db, CompoundDB)):
-			_databases_recursive(cdb, output)
-	else:
-		output.append(database)
-	# END handle database type
-	
-
-
 class GitDB(FileDBBase, ObjectDBW, CompoundDB):
 	"""A git-style object database, which contains all objects in the 'objects'
 	subdirectory"""
@@ -96,42 +79,3 @@ def set_ostream(self, ostream):
 
 	#} END objectdbw interface
 
-	#{ Interface 
-	
-	def partial_to_complete_sha_hex(self, partial_hexsha):
-		"""
-		:return: 20 byte binary sha1 from the given less-than-40 byte hexsha
-		:param partial_hexsha: hexsha with less than 40 byte
-		:raise AmbiguousObjectName: """
-		databases = list()
-		_databases_recursive(self, databases)
-		
-		if len(partial_hexsha) % 2 != 0:
-			partial_binsha = hex_to_bin(partial_hexsha + "0")
-		else:
-			partial_binsha = hex_to_bin(partial_hexsha)
-		# END assure successful binary conversion 
-		
-		candidate = None
-		for db in databases:
-			full_bin_sha = None
-			try:
-				if isinstance(db, LooseObjectDB):
-					full_bin_sha = db.partial_to_complete_sha_hex(partial_hexsha)
-				else:
-					full_bin_sha = db.partial_to_complete_sha(partial_binsha)
-				# END handle database type
-			except BadObject:
-				continue
-			# END ignore bad objects
-			if full_bin_sha:
-				if candidate and candidate != full_bin_sha:
-					raise AmbiguousObjectName(partial_hexsha)
-				candidate = full_bin_sha
-			# END handle candidate
-		# END for each db
-		if not candidate:
-			raise BadObject(partial_binsha)
-		return candidate
-		
-	#} END interface 

test/db/test_git.py

@@ -20,9 +20,16 @@ def test_reading(self):
 		sha_list = list(gdb.sha_iter())
 		assert len(sha_list) == gdb.size()
 
+		
+		# This is actually a test for compound functionality, but it doesn't 
+		# have a separate test module
 		# test partial shas
-		for binsha in sha_list:
-			assert gdb.partial_to_complete_sha_hex(bin_to_hex(binsha)[:8]) == binsha
+		# this one as uneven and quite short
+		assert gdb.partial_to_complete_sha_hex('155b6') == hex_to_bin("155b62a9af0aa7677078331e111d0f7aa6eb4afc")
+		
+		# mix even/uneven hexshas
+		for i, binsha in enumerate(sha_list):
+			assert gdb.partial_to_complete_sha_hex(bin_to_hex(binsha)[:8-(i%2)]) == binsha
 		# END for each sha
 
 		self.failUnlessRaises(BadObject, gdb.partial_to_complete_sha_hex, "0000")