Clean up temporary local repo clones before running commands to aboid conflicts

Signed-off-by: Jacob Stopak <jacob@initialcommit.io>

Author: initialcommit-io

git_sim/clone.py

@@ -65,7 +65,7 @@ def construct(self):
         self.repo.git.clear_cache()
 
         # Delete the local clones
-        shutil.rmtree(new_dir, onerror=del_rw)
+        shutil.rmtree(new_dir, onerror=self.del_rw)
 
     def add_details(self, repo_name):
         text1 = m.Text(
@@ -95,8 +95,3 @@ def add_details(self, repo_name):
             self.play(m.AddTextLetterByLetter(text1), m.AddTextLetterByLetter(text2))
         else:
             self.add(text1, text2)
-
-
-def del_rw(action, name, exc):
-    os.chmod(name, stat.S_IWRITE)
-    os.remove(name)

git_sim/fetch.py

@@ -72,9 +72,4 @@ def construct(self):
         self.fadeout()
         self.show_outro()
         self.repo.git.clear_cache()
-        shutil.rmtree(new_dir, onerror=del_rw)
-
-
-def del_rw(action, name, exc):
-    os.chmod(name, stat.S_IWRITE)
-    os.remove(name)
+        shutil.rmtree(new_dir, onerror=self.del_rw)

git_sim/git_sim_base_command.py

@@ -1,5 +1,9 @@
 import platform
 import sys
+import os
+import tempfile
+import shutil
+import stat
 
 import git
 import manim as m
@@ -52,6 +56,17 @@ def __init__(self):
     def init_repo(self):
         try:
             self.repo = Repo(search_parent_directories=True)
+            repo_name = os.path.basename(self.repo.working_dir)
+            new_dir = os.path.join(tempfile.gettempdir(), "git_sim", repo_name)
+            new_dir2 = os.path.join(tempfile.gettempdir(), "git_sim", repo_name + "2")
+            try:
+                shutil.rmtree(new_dir, onerror=self.del_rw)
+            except FileNotFoundError:
+                pass
+            try:
+                shutil.rmtree(new_dir2, onerror=self.del_rw)
+            except FileNotFoundError:
+                pass
         except InvalidGitRepositoryError:
             print("git-sim error: No Git repository found at current path.")
             sys.exit(1)
@@ -1180,6 +1195,10 @@ def add_group_to_author_groups(self, author, group):
         else:
             self.author_groups[author].append(group)
 
+    def del_rw(self, action, name, exc):
+        os.chmod(name, stat.S_IWRITE)
+        os.remove(name)
+
 
 class DottedLine(m.Line):
     def __init__(self, *args, dot_spacing=0.4, dot_kwargs={}, **kwargs):

git_sim/merge.py

@@ -148,7 +148,7 @@ def construct(self):
         self.repo.git.clear_cache()
 
         # Delete the local clone
-        shutil.rmtree(new_dir, onerror=del_rw)
+        shutil.rmtree(new_dir, onerror=self.del_rw)
 
 
     def check_merge_conflict(self, branch1, branch2):
@@ -185,8 +185,3 @@ def populate_zones(
     ):
         for filename in self.conflicted_files:
             secondColumnFileNames.add(filename)
-
-
-def del_rw(action, name, exc):
-    os.chmod(name, stat.S_IWRITE)
-    os.remove(name)

git_sim/pull.py

@@ -82,7 +82,7 @@ def construct(self):
                     f"git-sim error: git pull failed for unhandled reason: {e.stdout}"
                 )
                 self.repo.git.clear_cache()
-                shutil.rmtree(new_dir, onerror=del_rw)
+                shutil.rmtree(new_dir, onerror=self.del_rw)
                 sys.exit(1)
 
         self.color_by()
@@ -93,7 +93,7 @@ def construct(self):
         self.repo.git.clear_cache()
 
         # Delete the local clone
-        shutil.rmtree(new_dir, onerror=del_rw)
+        shutil.rmtree(new_dir, onerror=self.del_rw)
 
     # Override to display conflicted filenames
     def populate_zones(
@@ -107,8 +107,3 @@ def populate_zones(
     ):
         for filename in self.conflicted_files:
             secondColumnFileNames.add(filename)
-
-
-def del_rw(action, name, exc):
-    os.chmod(name, stat.S_IWRITE)
-    os.remove(name)

git_sim/push.py

@@ -109,8 +109,8 @@ def construct(self):
             self.orig_repo.git.clear_cache()
 
         # Delete the local clones
-        shutil.rmtree(new_dir, onerror=del_rw)
-        shutil.rmtree(new_dir2, onerror=del_rw)
+        shutil.rmtree(new_dir, onerror=self.del_rw)
+        shutil.rmtree(new_dir2, onerror=self.del_rw)
 
     def failed_push(self, push_result):
         if push_result == 1:
@@ -196,8 +196,3 @@ def failed_push(self, push_result):
             self.play(*[m.AddTextLetterByLetter(t) for t in texts])
         else:
             self.add(*texts)
-
-
-def del_rw(action, name, exc):
-    os.chmod(name, stat.S_IWRITE)
-    os.remove(name)