Index._iter_expand_paths: fixed tiny error with large impact, there was code using a / in a hardcoded fashion, leading to absolute paths where the caller expected relative ones

Byron · Byron · commit 694265664422 · 2010-07-15T17:19:22.000+02:00
diff --git a/lib/git/ext/gitdb b/lib/git/ext/gitdb
@@ -1 +1 @@
-Subproject commit 425ecf04aa5038c3d46b01ca20de17c51ef6c4e5
+Subproject commit 18152febd428e67b86bb4fb68ec1691d4de75a9c
diff --git a/lib/git/index/base.py b/lib/git/index/base.py
@@ -370,7 +370,7 @@ def _iter_expand_paths(self, paths):
 		def raise_exc(e):
 			raise e
 		r = self.repo.working_tree_dir
-		rs = r + '/'
+		rs = r + os.sep
 		for path in paths:
 			abs_path = path
 			if not os.path.isabs(abs_path):
@@ -667,7 +667,6 @@ def add(self, items, force=True, fprogress=lambda *args: None, path_rewriter=Non
 		# paths can be git-added, for everything else we use git-update-index
 		entries_added = list()
 		paths, entries = self._preprocess_add_items(items)
-
 		if paths and path_rewriter:
 			for path in paths:
 				abspath = os.path.abspath(path)
diff --git a/test/git/test_index.py b/test/git/test_index.py
@@ -24,6 +24,7 @@ def _assert_fprogress(self, entries):
 		assert len(entries) == len(self._fprogress_map)
 		for path, call_count in self._fprogress_map.iteritems():
 			assert call_count == 2
+		# END for each item in progress map
 		self._reset_progress()
 
 	def _fprogress(self, path, done, item):
@@ -44,6 +45,13 @@ def _fprogress_add(self, path, done, item):
 	def _reset_progress(self):
 		# maps paths to the count of calls
 		self._fprogress_map = dict()
+		
+	def _assert_entries(self, entries):
+		for entry in entries:
+			assert isinstance(entry, BaseIndexEntry)
+			assert not os.path.isabs(entry.path)
+			assert not "\\" in entry.path
+		# END for each entry
 	
 	def test_index_file_base(self):
 		# read from file
@@ -172,7 +180,7 @@ def test_index_merge_tree(self, rw_repo):
 		# sha for it ( which makes things faster of course )
 		manifest_fake_entry = BaseIndexEntry((manifest_entry[0], "\0"*20, 0, manifest_entry[3]))
 		# try write flag
-		rw_repo.index.add([manifest_fake_entry], write=False)
+		self._assert_entries(rw_repo.index.add([manifest_fake_entry], write=False))
 		# add actually resolves the null-hex-sha for us as a feature, but we can 
 		# edit the index manually
 		assert rw_repo.index.entries[manifest_key].binsha != Object.NULL_BIN_SHA
@@ -420,22 +428,25 @@ def mixed_iterator():
 		# re-add all files in lib
 		# get the lib folder back on disk, but get an index without it
 		index.reset(new_commit.parents[0], working_tree=True).reset(new_commit, working_tree=False)
-		lib_file_path = "lib/git/__init__.py"
+		lib_file_path = os.path.join("lib", "git", "__init__.py")
 		assert (lib_file_path, 0) not in index.entries
 		assert os.path.isfile(os.path.join(rw_repo.working_tree_dir, lib_file_path))
 		
 		# directory
 		entries = index.add(['lib'], fprogress=self._fprogress_add)
+		self._assert_entries(entries)
 		self._assert_fprogress(entries)
 		assert len(entries)>1
 		
 		# glob 
-		entries = index.reset(new_commit).add(['lib/git/*.py'], fprogress=self._fprogress_add)
+		entries = index.reset(new_commit).add([os.path.join('lib', 'git', '*.py')], fprogress=self._fprogress_add)
+		self._assert_entries(entries)
 		self._assert_fprogress(entries)
 		assert len(entries) == 14
 		
 		# same file 
-		entries = index.reset(new_commit).add(['lib/git/head.py']*2, fprogress=self._fprogress_add)
+		entries = index.reset(new_commit).add([os.path.abspath(os.path.join('lib', 'git', 'head.py'))]*2, fprogress=self._fprogress_add)
+		self._assert_entries(entries)
 		assert entries[0].mode & 0644 == 0644
 		# would fail, test is too primitive to handle this case
 		# self._assert_fprogress(entries)
@@ -448,6 +459,7 @@ def mixed_iterator():
 		# blob from older revision overrides current index revision
 		old_blob = new_commit.parents[0].tree.blobs[0]
 		entries = index.reset(new_commit).add([old_blob], fprogress=self._fprogress_add)
+		self._assert_entries(entries)
 		self._assert_fprogress(entries)
 		assert index.entries[(old_blob.path,0)].hexsha == old_blob.hexsha and len(entries) == 1 
 		
@@ -460,6 +472,7 @@ def mixed_iterator():
 		new_file_relapath = "my_new_file"
 		new_file_path = self._make_file(new_file_relapath, "hello world", rw_repo)
 		entries = index.reset(new_commit).add([BaseIndexEntry((010644, null_bin_sha, 0, new_file_relapath))], fprogress=self._fprogress_add)
+		self._assert_entries(entries)
 		self._assert_fprogress(entries)
 		assert len(entries) == 1 and entries[0].hexsha != null_hex_sha
 		
@@ -470,6 +483,7 @@ def mixed_iterator():
 			link_file = os.path.join(rw_repo.working_tree_dir, basename)
 			os.symlink(target, link_file)
 			entries = index.reset(new_commit).add([link_file], fprogress=self._fprogress_add)
+			self._assert_entries(entries)
 			self._assert_fprogress(entries)
 			assert len(entries) == 1 and S_ISLNK(entries[0].mode)
 			assert S_ISLNK(index.entries[index.entry_key("my_real_symlink", 0)].mode)
@@ -484,6 +498,7 @@ def mixed_iterator():
 		fake_symlink_path = self._make_file(fake_symlink_relapath, link_target, rw_repo)
 		fake_entry = BaseIndexEntry((0120000, null_bin_sha, 0, fake_symlink_relapath))
 		entries = index.reset(new_commit).add([fake_entry], fprogress=self._fprogress_add)
+		self._assert_entries(entries)
 		self._assert_fprogress(entries)
 		assert entries[0].hexsha != null_hex_sha
 		assert len(entries) == 1 and S_ISLNK(entries[0].mode)
@@ -571,7 +586,7 @@ def make_paths():
 			# END for each new file
 		# END path producer
 		paths = list(make_paths())
-		index.add(paths, path_rewriter=rewriter)
+		self._assert_entries(index.add(paths, path_rewriter=rewriter))
 		
 		for filenum in range(len(paths)):
 			assert index.entry_key(str(filenum), 0) in index.entries
