Tried to get rid of held references which could keep a filehandle open. In fact, it didn't work, and ... something else keeps them open. Its odd, its weird, its windows, and I give up on it for now

Byron · Byron · commit beccf1907dae · 2010-11-20T22:01:45.000+01:00
diff --git a/lib/git/objects/submodule/base.py b/lib/git/objects/submodule/base.py
@@ -24,6 +24,7 @@
 
 import os
 import sys
+import time
 
 import shutil
 
@@ -586,16 +587,26 @@ def remove(self, module=True, force=False, configuration=True, dry_run=False):
 					if num_branches_with_new_commits == len(rrefs):
 						raise InvalidGitRepositoryError("Cannot delete module at %s as there are new commits" % mod.working_tree_dir)
 					# END handle new commits
+					# have to manually delete references as python's scoping is 
+					# not existing, they could keep handles open ( on windows this is a problem )
+					if len(rrefs):
+						del(rref)
+					#END handle remotes
+					del(rrefs)
+					del(remote)
 				# END for each remote
 				
 				# gently remove all submodule repositories
 				for sm in self.children():
 					sm.remove(module=True, force=False, configuration=False, dry_run=dry_run)
+					del(sm)
 				# END for each child-submodule
 				
 				# finally delete our own submodule
 				if not dry_run:
-					shutil.rmtree(mod.working_tree_dir)
+					wtd = mod.working_tree_dir
+					del(mod)		# release file-handles (windows)
+					shutil.rmtree(wtd)
 				# END delete tree if possible
 			# END handle force
 		# END handle module deletion
diff --git a/test/git/test_submodule.py b/test/git/test_submodule.py
@@ -172,14 +172,16 @@ def _do_base_tests(self, rwrepo):
 			
 			
 			# reset both heads to the previous version, verify that to_latest_revision works
-			for repo in (csm.module(), sm.module()):
+			smods = (sm.module(), csm.module())
+			for repo in smods:
 				repo.head.reset('HEAD~1', working_tree=1)
 			# END for each repo to reset
 			
 			sm.update(recursive=True, to_latest_revision=True)
-			for repo in (sm.module(), csm.module()):
+			for repo in smods:
 				assert repo.head.commit == repo.head.ref.tracking_branch().commit
 			# END for each repo to check
+			del(smods)
 			
 			# if the head is detached, it still works ( but warns )
 			smref = sm.module().head.ref
@@ -356,8 +358,8 @@ def test_root_module(self, rwrepo):
 		rm.config_writer()
 		
 		# deep traversal gitdb / async
-		rsms = list(rm.traverse())
-		assert len(rsms) == 2			# gitdb and async, async being a child of gitdb
+		rsmsp = [sm.path for sm in rm.traverse()]
+		assert len(rsmsp) == 2			# gitdb and async, async being a child of gitdb
 		
 		# cannot set the parent commit as root module's path didn't exist
 		self.failUnlessRaises(ValueError, rm.set_parent_commit, 'HEAD')
@@ -406,9 +408,9 @@ def test_root_module(self, rwrepo):
 		#================
 		nsmn = "newsubmodule"
 		nsmp = "submrepo"
-		async_url = to_native_path_linux(join_path_native(self.rorepo.working_tree_dir, rsms[0].path, rsms[1].path))
+		async_url = to_native_path_linux(join_path_native(self.rorepo.working_tree_dir, rsmsp[0], rsmsp[1]))
 		nsm = Submodule.add(rwrepo, nsmn, nsmp, url=async_url)
-		csmadded = rwrepo.index.commit("Added submodule")
+		csmadded = rwrepo.index.commit("Added submodule").hexsha	# make sure we don't keep the repo reference
 		nsm.set_parent_commit(csmadded)
 		assert nsm.module_exists()
 		# in our case, the module should not exist, which happens if we update a parent
@@ -439,7 +441,7 @@ def test_root_module(self, rwrepo):
 		# to the first repository, this way we have a fast checkout, and a completely different 
 		# repository at the different url
 		nsm.set_parent_commit(csmremoved)
-		nsmurl = to_native_path_linux(join_path_native(self.rorepo.working_tree_dir, rsms[0].path))
+		nsmurl = to_native_path_linux(join_path_native(self.rorepo.working_tree_dir, rsmsp[0]))
 		nsm.config_writer().set_value('url', nsmurl)
 		csmpathchange = rwrepo.index.commit("changed url")
 		nsm.set_parent_commit(csmpathchange)
