Consolidate get_commits and parse_commits methods

Signed-off-by: Jacob Stopak <[email protected]>

Author: initialcommit-io

git_sim/add.py

@@ -37,8 +37,7 @@ def construct(self):
             )
 
         self.show_intro()
-        self.get_commits()
-        self.parse_commits(self.commits[0], 0)
+        self.parse_commits()
         self.recenter_frame()
         self.scale_frame()
         self.vsplit_frame()

git_sim/branch.py

@@ -16,8 +16,7 @@ def construct(self):
             print(f"{settings.INFO_STRING} {type(self).__name__.lower()} {self.name}")
 
         self.show_intro()
-        self.get_commits()
-        self.parse_commits(self.commits[0], 0)
+        self.parse_commits()
         self.recenter_frame()
         self.scale_frame()
 

git_sim/cherrypick.py

@@ -53,17 +53,16 @@ def construct(self):
             sys.exit(1)
 
         self.show_intro()
-        self.get_commits()
-        self.parse_commits(self.commits[0], 0)
-        self.orig_commits = self.commits
-        self.get_commits(start=self.commit)
-        self.parse_commits(self.commits[0], 0, shift=4 * m.DOWN)
-        self.center_frame_on_commit(self.orig_commits[0])
+        head_commit = self.get_commit()
+        self.parse_commits(head_commit)
+        cherry_picked_commit = self.get_commit(self.commit)
+        self.parse_commits(cherry_picked_commit, shift=4 * m.DOWN)
+        self.center_frame_on_commit(head_commit)
         self.setup_and_draw_parent(
-            self.orig_commits[0],
-            self.edit if self.edit else self.commits[0].message,
+            head_commit,
+            self.edit if self.edit else cherry_picked_commit.message,
         )
-        self.draw_arrow_between_commits(self.commits[0].hexsha, "abcdef")
+        self.draw_arrow_between_commits(cherry_picked_commit.hexsha, "abcdef")
         self.recenter_frame()
         self.scale_frame()
         self.reset_head_branch("abcdef")

git_sim/commit.py

@@ -42,7 +42,7 @@ def construct(self):
             )
 
         self.show_intro()
-        self.get_commits()
+        head_commit = self.get_commit()
 
         if self.amend:
             tree = self.repo.tree()
@@ -51,17 +51,17 @@ def construct(self):
                 tree,
                 self.message,
             )
-            self.commits[0] = amended
+            head_commit = amended
 
-        self.parse_commits(self.commits[0], 0)
-        self.center_frame_on_commit(self.commits[0])
+        self.parse_commits(head_commit)
+        self.center_frame_on_commit(head_commit)
 
         if not self.amend:
-            self.setup_and_draw_parent(self.commits[0], self.message)
+            self.setup_and_draw_parent(head_commit, self.message)
         else:
-            self.draw_ref(self.commits[0], self.drawnCommitIds[amended.hexsha])
+            self.draw_ref(head_commit, self.drawnCommitIds[amended.hexsha])
             self.draw_ref(
-                self.commits[0],
+                head_commit,
                 self.drawnRefs["HEAD"],
                 text=self.repo.active_branch.name,
                 color=m.GREEN,

git_sim/git_sim_base_command.py

@@ -19,7 +19,6 @@ def __init__(self):
         self.drawnCommits = {}
         self.drawnRefs = {}
         self.drawnCommitIds = {}
-        self.commits = []
         self.zoomOuts = 0
         self.toFadeOut = m.Group()
         self.trimmed = False
@@ -46,45 +45,31 @@ def init_repo(self):
     def construct(self):
         print(f"{settings.INFO_STRING} {type(self).__name__.lower()}")
         self.show_intro()
-        self.get_commits()
+        self.parse_commits()
         self.fadeout()
         self.show_outro()
 
-    def get_commits(self, start="HEAD"):
-        if not self.n:
-            if settings.allow_no_commits:
-                self.n = self.n_default
-                self.commits = ["dark"] * 5
-                self.zone_title_offset = 2
-                return
-            else:
-                print("git-sim error: No commits in current Git repository.")
-                sys.exit(1)
-
-        try:
-            self.commits = (
-                list(self.repo.iter_commits(start))
-                if self.n == 1
-                else list(
-                    self.repo.iter_commits(start + "~" + str(self.n) + "..." + start)
-                )
-            )
-            if len(self.commits) < self.n_default:
-                self.commits = list(self.repo.iter_commits(start))
-            while len(self.commits) < self.n_default:
-                self.commits.append(self.create_dark_commit())
-            self.n = self.n_orig
+    def get_commit(self, sha_or_ref="HEAD"):
+        return self.repo.commit(sha_or_ref)
 
-        except GitCommandError:
-            self.n -= 1
-            self.get_commits(start=start)
+    def get_default_commits(self):
+        defaultCommits = [self.get_commit()]
+        for x in range(self.n_default - 1):
+            defaultCommits.append(defaultCommits[-1].parents[0])
+        return defaultCommits
 
     def parse_commits(
-        self, commit, i, prevCircle=None, shift=numpy.array([0.0, 0.0, 0.0])
+        self,
+        commit=None,
+        i=0,
+        prevCircle=None,
+        shift=numpy.array([0.0, 0.0, 0.0]),
     ):
+        commit = commit or self.get_commit()
+
         isNewCommit = commit.hexsha not in self.drawnCommits
 
-        if i < self.n and commit in self.commits:
+        if i < self.n:
             commitId, circle, arrow, hide_refs = self.draw_commit(
                 commit, i, prevCircle, shift
             )
@@ -303,20 +288,11 @@ def get_nonparent_branch_names(self):
                         exclude.append(b1.name)
         return [b for b in branches if b.name not in exclude]
 
-    def build_commit_id_and_message(self, commit, i, dots=False):
+    def build_commit_id_and_message(self, commit, i):
         hide_refs = False
         if commit == "dark":
             commitId = m.Text("", font="Monospace", font_size=20, color=self.fontColor)
             commitMessage = ""
-        elif (
-            dots
-            and self.commits[-1] != "dark"
-            and commit.hexsha == self.commits[-1].hexsha
-        ):
-            commitId = m.Text(
-                "...", font="Monospace", font_size=20, color=self.fontColor
-            )
-            commitMessage = "..."
         else:
             commitId = m.Text(
                 commit.hexsha[0:6],
@@ -924,9 +900,6 @@ def create_dark_commit(self):
 
     def get_nondark_commits(self):
         nondark_commits = []
-        for commit in self.commits:
-            if commit != "dark":
-                nondark_commits.append(commit)
         return nondark_commits
 
     def draw_ref(self, commit, i, top, text="HEAD", color=m.BLUE):

git_sim/log.py

@@ -12,9 +12,9 @@ def __init__(self, ctx: typer.Context, n: int, all: bool):
         super().__init__()
 
         n_command = ctx.parent.params.get("n")
-        n_subcommand = n
-        if n_subcommand:
-            n = n_subcommand
+        self.n_subcommand = n
+        if self.n_subcommand:
+            n = self.n_subcommand
         else:
             n = n_command
         self.n = n
@@ -29,15 +29,13 @@ def __init__(self, ctx: typer.Context, n: int, all: bool):
     def construct(self):
         if not settings.stdout:
             print(
-                f"{settings.INFO_STRING} {type(self).__name__.lower()}{' --all' if self.all else ''}"
+                f"{settings.INFO_STRING} {type(self).__name__.lower()}{' --all' if self.all else ''}{' -n ' + str(self.n) if self.n_subcommand else ''}"
             )
         self.show_intro()
-        self.get_commits()
-        self.parse_commits(self.commits[0], 0)
+        self.parse_commits()
         if self.all:
             for branch in self.get_nonparent_branch_names():
-                self.get_commits(start=branch.name)
-                self.parse_commits(self.commits[0], 0)
+                self.parse_commits(self.get_commit(branch.name))
         self.recenter_frame()
         self.scale_frame()
         self.fadeout()

git_sim/merge.py

@@ -55,31 +55,27 @@ def construct(self):
             sys.exit(1)
 
         self.show_intro()
-        self.get_commits()
-        self.orig_commits = self.commits
-        self.get_commits(start=self.branch)
+        head_commit = self.get_commit()
+        branch_commit = self.get_commit(self.branch)
 
         # Use forward slash to determine if supplied branch arg is local or remote tracking branch
         if not self.is_remote_tracking_branch(self.branch):
-            if self.branch in self.repo.git.branch(
-                "--contains", self.orig_commits[0].hexsha
-            ):
+            if self.branch in self.repo.git.branch("--contains", head_commit.hexsha):
                 self.ff = True
         else:
             if self.branch in self.repo.git.branch(
-                "-r", "--contains", self.orig_commits[0].hexsha
+                "-r", "--contains", head_commit.hexsha
             ):
                 self.ff = True
 
         if self.ff:
-            self.get_commits(start=self.branch)
-            self.parse_commits(self.commits[0], 0)
-            reset_head_to = self.commits[0].hexsha
+            self.parse_commits(branch_commit)
+            reset_head_to = branch_commit.hexsha
             shift = numpy.array([0.0, 0.6, 0.0])
 
             if self.no_ff:
-                self.center_frame_on_commit(self.commits[0])
-                commitId = self.setup_and_draw_parent(self.commits[0], "Merge commit")
+                self.center_frame_on_commit(branch_commit)
+                commitId = self.setup_and_draw_parent(branch_commit, "Merge commit")
                 reset_head_to = "abcdef"
                 shift = numpy.array([0.0, 0.0, 0.0])
 
@@ -88,29 +84,27 @@ def construct(self):
             if "HEAD" in self.drawnRefs:
                 self.reset_head_branch(reset_head_to, shift=shift)
             else:
-                self.draw_ref(self.commits[0], commitId if self.no_ff else self.topref)
+                self.draw_ref(branch_commit, commitId if self.no_ff else self.topref)
                 self.draw_ref(
-                    self.commits[0],
+                    branch_commit,
                     self.drawnRefs["HEAD"],
                     text=self.repo.active_branch.name,
                     color=m.GREEN,
                 )
 
         else:
-            self.get_commits()
-            self.parse_commits(self.commits[0], 0)
-            self.get_commits(start=self.branch)
-            self.parse_commits(self.commits[0], 0, shift=4 * m.DOWN)
-            self.center_frame_on_commit(self.orig_commits[0])
+            self.parse_commits(head_commit)
+            self.parse_commits(branch_commit, shift=4 * m.DOWN)
+            self.center_frame_on_commit(head_commit)
             self.setup_and_draw_parent(
-                self.orig_commits[0],
+                head_commit,
                 "Merge commit",
                 shift=2 * m.DOWN,
                 draw_arrow=False,
                 color=m.GRAY,
             )
-            self.draw_arrow_between_commits("abcdef", self.commits[0].hexsha)
-            self.draw_arrow_between_commits("abcdef", self.orig_commits[0].hexsha)
+            self.draw_arrow_between_commits("abcdef", branch_commit.hexsha)
+            self.draw_arrow_between_commits("abcdef", head_commit.hexsha)
             self.recenter_frame()
             self.scale_frame()
             self.reset_head_branch("abcdef")

git_sim/rebase.py

@@ -64,32 +64,31 @@ def construct(self):
             sys.exit(1)
 
         self.show_intro()
-        self.get_commits(start=self.branch)
-        self.parse_commits(self.commits[0], 0)
-        self.orig_commits = self.commits
-        self.get_commits()
+        branch_commit = self.get_commit(self.branch)
+        self.parse_commits(branch_commit)
+        head_commit = self.get_commit()
 
         reached_base = False
-        for commit in self.commits:
+        for commit in self.get_default_commits():
             if commit != "dark" and self.branch in self.repo.git.branch(
                 "--contains", commit
             ):
                 reached_base = True
 
-        self.parse_commits(self.commits[0], 0, shift=4 * m.DOWN)
-        self.center_frame_on_commit(self.orig_commits[0])
+        self.parse_commits(head_commit, shift=4 * m.DOWN)
+        self.center_frame_on_commit(branch_commit)
 
         to_rebase = []
         i = 0
-        current = self.commits[i]
+        current = head_commit
         while self.branch not in self.repo.git.branch("--contains", current):
             to_rebase.append(current)
             i += 1
-            if i >= len(self.commits):
+            if i >= self.n:
                 break
-            current = self.commits[i]
+            current = self.get_default_commits()[i]
 
-        parent = self.orig_commits[0].hexsha
+        parent = branch_commit.hexsha
 
         for j, tr in enumerate(reversed(to_rebase)):
             if not reached_base and j == 0:

git_sim/reset.py

@@ -56,8 +56,7 @@ def construct(self):
             )
 
         self.show_intro()
-        self.get_commits()
-        self.parse_commits(self.commits[0], 0)
+        self.parse_commits()
         self.recenter_frame()
         self.scale_frame()
         self.reset_head_branch(self.resetTo.hexsha)
@@ -66,21 +65,21 @@ def construct(self):
         self.fadeout()
         self.show_outro()
 
-    def build_commit_id_and_message(self, commit, i, dots=False):
+    def build_commit_id_and_message(self, commit, i):
         hide_refs = False
         if commit == "dark":
             commitId = m.Text("", font="Monospace", font_size=20, color=self.fontColor)
             commitMessage = ""
         elif i == 3 and self.resetTo.hexsha not in [
-            commit.hexsha for commit in self.get_nondark_commits()
+            c.hexsha for c in self.get_default_commits()
         ]:
             commitId = m.Text(
                 "...", font="Monospace", font_size=20, color=self.fontColor
             )
             commitMessage = "..."
             hide_refs = True
         elif i == 4 and self.resetTo.hexsha not in [
-            commit.hexsha for commit in self.get_nondark_commits()
+            c.hexsha for c in self.get_default_commits()
         ]:
             commitId = m.Text(
                 self.resetTo.hexsha[:6],

git_sim/restore.py

@@ -35,8 +35,7 @@ def construct(self):
             )
 
         self.show_intro()
-        self.get_commits()
-        self.parse_commits(self.commits[0], 0)
+        self.parse_commits()
         self.recenter_frame()
         self.scale_frame()
         self.vsplit_frame()