Rename to bring together in directory listing

benedikt-schesch · May 16, 2024 · 618060f · 618060f
1 parent 6e1826a
commit 618060f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/python/replay_merge.py b/src/python/replay_merge.py
@@ -88,7 +88,7 @@ def merge_replay(
 
         # Get base, left, right, and programmer merge.
 
-        workdir = Path(f"{repo_slug}-merge-left")
+        workdir = Path(f"{repo_slug}-merge-input-left")
         if not (WORKDIR_DIRECTORY / workdir).exists():
             repo = Repository(
                 repo_slug,
@@ -99,7 +99,7 @@ def merge_replay(
             )
             repo.checkout(merge_data["left"])
 
-        workdir = Path(f"{repo_slug}-merge-right")
+        workdir = Path(f"{repo_slug}-merge-input-right")
         if not (WORKDIR_DIRECTORY / workdir).exists():
             repo = Repository(
                 repo_slug,
@@ -110,7 +110,7 @@ def merge_replay(
             )
             repo.checkout(merge_data["right"])
 
-        workdir = Path(f"{repo_slug}-merge-base")
+        workdir = Path(f"{repo_slug}-merge-input-base")
         if not (WORKDIR_DIRECTORY / workdir).exists():
             repo = Repository(
                 repo_slug,
@@ -125,7 +125,7 @@ def merge_replay(
             ).stdout.decode("utf-8")
             repo.checkout(base_commit)
 
-        workdir = Path(f"{repo_slug}-merge-programmer")
+        workdir = Path(f"{repo_slug}-merge-input-programmer")
         if not (WORKDIR_DIRECTORY / workdir).exists():
             repo = Repository(
                 repo_slug,

diff --git a/src/python/repo.py b/src/python/repo.py
@@ -242,7 +242,6 @@ def copy_repo(self) -> None:
             ignore_dangling_symlinks=True,
         )
         os.system("chmod -R 777 " + str(self.local_repo_path))
-
         self.repo = Repo(self.local_repo_path)
 
     def checkout(self, commit: str, use_cache: bool = True) -> Tuple[bool, str]: