Fixed import of gitdb, keeping changed gitdb commit so that the submodule tests may work.

Byron · Byron · commit 468cad66ff1f · 2010-12-01T00:12:46.000+01:00
Switched gitdb submodule to new github url
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "gitdb"]
 	path = git/ext/gitdb
-	url = git://github.com/Byron/gitdb.git
+	url = git://github.com/gitpython-developers/gitdb.git
diff --git a/git/__init__.py b/git/__init__.py
@@ -14,7 +14,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', 'gitdb'))
+	
+	try:
+		import gitdb
+	except ImportError:
+		raise ImportError("'gitdb' could not be found in your PYTHONPATH")
+	#END verify import
 	
 #} END initialization
 
diff --git a/git/ext/gitdb b/git/ext/gitdb
@@ -1 +1 @@
-Subproject commit 9f977b8baaf9cbe9b38f3bdf4887cef5370b2229
+Subproject commit 4b1831f66fd3fe319bf537381c8b64de4a1461fc
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
@@ -20,7 +20,7 @@ def update(self, op, index, max_count, message=''):
 
 class TestSubmodule(TestBase):
 
-	k_subm_current = "cb68eef0865df6aedbc11cd81888625a70da6777"
+	k_subm_current = "e1e3017788213720afcfae0accddb2a6f2d9f052"
 	k_subm_changed = "394ed7006ee5dc8bddfd132b64001d5dfc0ffdd3"
 	k_no_subm_tag = "0.1.6"
 	
@@ -42,7 +42,7 @@ def _do_base_tests(self, rwrepo):
 		
 		assert sm.path == 'git/ext/gitdb'
 		assert sm.path != sm.name					# in our case, we have ids there, which don't equal the path
-		assert sm.url == 'git://gitorious.org/git-python/gitdb.git'
+		assert sm.url == 'git://github.com/gitpython-developers/gitdb.git'
 		assert sm.branch_path == 'refs/heads/master'			# the default ...
 		assert sm.branch_name == 'master'
 		assert sm.parent_commit == rwrepo.head.commit
