Allow specification of remote tracking branches in merge and display them as branches in other commands

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

Author: initialcommit-io

git_sim/git_sim_base_command.py

@@ -297,13 +297,26 @@ def draw_head(self, commit, commitId):
 
     def draw_branch(self, commit):
         x = 0
-        branches = [branch.name for branch in self.repo.heads]
+
+        remote_tracking_branches = self.get_remote_tracking_branches()
+
+        branches = [branch.name for branch in self.repo.heads] + list(
+            remote_tracking_branches.keys()
+        )
+
         for selected_branch in self.selected_branches:
             branches.insert(0, branches.pop(branches.index(selected_branch)))
 
         for branch in branches:
-
-            if commit.hexsha == self.repo.heads[branch].commit.hexsha:
+            # Use forward slash to check if branch is local or remote tracking
+            # and draw the branch label if its hexsha matches the current commit
+            if (
+                "/" not in branch  # local branch
+                and commit.hexsha == self.repo.heads[branch].commit.hexsha
+            ) or (
+                "/" in branch  # remote tracking branch
+                and commit.hexsha == remote_tracking_branches[branch]
+            ):
                 branchText = m.Text(
                     branch, font="Monospace", font_size=20, color=self.scene.fontColor
                 )
@@ -924,6 +937,15 @@ def draw_dark_ref(self):
     def trim_path(self, path):
         return (path[:5] + "..." + path[-15:]) if len(path) > 20 else path
 
+    def get_remote_tracking_branches(self):
+        remote_refs = [remote.refs for remote in self.repo.remotes]
+        remote_tracking_branches = {}
+        for reflist in remote_refs:
+            for ref in reflist:
+                if "HEAD" not in ref.name and ref.name not in remote_tracking_branches:
+                    remote_tracking_branches[ref.name] = ref.commit.hexsha
+        return remote_tracking_branches
+
 
 class DottedLine(m.Line):
     def __init__(self, *args, dot_spacing=0.4, dot_kwargs={}, **kwargs):

git_sim/git_sim_merge.py

@@ -56,10 +56,17 @@ def execute(self):
         self.orig_commits = self.commits
         self.get_commits(start=self.scene.args.branch[0])
 
-        if self.scene.args.branch[0] in self.repo.git.branch(
-            "--contains", self.orig_commits[0].hexsha
-        ):
-            self.ff = True
+        # Use forward slash to determine if supplied branch arg is local or remote tracking branch
+        if "/" not in self.scene.args.branch[0]:
+            if self.scene.args.branch[0] in self.repo.git.branch(
+                "--contains", self.orig_commits[0].hexsha
+            ):
+                self.ff = True
+        else:
+            if self.scene.args.branch[0] in self.repo.git.branch(
+                "-r", "--contains", self.orig_commits[0].hexsha
+            ):
+                self.ff = True
 
         if self.ff:
             self.get_commits(start=self.scene.args.branch[0])
@@ -83,7 +90,7 @@ def execute(self):
                 )
                 self.draw_ref(
                     self.commits[0],
-                    self.drawnRefs["HEAD"] if self.scene.args.no_ff else self.topref,
+                    self.drawnRefs["HEAD"],
                     text=self.repo.active_branch.name,
                     color=m.GREEN,
                 )