Added stub for pack writing implementation which should work for pack streaming over a transport as well

Author: Byron

gitdb/fun.py

@@ -411,15 +411,7 @@ def pack_object_header_info(data):
 		size += (c & 0x7f) << s
 		s += 7
 	# END character loop
-	
-	try:
-		return (type_id, size, i)
-	except KeyError:
-		# invalid object type - we could try to be smart now and decode part 
-		# of the stream to get the info, problem is that we had trouble finding 
-		# the exact start of the content stream
-		raise BadObjectType(type_id)
-	# END handle exceptions
+	return (type_id, size, i)
 
 def msb_size(data, offset=0):
 	"""

gitdb/pack.py

@@ -98,8 +98,7 @@ def pack_object_at(data, offset, as_stream):
 	# REF DELTA
 	elif type_id == REF_DELTA:
 		total_rela_offset = data_rela_offset+20
-		ref_sha = data[data_rela_offset:total_rela_offset]
-		delta_info = ref_sha
+		delta_info = data[data_rela_offset:total_rela_offset]
 	# BASE OBJECT
 	else:
 		# assume its a base object
@@ -561,11 +560,10 @@ def _sha_to_index(self, sha):
 
 	def _iter_objects(self, as_stream):
 		"""Iterate over all objects in our index and yield their OInfo or OStream instences"""
-		indexfile = self._index
+		_sha = self._index.sha
 		_object = self._object
-		for index in xrange(indexfile.size()):
-			sha = indexfile.sha(index)
-			yield _object(sha, as_stream, index)
+		for index in xrange(self._index.size()):
+			yield _object(_sha(index), as_stream, index)
 		# END for each index
 
 	def _object(self, sha, as_stream, index=-1):
@@ -760,5 +758,20 @@ def collect_streams(self, sha):
 		return self.collect_streams_at_offset(self._index.offset(self._sha_to_index(sha)))
 
 
+	@classmethod
+	def create(cls, object_iter, pack_write, index_write=None):
+		"""
+		Create a new pack by putting all objects obtained by the object_iterator
+		into a pack which is written using the pack_write method.
+		The respective index is produced as well if index_write is not Non.
+		
+		:param object_iter: iterator yielding odb output objects
+		:param pack_write: function to receive strings to write into the pack stream
+		:param indx_write: if not None, the function writes the index file corresponding
+			to the pack.
+		:note: The destination of the write functions is up to the user. It could
+			be a socket, or a file for instance"""
+		
+		
 
 	#} END interface

gitdb/test/test_pack.py

@@ -25,8 +25,12 @@
 from gitdb.fun import delta_types
 from gitdb.exc import UnsupportedOperation
 from gitdb.util import to_bin_sha
-from itertools import izip
+from itertools import izip, chain
+from nose import SkipTest
+
 import os
+import sys
+import tempfile
 
 
 #{ Utilities
@@ -134,7 +138,9 @@ def test_pack(self):
 			self._assert_pack_file(pack, version, size)
 		# END for each pack to test
 
-	def test_pack_entity(self):
+	@with_rw_directory
+	def test_pack_entity(self, rw_dir):
+		pack_iterators = list();
 		for packinfo, indexinfo in (	(self.packfile_v2_1, self.packindexfile_v1), 
 										(self.packfile_v2_2, self.packindexfile_v2),
 										(self.packfile_v2_3_ascii, self.packindexfile_v2_3_ascii)):
@@ -143,6 +149,7 @@ def test_pack_entity(self):
 			entity = PackEntity(packfile)
 			assert entity.pack().path() == packfile
 			assert entity.index().path() == indexfile
+			pack_iterators.append(entity.stream_iter())
 
 			count = 0
 			for info, stream in izip(entity.info_iter(), entity.stream_iter()):
@@ -174,9 +181,28 @@ def test_pack_entity(self):
 			# END for each info, stream tuple
 			assert count == size
 
-		 # END for each entity
+		# END for each entity
+		 
+		# pack writing - write all packs into one
+		# index path can be None
+		pack_path = tempfile.mktemp('', "pack", rw_dir)
+		index_path = tempfile.mktemp('', 'index', rw_dir)
+		for pp, ip in ((pack_path, )*2, (index_path, None)):
+			pfile = open(pp, 'wb')
+			ifile = None
+			if ip:
+				ifile = open(ip, 'wb')
+			#END handle ip
+			
+			PackEntity.create(chain(*pack_iterators), pfile, ifile)
+			assert os.path.getsize(pp) > 100
+			if ip is not None:
+				assert os.path.getsize(ip) > 100
+			#END verify files exist
+		#END for each packpath, indexpath pair 
+		 
 
 	def test_pack_64(self):
 		# TODO: hex-edit a pack helping us to verify that we can handle 64 byte offsets
 		# of course without really needing such a huge pack 
-		pass
+		raise SkipTest()