Fix list index out of range error when simulating some rebases

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

Author: initialcommit-io

git_sim/git_sim_base_command.py

@@ -70,11 +70,11 @@ def get_commits(self, start="HEAD"):
             self.numCommits -= 1
             self.get_commits(start=start)
 
-    def parse_commits(self, commit, prevCircle=None, shift=numpy.array([0., 0., 0.])):
+    def parse_commits(self, commit, prevCircle=None, shift=numpy.array([0., 0., 0.]), dots=False):
         if self.stop:
             return
         if ( self.i < self.numCommits and commit in self.commits ):
-            commitId, circle, arrow, hide_refs = self.draw_commit(commit, prevCircle, shift)
+            commitId, circle, arrow, hide_refs = self.draw_commit(commit, prevCircle, shift, dots)
 
             if commit != "dark":
                 if not hide_refs and not self.stop:
@@ -89,7 +89,7 @@ def parse_commits(self, commit, prevCircle=None, shift=numpy.array([0., 0., 0.])
 
             if self.i < len(self.commits)-1:
                 self.i += 1
-                self.parse_commits(self.commits[self.i], circle)
+                self.parse_commits(self.commits[self.i], circle, dots=True)
             else:
                 self.i = 0
 
@@ -138,7 +138,7 @@ def get_centers(self):
             centers.append(commit.get_center())
         return centers
 
-    def draw_commit(self, commit, prevCircle, shift=numpy.array([0., 0., 0.])):
+    def draw_commit(self, commit, prevCircle, shift=numpy.array([0., 0., 0.]), dots=False):
         if commit == "dark":
             commitFill = m.WHITE if self.scene.args.light_mode else m.BLACK
         elif ( len(commit.parents) <= 1 ):
@@ -170,7 +170,7 @@ def draw_commit(self, commit, prevCircle, shift=numpy.array([0., 0., 0.])):
         length = numpy.linalg.norm(start-end) - ( 1.5 if start[1] == end[1] else 3  )
         arrow.set_length(length)
 
-        commitId, commitMessage, commit, hide_refs = self.build_commit_id_and_message(commit)
+        commitId, commitMessage, commit, hide_refs = self.build_commit_id_and_message(commit, dots)
         commitId.next_to(circle, m.UP)
 
         message = m.Text('\n'.join(commitMessage[j:j+20] for j in range(0, len(commitMessage), 20))[:100], font="Monospace", font_size=14, color=self.scene.fontColor).next_to(circle, m.DOWN)
@@ -190,11 +190,14 @@ def draw_commit(self, commit, prevCircle, shift=numpy.array([0., 0., 0.])):
 
         return commitId, circle, arrow, hide_refs
 
-    def build_commit_id_and_message(self, commit):
+    def build_commit_id_and_message(self, commit, dots=False):
         hide_refs = False
         if commit == "dark":
             commitId = m.Text("", font="Monospace", font_size=20, color=self.scene.fontColor)
             commitMessage = ""
+        elif dots and commit.hexsha == self.commits[-1].hexsha:
+            commitId = m.Text("...", font="Monospace", font_size=20, color=self.scene.fontColor)
+            commitMessage = "..."
         else:
             commitId = m.Text(commit.hexsha[0:6], font="Monospace", font_size=20, color=self.scene.fontColor)
             commitMessage = commit.message.split("\n")[0][:40].replace("\n", " ")

git_sim/git_sim_rebase.py

@@ -42,7 +42,13 @@ def execute(self):
         self.orig_commits = self.commits
         self.i = 0
         self.get_commits()
-        self.parse_commits(self.commits[0], shift=4*m.DOWN)
+
+        reached_base = False
+        for commit in self.commits:
+            if self.scene.args.branch[0] in self.repo.git.branch("--contains", commit):
+                reached_base = True
+
+        self.parse_commits(self.commits[0], shift=4*m.DOWN, dots=False if reached_base else True)
         self.center_frame_on_commit(self.orig_commits[0])
 
         to_rebase = []
@@ -51,11 +57,18 @@ def execute(self):
         while self.scene.args.branch[0] not in self.repo.git.branch("--contains", current):
             to_rebase.append(current)
             i += 1
+            if i >= len(self.commits):
+                break
             current = self.commits[i]
 
         parent = self.orig_commits[0].hexsha
-        for tr in reversed(to_rebase):
-            parent = self.setup_and_draw_parent(parent, tr.message)
+
+        for j, tr in enumerate(reversed(to_rebase)):
+            if ( not reached_base and j == 0 ):
+                message = "..."
+            else:
+                message = tr.message
+            parent = self.setup_and_draw_parent(parent, message)
             self.draw_arrow_between_commits(tr.hexsha, parent)
 
         self.recenter_frame()
@@ -75,8 +88,9 @@ def setup_and_draw_parent(self, child, commitMessage="New commit", shift=numpy.a
         arrow = m.Arrow(start, end, color=self.scene.fontColor)
         length = numpy.linalg.norm(start-end) - ( 1.5 if start[1] == end[1] else 3  )
         arrow.set_length(length)
-        sha = "".join(chr(ord(letter)+1) if (chr(ord(letter)+1).isalpha() or chr(ord(letter)+1).isdigit()) else letter for letter in child[:6])
-        commitId = m.Text(sha, font="Monospace", font_size=20, color=self.scene.fontColor).next_to(circle, m.UP)
+
+        sha = "".join(chr(ord(letter)+1) if ((chr(ord(letter)+1).isalpha() and letter < "f") or chr(ord(letter)+1).isdigit()) else letter for letter in child[:6])
+        commitId = m.Text(sha if commitMessage != "..." else "...", font="Monospace", font_size=20, color=self.scene.fontColor).next_to(circle, m.UP)
         self.toFadeOut.add(commitId)
 
         commitMessage = commitMessage[:40].replace("\n", " ")