Update push subcommand output to clarify pull-before-push

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

Author: initialcommit-io

git_sim/git_sim_base_command.py

@@ -78,6 +78,7 @@ def parse_commits(
         i=0,
         prevCircle=None,
         shift=numpy.array([0.0, 0.0, 0.0]),
+        make_branches_remote=False,
     ):
         commit = commit or self.get_commit()
 
@@ -91,7 +92,7 @@ def parse_commits(
             if commit != "dark":
                 if not hide_refs and isNewCommit:
                     self.draw_head(commit, i, commitId)
-                    self.draw_branch(commit, i)
+                    self.draw_branch(commit, i, make_branches_remote=make_branches_remote)
                     self.draw_tag(commit, i)
                 if (
                     not isinstance(arrow, m.CurvedArrow)
@@ -348,7 +349,7 @@ def draw_head(self, commit, i, commitId):
             if i == 0 and self.first_parse:
                 self.topref = self.prevRef
 
-    def draw_branch(self, commit, i):
+    def draw_branch(self, commit, i, make_branches_remote=False):
         x = 0
 
         remote_tracking_branches = self.get_remote_tracking_branches()
@@ -369,7 +370,7 @@ def draw_branch(self, commit, i):
                 and commit.hexsha == remote_tracking_branches[branch]
             ):
                 branchText = m.Text(
-                    branch, font="Monospace", font_size=20, color=self.fontColor
+                    branch if not make_branches_remote else make_branches_remote + "/" + branch, font="Monospace", font_size=20, color=self.fontColor
                 )
                 branchRec = m.Rectangle(
                     color=m.GREEN,
@@ -1137,6 +1138,13 @@ def color_by(self, offset=0):
         elif settings.color_by == "branch":
             pass
 
+        elif settings.color_by == "notlocal":
+            for commit_id in self.drawnCommits:
+                try:
+                    self.orig_repo.commit(commit_id)
+                except ValueError:
+                    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,6 +22,7 @@ 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 + "'")
@@ -66,52 +67,76 @@ def construct(self):
             self.repo.remotes[0].set_url(new_dir2)
 
         # Push the local clone into the local clone of the remote repo
+        push_result = 0
         try:
             self.repo.git.push(self.remote, self.branch)
-            head_commit = self.get_commit()
-            self.parse_commits(head_commit)
-            self.recenter_frame()
-            self.scale_frame()
-
-        # But if we get merge conflicts...
+        # If push fails...
         except git.GitCommandError as e:
-            if "CONFLICT" in e.stdout:
-                # Restrict to default number of commits since we'll show the table/zones
-                self.n = self.n_default 
-
-                # Get list of conflicted filenames
-                self.conflicted_files = re.findall(r"Merge conflict in (.+)", e.stdout)
-
-                head_commit = self.get_commit()
-                self.parse_commits(head_commit)
-                self.recenter_frame()
-                self.scale_frame()
-
-                # Show the conflicted files names in the table/zones
-                self.vsplit_frame()
-                self.setup_and_draw_zones(
-                    first_column_name="----",
-                    second_column_name="Conflicted files",
-                    third_column_name="----",
-                )
-            else:
-                print(f"git-sim error: git push failed: {e}")
-                self.repo.git.clear_cache()
-                shutil.rmtree(new_dir, onerror=del_rw)
-                shutil.rmtree(new_dir2, onerror=del_rw)
-                sys.exit(1)
-
+            print(f"git-sim error: git push failed: {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
+
+        head_commit = self.get_commit()
+        self.parse_commits(head_commit, make_branches_remote=(self.remote if self.remote else self.repo.remotes[0].name))
+        self.recenter_frame()
+        self.scale_frame()
+        self.failed_push(push_result)
         self.color_by()
         self.fadeout()
         self.show_outro()
 
         # Unlink the program from the filesystem
         self.repo.git.clear_cache()
+        if self.orig_repo:
+            self.orig_repo.git.clear_cache()
 
         # Delete the local clones
         shutil.rmtree(new_dir, onerror=del_rw)
         shutil.rmtree(new_dir2, onerror=del_rw)
 
+    def failed_push(self, push_result):
+        if push_result == 1:
+            text1 = m.Text(
+                f"'git push' failed since remote has commits that don't exist locally, run 'git pull' and try again",
+                font="Monospace",
+                font_size=20,
+                color=self.fontColor,
+                weight=m.BOLD,
+            )
+            text1.move_to([self.camera.frame.get_center()[0], 4, 0])
+
+            text2 = m.Text(
+                f"Gold commits exist in remote repo, but not locally (need to be pulled)",
+                font="Monospace",
+                font_size=20,
+                color=m.GOLD,
+                weight=m.BOLD,
+            )
+            text2.move_to(text1.get_center()).shift(m.DOWN / 2)
+
+            text3 = m.Text(
+                f"Red commits exist in both local and remote repos",
+                font="Monospace",
+                font_size=20,
+                color=m.RED,
+                weight=m.BOLD,
+            )
+            text3.move_to(text2.get_center()).shift(m.DOWN / 2)
+
+            self.toFadeOut.add(text1)
+            self.toFadeOut.add(text2)
+            self.toFadeOut.add(text3)
+            self.recenter_frame()
+            self.scale_frame()
+            if settings.animate:
+                self.play(m.AddTextLetterByLetter(text1), m.AddTextLetterByLetter(text2), m.AddTextLetterByLetter(text3))
+            else:
+                self.add(text1, text2, text3)
+
+
+
 def del_rw(action, name, exc):
     os.chmod(name, stat.S_IWRITE)
     os.remove(name)