Format with black

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

Author: initialcommit-io

git_sim/git_sim_base_command.py

@@ -235,9 +235,11 @@ def draw_commit(self, commit, i, prevCircle, shift=numpy.array([0.0, 0.0, 0.0]))
             commit_fill = m.RED
         else:
             commit_fill = m.GRAY
-        
+
         circle = m.Circle(
-            stroke_color=commit_fill, fill_color=commit_fill, fill_opacity=self.fill_opacity
+            stroke_color=commit_fill,
+            fill_color=commit_fill,
+            fill_opacity=self.fill_opacity,
         )
         circle.height = 1
 
@@ -320,14 +322,25 @@ def draw_commit(self, commit, i, prevCircle, shift=numpy.array([0.0, 0.0, 0.0]))
             self.play(
                 self.camera.frame.animate.move_to(circle.get_center()),
                 m.Create(circle),
-                m.Text("") if settings.highlight_commit_messages else m.AddTextLetterByLetter(commitId),
+                m.Text("")
+                if settings.highlight_commit_messages
+                else m.AddTextLetterByLetter(commitId),
                 m.AddTextLetterByLetter(message),
                 run_time=1 / settings.speed,
             )
         elif isNewCommit:
-            self.add(circle, m.Text("") if settings.highlight_commit_messages else commitId, message)
+            self.add(
+                circle,
+                m.Text("") if settings.highlight_commit_messages else commitId,
+                message,
+            )
         else:
-            return m.Text("") if settings.highlight_commit_messages else commitId, circle, arrow, hide_refs
+            return (
+                m.Text("") if settings.highlight_commit_messages else commitId,
+                circle,
+                arrow,
+                hide_refs,
+            )
 
         if commit != "dark":
             self.drawnCommits[commit.hexsha] = circle
@@ -369,7 +382,9 @@ def build_commit_id_and_message(self, commit, i):
 
     def draw_head(self, commit, i, commitId):
         if commit.hexsha == self.repo.head.commit.hexsha:
-            headbox = m.Rectangle(color=m.BLUE, fill_color=m.BLUE, fill_opacity=self.ref_fill_opacity)
+            headbox = m.Rectangle(
+                color=m.BLUE, fill_color=m.BLUE, fill_opacity=self.ref_fill_opacity
+            )
             headbox.width = 1
             headbox.height = 0.4
             if settings.highlight_commit_messages:
@@ -960,7 +975,9 @@ def setup_and_draw_parent(
         draw_arrow=True,
         color=m.RED,
     ):
-        circle = m.Circle(stroke_color=color, fill_color=color, fill_opacity=self.ref_fill_opacity)
+        circle = m.Circle(
+            stroke_color=color, fill_color=color, fill_opacity=self.ref_fill_opacity
+        )
         circle.height = 1
         circle.next_to(
             self.drawnCommits[child.hexsha],

git_sim/merge.py

@@ -109,7 +109,9 @@ def construct(self):
                 self.color_by()
 
         else:
-            merge_result, new_dir = self.check_merge_conflict(self.repo.active_branch.name, self.branch)
+            merge_result, new_dir = self.check_merge_conflict(
+                self.repo.active_branch.name, self.branch
+            )
             if merge_result:
                 self.parse_commits(head_commit)
                 self.recenter_frame()
@@ -151,7 +153,6 @@ def construct(self):
         # Delete the local clone
         shutil.rmtree(new_dir, onerror=self.del_rw)
 
-
     def check_merge_conflict(self, branch1, branch2):
         git_root = self.repo.git.rev_parse("--show-toplevel")
         repo_name = os.path.basename(self.repo.working_dir)