Handle push subcommand failure scenario 'non-fast-forward'

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

Author: initialcommit-io

git_sim/git_sim_base_command.py

@@ -382,8 +382,10 @@ def draw_branch(self, commit, i, make_branches_remote=False):
                 self.is_remote_tracking_branch(branch)  # remote tracking branch
                 and commit.hexsha == remote_tracking_branches[branch]
             ):
+                text = (make_branches_remote + "/" + branch) if (make_branches_remote and not self.is_remote_tracking_branch(branch)) else branch
+
                 branchText = m.Text(
-                    branch if not make_branches_remote else make_branches_remote + "/" + branch, font="Monospace", font_size=20, color=self.fontColor
+                    text, font="Monospace", font_size=20, color=self.fontColor
                 )
                 branchRec = m.Rectangle(
                     color=m.GREEN,
@@ -1151,13 +1153,18 @@ def color_by(self, offset=0):
         elif settings.color_by == "branch":
             pass
 
-        elif settings.color_by == "notlocal":
+        elif settings.color_by == "notlocal1":
             for commit_id in self.drawnCommits:
                 try:
                     self.orig_repo.commit(commit_id)
                 except ValueError:
                     self.drawnCommits[commit_id].set_color(m.GOLD)
 
+        elif settings.color_by == "notlocal2":
+            for commit_id in self.drawnCommits:
+                if not self.orig_repo.is_ancestor(commit_id, "HEAD"):
+                    self.drawnCommits[commit_id].set_color(m.GOLD)
+
     def add_group_to_author_groups(self, author, group):
         if author not in self.author_groups:
             self.author_groups[author] = [group]

git_sim/push.py

@@ -22,7 +22,6 @@ def __init__(self, remote: str = None, branch: str = None):
         self.remote = remote
         self.branch = branch
         settings.max_branches_per_commit = 2
-        settings.color_by = "notlocal"
 
         if self.remote and self.remote not in self.repo.remotes:
             print("git-sim error: no remote with name '" + self.remote + "'")
@@ -68,19 +67,30 @@ def construct(self):
 
         # Push the local clone into the local clone of the remote repo
         push_result = 0
+        self.orig_repo = None
         try:
             self.repo.git.push(self.remote, self.branch)
         # If push fails...
         except git.GitCommandError as e:
-            if "rejected" in e.stderr and "fetch first" in e.stderr:
+            if "rejected" in e.stderr and ("fetch first" in e.stderr):
                 push_result = 1
                 self.orig_repo = self.repo
                 self.repo = self.remote_repo
+                settings.color_by = "notlocal1"
+            elif "rejected" in e.stderr and ("non-fast-forward" in e.stderr):
+                push_result = 2
+                self.orig_repo = self.repo
+                self.repo = self.remote_repo
+                settings.color_by = "notlocal2"
             else:
                 print(f"git-sim error: git push failed: {e.stderr}")
+                return
 
         head_commit = self.get_commit()
-        self.parse_commits(head_commit, make_branches_remote=(self.remote if self.remote else self.repo.remotes[0].name))
+        if push_result > 0:
+            self.parse_commits(head_commit, make_branches_remote=(self.remote if self.remote else self.repo.remotes[0].name))
+        else:
+            self.parse_commits(head_commit)
         self.recenter_frame()
         self.scale_frame()
         self.failed_push(push_result)
@@ -134,17 +144,53 @@ def failed_push(self, push_result):
                 weight=m.BOLD,
             )
             text4.move_to(text3.get_center()).shift(m.DOWN / 2)
+            texts = [text1, text2, text3, text4]
 
-            self.toFadeOut.add(text1)
-            self.toFadeOut.add(text2)
-            self.toFadeOut.add(text3)
-            self.toFadeOut.add(text4)
-            self.recenter_frame()
-            self.scale_frame()
-            if settings.animate:
-                self.play(m.AddTextLetterByLetter(text2), m.AddTextLetterByLetter(text2), m.AddTextLetterByLetter(text3), m.AddTextLetterByLetter(text4))
-            else:
-                self.add(text1, text2, text3, text4)
+        elif push_result == 2:
+            text1 = m.Text(
+                f"'git push' failed since the tip of your current branch is behind the remote.",
+                font="Monospace",
+                font_size=20,
+                color=self.fontColor,
+                weight=m.BOLD,
+            )
+            text1.move_to([self.camera.frame.get_center()[0], 5, 0])
+
+            text2 = m.Text(
+                f"Run 'git pull' (or 'git-sim pull' to simulate first) and then try again.",
+                font="Monospace",
+                font_size=20,
+                color=self.fontColor,
+                weight=m.BOLD,
+            )
+            text2.move_to(text1.get_center()).shift(m.DOWN / 2)
+
+            text3 = m.Text(
+                f"Gold commits exist are ahead of your current branch tip (need to be pulled).",
+                font="Monospace",
+                font_size=20,
+                color=m.GOLD,
+                weight=m.BOLD,
+            )
+            text3.move_to(text2.get_center()).shift(m.DOWN / 2)
+
+            text4 = m.Text(
+                f"Red commits are up to date in both local and remote branches.",
+                font="Monospace",
+                font_size=20,
+                color=m.RED,
+                weight=m.BOLD,
+            )
+            text4.move_to(text3.get_center()).shift(m.DOWN / 2)
+            texts = [text1, text2, text3, text4]
+
+        self.toFadeOut.add(*texts)
+        self.recenter_frame()
+        self.scale_frame()
+        if settings.animate:
+            self.play(*[m.AddTextLetterByLetter(t) for t in texts])
+        else:
+            self.add(*texts)