Commit9b6f38d

committed

Submodule now uses a specialized method to remove its trees to allow read-only files to be removed on windows as well

1 parent59587d8 commit9b6f38dCopy full SHA for 9b6f38d

File tree

+23

-6

lines changed

+23

-6

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@`
`13`	`13`	`Iterable,`
`14`	`14`	`join_path_native,`
`15`	`15`	`to_native_path_linux,`
`16`		`-RemoteProgress`
	`16`	`+RemoteProgress,`
	`17`	`+rmtree`
`17`	`18`	`)`
`18`	`19`
`19`	`20`	`fromgit.configimportSectionConstraint`
`@@ -29,8 +30,6 @@`
`29`	`30`	`importsys`
`30`	`31`	`importtime`
`31`	`32`
`32`		`-importshutil`
`33`		`-`
`34`	`33`	`__all__= ["Submodule","UpdateProgress"]`
`35`	`34`
`36`	`35`
`@@ -622,7 +621,7 @@ def remove(self, module=True, force=False, configuration=True, dry_run=False):`
`622`	`621`	`ifos.path.islink(mp):`
`623`	`622`	`method=os.remove`
`624`	`623`	`elifos.path.isdir(mp):`
`625`		`-method=shutil.rmtree`
	`624`	`+method=rmtree`
`626`	`625`	`elifos.path.exists(mp):`
`627`	`626`	`raiseAssertionError("Cannot forcibly delete repository as it was neither a link, nor a directory")`
`628`	`627`	`#END handle brutal deletion`
`@@ -671,7 +670,7 @@ def remove(self, module=True, force=False, configuration=True, dry_run=False):`
`671`	`670`	`ifnotdry_run:`
`672`	`671`	`wtd=mod.working_tree_dir`
`673`	`672`	`del(mod)# release file-handles (windows)`
`674`		`-shutil.rmtree(wtd)`
	`673`	`+rmtree(wtd)`
`675`	`674`	`# END delete tree if possible`
`676`	`675`	`# END handle force`
`677`	`676`	`# END handle module deletion`

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`	`importre`
`9`	`9`	`importsys`
`10`	`10`	`importtime`
	`11`	`+importstat`
	`12`	`+importshutil`
`11`	`13`	`importtempfile`
`12`	`14`	`importplatform`
`13`	`15`
`@@ -23,10 +25,26 @@`
`23`	`25`	`__all__= ("stream_copy","join_path","to_native_path_windows","to_native_path_linux",`
`24`	`26`	`"join_path_native","Stats","IndexFileSHA1Writer","Iterable","IterableList",`
`25`	`27`	`"BlockingLockFile","LockFile",'Actor','get_user_id','assure_directory_exists',`
`26`		`-'RemoteProgress')`
	`28`	`+'RemoteProgress','rmtree')`
`27`	`29`
`28`	`30`	`#{ Utility Methods`
`29`	`31`
	`32`	`+defrmtree(path):`
	`33`	`+"""Remove the given recursively.`
	`34`	`+:note: we use shutil rmtree but adjust its behaviour to see whether files that`
	`35`	`+couldn't be deleted are read-only. Windows will not remove them in that case"""`
	`36`	`+defonerror(func,path,exc_info):`
	`37`	`+ifnotos.access(path,os.W_OK):`
	`38`	`+# Is the error an access error ?`
	`39`	`+os.chmod(path,stat.S_IWUSR)`
	`40`	`+func(path)`
	`41`	`+else:`
	`42`	`+raise`
	`43`	`+# END end onerror`
	`44`	`+returnshutil.rmtree(path,False,onerror)`
	`45`	`+`
	`46`	`+`
	`47`	`+`
`30`	`48`	`defstream_copy(source,destination,chunk_size=512*1024):`
`31`	`49`	`"""Copy all data from the source stream into the destination stream in chunks`
`32`	`50`	`of size chunk_size`

Comments

(0)