Commit5a3b731

committed

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

1 parent963bbd7 commit5a3b731Copy full SHA for 5a3b731

File tree

+19

-5

lines changed

+19

-5

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`Iterable,`
`19`	`19`	`join_path_native,`
`20`	`20`	`to_native_path_linux,`
	`21`	`+rmtree`
`21`	`22`	`)`
`22`	`23`
`23`	`24`	`fromgit.db.interfaceimportRemoteProgress`
`@@ -35,8 +36,6 @@`
`35`	`36`	`importsys`
`36`	`37`	`importtime`
`37`	`38`
`38`		`-importshutil`
`39`		`-`
`40`	`39`	`__all__= ["Submodule","UpdateProgress"]`
`41`	`40`
`42`	`41`
`@@ -634,7 +633,7 @@ def remove(self, module=True, force=False, configuration=True, dry_run=False):`
`634`	`633`	`ifos.path.islink(mp):`
`635`	`634`	`method=os.remove`
`636`	`635`	`elifos.path.isdir(mp):`
`637`		`-method=shutil.rmtree`
	`636`	`+method=rmtree`
`638`	`637`	`elifos.path.exists(mp):`
`639`	`638`	`raiseAssertionError("Cannot forcibly delete repository as it was neither a link, nor a directory")`
`640`	`639`	`#END handle brutal deletion`
`@@ -683,7 +682,7 @@ def remove(self, module=True, force=False, configuration=True, dry_run=False):`
`683`	`682`	`ifnotdry_run:`
`684`	`683`	`wtd=mod.working_tree_dir`
`685`	`684`	`del(mod)# release file-handles (windows)`
`686`		`-shutil.rmtree(wtd)`
	`685`	`+rmtree(wtd)`
`687`	`686`	`# END delete tree if possible`
`688`	`687`	`# END handle force`
`689`	`688`	`# END handle module deletion`

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,14 @@`
`12`	`12`	`importerrno`
`13`	`13`	`importre`
`14`	`14`	`importtime`
	`15`	`+importstat`
	`16`	`+importshutil`
`15`	`17`	`importtempfile`
`16`	`18`
`17`	`19`	`__all__= ("stream_copy","join_path","to_native_path_windows","to_native_path_linux",`
`18`	`20`	`"join_path_native","Stats","IndexFileSHA1Writer","Iterable","IterableList",`
`19`	`21`	`"BlockingLockFile","LockFile",'Actor','get_user_id','assure_directory_exists',`
`20`		`-'RepoAliasMixin','LockedFD','LazyMixin' )`
	`22`	`+'RepoAliasMixin','LockedFD','LazyMixin','rmtree' )`
`21`	`23`
`22`	`24`	`fromcStringIOimportStringIO`
`23`	`25`
`@@ -147,6 +149,19 @@ def is_git_dir(d):`
`147`	`149`	`os.readlink(headref).startswith('refs'))`
`148`	`150`	`returnFalse`
`149`	`151`
	`152`	`+defrmtree(path):`
	`153`	`+"""Remove the given recursively.`
	`154`	`+:note: we use shutil rmtree but adjust its behaviour to see whether files that`
	`155`	`+couldn't be deleted are read-only. Windows will not remove them in that case"""`
	`156`	`+defonerror(func,path,exc_info):`
	`157`	`+ifnotos.access(path,os.W_OK):`
	`158`	`+# Is the error an access error ?`
	`159`	`+os.chmod(path,stat.S_IWUSR)`
	`160`	`+func(path)`
	`161`	`+else:`
	`162`	`+raise`
	`163`	`+# END end onerror`
	`164`	`+returnshutil.rmtree(path,False,onerror)`
`150`	`165`
`151`	`166`	`defstream_copy(source,destination,chunk_size=512*1024):`
`152`	`167`	`"""Copy all data from the source stream into the destination stream in chunks`

Comments

(0)