ARGH: wb and rb is not the same as r and w on windows, hence reading of binary files went crazy as well as binary writing

1 files changed, 12 insertions, 6 deletions

diff --git a/lib/git/index.py b/lib/git/index.py
index 747ccc88..45bf617f 100644
--- a/lib/git/index.py
+++ b/lib/git/index.py
@@ -36,7 +36,7 @@ class _TemporaryFileSwap(object):
 		
 	def __del__(self):
 		if os.path.isfile(self.tmp_file_path):
-			if sys.platform == "win32" and os.path.exists(self.file_path):
+			if os.name == 'nt' and os.path.exists(self.file_path):
 				os.remove(self.file_path)
 			os.rename(self.tmp_file_path, self.file_path)
 		# END temp file exists
@@ -243,9 +243,10 @@ class IndexFile(LazyMixin, diff.Diffable):
 		if attr == "entries":
 			# read the current index
 			# try memory map for speed
-			fp = open(self._file_path, "r")
+			fp = open(self._file_path, "rb")
 			stream = fp
 			try:
+				raise Exception()
 				stream = mmap.mmap(fp.fileno(), 0, access=mmap.ACCESS_READ)
 			except Exception:
 				pass
@@ -254,7 +255,12 @@ class IndexFile(LazyMixin, diff.Diffable):
 			try:
 				self._read_from_stream(stream)
 			finally:
-				fp.close()
+				pass
+				# make sure we close the stream ( possibly an mmap )
+				# and the file
+				#stream.close()
+				#if stream is not fp:
+				#	fp.close()
 			# END read from default index on demand
 		else:
 			super(IndexFile, self)._set_cache_(attr)
@@ -603,7 +609,7 @@ class IndexFile(LazyMixin, diff.Diffable):
 		"""
 		if not os.path.isabs(path):
 			return path
-		relative_path = path.replace(self.repo.git.git_dir+"/", "")
+		relative_path = path.replace(self.repo.git.git_dir+os.sep, "")
 		if relative_path == path:
 			raise ValueError("Absolute path %r is not in git repository at %r" % (path,self.repo.git.git_dir))
 		return relative_path
@@ -839,10 +845,10 @@ class IndexFile(LazyMixin, diff.Diffable):
 		
 		# create message stream
 		tmp_file_path = tempfile.mktemp()
-		fp = open(tmp_file_path,"w")
+		fp = open(tmp_file_path,"wb")
 		fp.write(str(message))
 		fp.close()
-		fp = open(tmp_file_path,"r")
+		fp = open(tmp_file_path,"rb")
 		fp.seek(0)
 		
 		try: