index.add does not need the git clt anymore

Byron · Byron · commit 91725f0fc59a · 2010-06-21T16:09:45.000+02:00
diff --git a/lib/git/index/base.py b/lib/git/index/base.py
@@ -643,7 +643,6 @@ def _preprocess_add_items(self, items):
 		# END for each item
 		return (paths, entries)
 
-	@default_index
 	def add(self, items, force=True, fprogress=lambda *args: None, path_rewriter=None):
 		"""Add files from the working tree, specific blobs or BaseIndexEntries
 		to the index. The underlying index file will be written immediately, hence
@@ -734,7 +733,9 @@ def add(self, items, force=True, fprogress=lambda *args: None, path_rewriter=Non
 			for path in paths:
 				abspath = os.path.abspath(path)
 				gitrelative_path = abspath[len(self.repo.working_tree_dir)+1:]
-				blob = Blob(self.repo, Blob.NULL_HEX_SHA, os.stat(abspath).st_mode, gitrelative_path)
+				blob = Blob(self.repo, Blob.NULL_HEX_SHA, 
+							self._stat_mode_to_index_mode(os.stat(abspath).st_mode), 
+							gitrelative_path)
 				entries.append(BaseIndexEntry.from_blob(blob))
 			# END for each path
 			del(paths[:])
@@ -754,7 +755,8 @@ def store_path(filepath):
 			istream = self.repo.odb.store(IStream(Blob.type, st.st_size, stream))
 			fprogress(filepath, True, filepath)
 			
-			return BaseIndexEntry((st.st_mode, istream.sha, 0, filepath))
+			return BaseIndexEntry((self._stat_mode_to_index_mode(st.st_mode), 
+									istream.sha, 0, filepath))
 		# END utility method
 
 
@@ -799,36 +801,21 @@ def store_path(filepath):
 				# END for each entry
 			# END handle path rewriting
 
-			# feed pure entries to stdin
-			proc = self.repo.git.update_index(index_info=True, istream=subprocess.PIPE, as_process=True)
-			lem1 = len(entries)-1
+			# just go through the remaining entries and provide progress info
 			for i, entry in enumerate(entries):
 				progress_sent = i in null_entries_indices
 				if not progress_sent:
 					fprogress(entry.path, False, entry)
-
-				proc.stdin.write(str(entry))
-
-				# the last entry is not \n terminated, as it exepcts to read
-				# another entry then and would block. Hence we skip the last one
-				if i != lem1:
-					proc.stdin.write('\n')
-					proc.stdin.flush()
-				# END skip last newline
-
-				if not progress_sent:
 					fprogress(entry.path, True, entry)
+				# END handle progress
 			# END for each enty
-			self._flush_stdin_and_wait(proc, ignore_stdout=True)
 			entries_added.extend(entries)
 		# END if there are base entries
 
 		# FINALIZE
 		# add the new entries to this instance, and write it
 		for entry in entries_added:
 			self.entries[(entry.path, 0)] = IndexEntry.from_base(entry)
-
-		# finally write the changed index
 		self.write()
 		
 		return entries_added
diff --git a/lib/git/index/typ.py b/lib/git/index/typ.py
@@ -137,15 +137,13 @@ def size(self):
 		return self[10]
 		
 	@classmethod
-	def from_base(cls, base, actual_value=False):
+	def from_base(cls, base):
 		""" 
 		:return:
 			Minimal entry as created from the given BaseIndexEntry instance.
 			Missing values will be set to null-like values
 
-		:param base: Instance of type BaseIndexEntry
-		:param actual_value: if set, instead of writing 0 values for fields that 
-			don't exist in the BaseEntry, the actual values will be written in."""
+		:param base: Instance of type BaseIndexEntry"""
 		time = pack(">LL", 0, 0)
 		return IndexEntry((base.mode, base.sha, base.flags, base.path, time, time, 0, 0, 0, 0, 0))
 
