Added python 2.4 support: Repo will now use the original GitCmdObjectDB in python 2.4, as the pure python implementation cannot work without memory maps

Byron · Byron · commit 08457a7a6b6a · 2010-07-09T12:18:38.000+02:00
diff --git a/lib/git/__init__.py b/lib/git/__init__.py
@@ -29,6 +29,7 @@ def _init_externals():
 from git.refs import *
 from git.diff import *
 from git.exc import *
+from git.db import *
 from git.cmd import Git
 from git.repo import Repo
 from git.remote import *
diff --git a/lib/git/db.py b/lib/git/db.py
@@ -34,13 +34,13 @@ def __init__(self, root_path, git):
 		self._git = git
 		
 	def info(self, sha):
-		t = self._git.get_object_header(bin_to_hex(sha))
-		return OInfo(*t)
+		hexsha, typename, size = self._git.get_object_header(bin_to_hex(sha))
+		return OInfo(hex_to_bin(hexsha), typename, size)
 		
 	def stream(self, sha):
 		"""For now, all lookup is done by git itself"""
-		t = self._git.stream_object_data(bin_to_hex(sha))
-		return OStream(*t)
+		hexsha, typename, size, stream = self._git.stream_object_data(bin_to_hex(sha))
+		return OStream(hex_to_bin(hexsha), typename, size, stream)
 	
 	
 	# { Interface
diff --git a/lib/git/ext/gitdb b/lib/git/ext/gitdb
@@ -1 +1 @@
-Subproject commit f534e6e9a24f2ac7e7e0f3679551b512d4af569a
+Subproject commit 18152febd428e67b86bb4fb68ec1691d4de75a9c
diff --git a/lib/git/repo/base.py b/lib/git/repo/base.py
@@ -34,6 +34,11 @@
 import sys
 import re
 
+DefaultDBType = GitDB
+if sys.version_info[1] < 5:		# python 2.4 compatiblity
+	DefaultDBType = GitCmdObjectDB
+# END handle python 2.4
+
 
 __all__ = ('Repo', )
 
@@ -66,7 +71,7 @@ class Repo(object):
 	# represents the configuration level of a configuration file
 	config_level = ("system", "global", "repository")
 
-	def __init__(self, path=None, odbt = GitDB):
+	def __init__(self, path=None, odbt = DefaultDBType):
 		"""Create a new Repo instance
 
 		:param path: is the path to either the root git directory or the bare git repo::
diff --git a/test/git/test_repo.py b/test/git/test_repo.py
@@ -545,3 +545,10 @@ def test_rev_parse(self):
 		
 		# cannot handle rev-log for now 
 		self.failUnlessRaises(ValueError, rev_parse, "hi@there")
+		
+	def test_repo_odbtype(self):
+		target_type = GitDB
+		if sys.version_info[1] < 5:
+			target_type = GitCmdObjectDB
+		assert isinstance(self.rorepo.odb, target_type)
+			
