Eliminate duplicate rmtree try-except logic

In git.util.rmtree, exceptions are caught and conditionally (depending on the value of HIDE_WINDOWS_KNOWN_ERRORS) reraised wrapped in a unittest.SkipTest exception. Although this logic is part of git.util.rmtree itself, two of the calls to that rmtree function contain this same logic. This is not quite a refactoring: because SkipTest derives from Exception, and Exception rather than PermissionError is being caught including in the duplicated logic, duplicated logic where git.util.rmtree was called added another layer of indirection in the chained exceptions leading back to the original that was raised in an unsuccessful attempt to delete a file or directory in rmtree. However, that appeared unintended and may be considered a minor bug. The new behavior, differing only subtly, is preferable.

Author: EliahKagan

git/objects/submodule/base.py

@@ -29,7 +29,6 @@
 unbare_repo,
 IterableList,
 )
-fromgit.utilimportHIDE_WINDOWS_KNOWN_ERRORS
 
 importos.pathasosp
 
@@ -1060,28 +1059,13 @@ def remove(
 importgc
 
 gc.collect()
-try:
-rmtree(str(wtd))
-exceptExceptionasex:
-ifHIDE_WINDOWS_KNOWN_ERRORS:
-fromunittestimportSkipTest
-
-raiseSkipTest("FIXME: fails with: PermissionError\n{}".format(ex)) fromex
-raise
+rmtree(str(wtd))
 # END delete tree if possible
 # END handle force
 
 ifnotdry_runandosp.isdir(git_dir):
 self._clear_cache()
-try:
-rmtree(git_dir)
-exceptExceptionasex:
-ifHIDE_WINDOWS_KNOWN_ERRORS:
-fromunittestimportSkipTest
-
-raiseSkipTest(f"FIXME: fails with: PermissionError\n{ex}") fromex
-else:
-raise
+rmtree(git_dir)
 # end handle separate bare repository
 # END handle module deletion
 

test/test_docs.py

@@ -21,8 +21,8 @@ def tearDown(self):
 
 gc.collect()
 
-# ACTUALLY skipped by git.objects.submodule.base.Submodule.remove, at the last
-# rmtree call (in "handle separate bare repository"), line 1082.
+# ACTUALLY skipped by git.util.rmtree (in local onerror function), from the last call to it via
+# git.objects.submodule.base.Submodule.remove (at "handle separate bare repository"), line 1068.
 #
 # @skipIf(HIDE_WINDOWS_KNOWN_ERRORS,
 # "FIXME: helper.wrapper fails with: PermissionError: [WinError 5] Access is denied: "

test/test_submodule.py

@@ -458,7 +458,7 @@ def _do_base_tests(self, rwrepo):
  )
 
 # ACTUALLY skipped by git.util.rmtree (in local onerror function), called via
-# git.objects.submodule.base.Submodule.remove at "method(mp)", line 1018.
+# git.objects.submodule.base.Submodule.remove at "method(mp)", line 1017.
 #
 # @skipIf(HIDE_WINDOWS_KNOWN_ERRORS,
 # "FIXME: fails with: PermissionError: [WinError 32] The process cannot access the file because"