Merge branch 'structure'

Author: Byron

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "async"]
-	path = ext/async
-	url = git://github.com/Byron/async.git
+	path = gitdb/ext/async
+	url = git://github.com/gitpython-developers/async.git

MANIFEST.in

@@ -4,11 +4,11 @@ include CHANGES
 include AUTHORS
 include README
 
-include _fun.c
-include _delta_apply.c
-include _delta_apply.h
+include gitdb/_fun.c
+include gitdb/_delta_apply.c
+include gitdb/_delta_apply.h
 
-graft test
+prune gitdb/test
 
 global-exclude .git*
 global-exclude *.pyc

README renamed to README.rst

@@ -16,7 +16,7 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.append(os.path.abspath('../../../'))
+sys.path.append(os.path.abspath('../../'))
 
 # -- General configuration -----------------------------------------------------
 

doc/source/conf.py

@@ -6,7 +6,13 @@
 #{ Initialization
 def _init_externals():
 	"""Initialize external projects by putting them into the path"""
-	sys.path.append(os.path.join(os.path.dirname(__file__), 'ext'))
+	sys.path.append(os.path.join(os.path.dirname(__file__), 'ext', 'async'))
+	
+	try:
+		import async
+	except ImportError:
+		raise ImportError("'async' could not be imported, assure it is located in your PYTHONPATH")
+	#END verify import
 
 #} END initialization
 

doc/source/intro.rst

@@ -44,8 +44,7 @@
 
 __all__ = ('is_loose_object', 'loose_object_header_info', 'msb_size', 'pack_object_header_info', 
 			'write_object', 'loose_object_header', 'stream_copy', 'apply_delta_data', 
-			'is_equal_canonical_sha', 'reverse_connect_deltas',
-			'connect_deltas', 'DeltaChunkList')
+			'is_equal_canonical_sha', 'connect_deltas', 'DeltaChunkList')
 
 
 #{ Structures
@@ -492,8 +491,10 @@ def stream_copy(read, write, size, chunk_size):
 	return dbw
 
 def connect_deltas(dstreams):
-	"""Read the condensed delta chunk information from dstream and merge its information
-	into a list of existing delta chunks
+	"""
+	Read the condensed delta chunk information from dstream and merge its information
+		into a list of existing delta chunks
+	
 	:param dstreams: iterable of delta stream objects, the delta to be applied last
 		comes first, then all its ancestors in order
 	:return: DeltaChunkList, containing all operations to apply"""

doc/source/tutorial.rst

@@ -651,7 +651,7 @@ def is_valid_stream(self, sha, use_crc=False):
 		
 		:param use_crc: if True, the index' crc for the sha is used to determine
 		:param sha: 20 byte sha1 of the object whose stream to verify
-		whether the compressed stream of the object is valid. If it is 
+			whether the compressed stream of the object is valid. If it is 
 			a delta, this only verifies that the delta's data is valid, not the 
 			data of the actual undeltified object, as it depends on more than 
 			just this stream.

ext/async

@@ -7,7 +7,7 @@
 class TestGitDB(TestDBBase):
 
 	def test_reading(self):
-		gdb = GitDB(fixture_path('../../.git/objects'))
+		gdb = GitDB(fixture_path('../../../.git/objects'))
 
 		# we have packs and loose objects, alternates doesn't necessarily exist
 		assert 1 < len(gdb.databases()) < 4

__init__.py renamed to gitdb/__init__.py

@@ -15,8 +15,7 @@ def test_writing(self, path):
 		pdb = PackedDB(path)
 
 		# on demand, we init our pack cache
-		num_packs = 2
-		assert len(pdb.entities()) == num_packs
+		num_packs = len(pdb.entities())
 		assert pdb._st_mtime != 0
 
 		# test pack directory changed: 

_delta_apply.c renamed to gitdb/_delta_apply.c

@@ -34,7 +34,7 @@ def test_writing(self, path):
 
 		# setup alternate file
 		# add two, one is invalid
-		own_repo_path = fixture_path('../../.git/objects')		# use own repo
+		own_repo_path = fixture_path('../../../.git/objects')		# use own repo
 		self.make_alt_file(alt_path, [own_repo_path, "invalid/path"])
 		rdb.update_cache()
 		assert len(rdb.databases()) == 1

_delta_apply.h renamed to gitdb/_delta_apply.h

@@ -11,7 +11,7 @@
 class TestExamples(TestBase):
 
 	def test_base(self):
-		ldb = LooseObjectDB(fixture_path("../../.git/objects"))
+		ldb = LooseObjectDB(fixture_path("../../../.git/objects"))
 
 		for sha1 in ldb.sha_iter():
 			oinfo = ldb.info(sha1)

_fun.c renamed to gitdb/_fun.c

@@ -75,10 +75,9 @@ def get_data_files(self):
       author_email = "byronimo@gmail.com",
       url = "http://gitorious.org/git-python/gitdb",
       packages = ('gitdb', 'gitdb.db', 'gitdb.test', 'gitdb.test.db', 'gitdb.test.performance'),
-      package_data={'gitdb' : ['AUTHORS', 'README'], 
-					  'gitdb.test' : ['fixtures/packs/*', 'fixtures/objects/7b/*']},
-      package_dir = {'gitdb':''},
-      ext_modules=[Extension('gitdb._perf', ['_fun.c', '_delta_apply.c'], include_dirs=['.'])],
+      package_data={ 'gitdb.test' : ['fixtures/packs/*', 'fixtures/objects/7b/*']},
+      package_dir = {'gitdb':'gitdb'},
+      ext_modules=[Extension('gitdb._perf', ['gitdb/_fun.c', 'gitdb/_delta_apply.c'], include_dirs=['gitdb'])],
       license = "BSD License",
       zip_safe=False,
       requires=('async (>=0.6.1)',),