Merge pull request #139 from aplaice/close_dulwich_repos

Close all opened dulwich repo objects
Stvad · Nov 23, 2021 · e253603 · e253603
2 parents a7bb43a + fd0296f
commit e253603
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/crowd_anki/github/github_importer.py b/crowd_anki/github/github_importer.py
@@ -36,7 +36,7 @@ def clone_repository_and_import(self, repo_url):
         repo_url = repo_url.strip()
         try:
             repo_local_path = self.get_repo_local_path(repo_url)
-            porcelain.pull(porcelain.open_repo(str(repo_local_path)), repo_url)
+            porcelain.pull(str(repo_local_path), repo_url)
         except ValueError:
             return self.notifier.error("URL incorrect", f"URL could not be parsed \"{repo_url}\"")
         except NotGitRepository:
@@ -49,9 +49,9 @@ def clone_repository_and_import(self, repo_url):
 
     def clone_repository(self, repo_url, repo_path):
         repo_path.mkdir(parents=True, exist_ok=True)
-        porcelain.clone(repo_url, target=str(repo_path), bare=False, checkout=True, errstream=porcelain.NoneStream(),
-                        outstream=porcelain.NoneStream())
+        repo_object = porcelain.clone(repo_url, target=str(repo_path), bare=False, checkout=True, errstream=porcelain.NoneStream())
+        repo_object.close()
 
     def get_repo_local_path(self, repo_url):
         repo_name = get_repository_name(repo_url)
-        return ConfigSettings.get_instance().full_snapshot_path.joinpath(repo_name)
+        return ConfigSettings.get_instance().full_snapshot_path.joinpath(repo_name)
diff --git a/crowd_anki/history/anki_deck_archiver.py b/crowd_anki/history/anki_deck_archiver.py
@@ -21,3 +21,4 @@ def archive(self, _: Iterable = tuple(), reason=None):
         repo = self.repo_provider(deck_path)
         repo.stage_all()
         repo.commit(reason)
+        repo.close()
diff --git a/crowd_anki/history/dulwich_repo.py b/crowd_anki/history/dulwich_repo.py
@@ -40,3 +40,6 @@ def there_are_staged_changes(self):
 
     def status(self) -> GitStatus:
         return self.git.status(self.dulwich_repo)
+
+    def close(self):
+        self.dulwich_repo.close()