Merge pull request #6783 from mih/rf-remove

Remove superfluous `AnnexRepo.remove()` implementation

datalad/support/annexrepo.py

@@ -2683,24 +2683,6 @@ def precommit(self):
             self._batched.close()
         super(AnnexRepo, self).precommit()
 
-
-    @normalize_paths(match_return_type=False)
-    def remove(self, files, force=False, **kwargs):
-        """Remove files from git/annex
-
-        Parameters
-        ----------
-        files
-        force: bool, optional
-        """
-
-        # TODO: parameter 'force' unnecessary => kwargs / to_options
-        self.precommit()  # since might interfere
-
-        return super(AnnexRepo, self).remove(files, force=force,
-                                             normalize_paths=False,
-                                             **kwargs)
-
     def get_contentlocation(self, key, batch=False):
         """Get location of the key content
 

datalad/support/gitrepo.py

@@ -1305,6 +1305,12 @@ def remove(self, files, recursive=False, **kwargs):
         if recursive:
             kwargs['r'] = True
 
+        # the name is chosen badly, but the purpose is to make sure that
+        # any pending operations actually manifest themselves in the Git repo
+        # on disk (in case of an AnnexRepo, it could be pending batch
+        # processes that need closing)
+        self.precommit()
+
         # output per removed file is expected to be "rm 'PATH'":
         return [
             line.strip()[4:-1]