Extend --all as a global flag to subcommands that don't show table/zones

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

Author: initialcommit-io

README.md

@@ -133,6 +133,8 @@ $ git-sim [global options] <subcommand> [subcommand options]
 
 The `[global options]` apply to the overarching `git-sim` simulation itself, including:
 
+`-n <number>`: Number of commits to display from each branch head.  
+`--all`: Display all local branches in the log output.  
 `--light-mode`: Use a light mode color scheme instead of default dark mode.  
 `--animate`: Instead of outputting a static image, animate the Git command behavior in a .mp4 video.  
 `--media-dir`: The path at which to store the simulated output media files.  
@@ -160,9 +162,11 @@ The `[subcommand options]` are like regular Git options specific to the specifie
 The following is a list of Git commands that can be simulated and their corresponding options/flags.
 
 ### git log
-Usage: `git-sim log`
+Usage: `git-sim log [-n <number>] [--all]`
 
 - Simulated output will show the most recent 5 commits on the active branch by default
+- Use `-n <number>` to set number of commits to display from each branch head
+- Set `--all` to display all local branches in the log output
 
 ![git-sim-log_01-05-23_22-02-39](https://user-images.githubusercontent.com/49353917/210940300-aadd14c6-72ab-4529-a1be-b494ed5dd4c9.jpg)
 

git_sim/__main__.py

@@ -120,6 +120,10 @@ def main(
         settings.hide_merged_branches,
         help="Hide commits from merged branches, i.e. only display mainline commits",
     ),
+    all: bool = typer.Option(
+        settings.all,
+        help="Display all local branches in the log output",
+    ),
 ):
     settings.animate = animate
     settings.n = n
@@ -142,6 +146,7 @@ def main(
     settings.stdout = stdout
     settings.invert_branches = invert_branches
     settings.hide_merged_branches = hide_merged_branches
+    settings.all = all
 
     if sys.platform == "linux" or sys.platform == "darwin":
         repo_name = git.repo.Repo(

git_sim/branch.py

@@ -17,8 +17,8 @@ def construct(self):
 
         self.show_intro()
         self.parse_commits()
-        self.recenter_frame()
-        self.scale_frame()
+        self.parse_all()
+        self.center_frame_on_commit(self.get_commit())
 
         branchText = m.Text(
             self.name,
@@ -47,6 +47,8 @@ def construct(self):
         self.toFadeOut.add(branchRec, branchText)
         self.drawnRefs[self.name] = fullbranch
 
+        self.recenter_frame()
+        self.scale_frame()
         self.fadeout()
         self.show_outro()
 

git_sim/cherrypick.py

@@ -57,6 +57,7 @@ def construct(self):
         self.parse_commits(head_commit)
         cherry_picked_commit = self.get_commit(self.commit)
         self.parse_commits(cherry_picked_commit, shift=4 * m.DOWN)
+        self.parse_all()
         self.center_frame_on_commit(head_commit)
         self.setup_and_draw_parent(
             head_commit,

git_sim/git_sim_base_command.py

@@ -19,18 +19,17 @@ def __init__(self):
         self.drawnCommits = {}
         self.drawnRefs = {}
         self.drawnCommitIds = {}
-        self.zoomOuts = 0
         self.toFadeOut = m.Group()
-        self.trimmed = False
         self.prevRef = None
         self.topref = None
         self.n_default = settings.n_default
         self.n = settings.n
         self.n_orig = self.n
         self.selected_branches = []
-        self.stop = False
         self.zone_title_offset = 2.6 if platform.system() == "Windows" else 2.6
         self.arrow_map = []
+        self.all = settings.all
+        self.first_parse = True
 
         self.logo = m.ImageMobject(settings.logo)
         self.logo.width = 3
@@ -97,6 +96,7 @@ def parse_commits(
                 if i == 0 and len(self.drawnRefs) < 2:
                     self.draw_dark_ref()
 
+            self.first_parse = False
             if i < self.n:
                 i += 1
                 commitParents = list(commit.parents)
@@ -110,6 +110,11 @@ def parse_commits(
                         for p in range(len(commitParents)):
                             self.parse_commits(commitParents[p], i, circle)
 
+    def parse_all(self):
+        if self.all:
+            for branch in self.get_nonparent_branch_names():
+                self.parse_commits(self.get_commit(branch.name))
+
     def show_intro(self):
         if settings.animate and settings.show_intro:
             self.add(self.logo)
@@ -195,7 +200,7 @@ def draw_commit(self, commit, i, prevCircle, shift=numpy.array([0.0, 0.0, 0.0]))
             )
 
         while any((circle.get_center() == c).all() for c in self.get_centers()):
-            circle.next_to(circle, m.DOWN, buff=3.5)
+            circle.shift(m.DOWN * 4)
 
         isNewCommit = commit.hexsha not in self.drawnCommits
 
@@ -324,7 +329,7 @@ def draw_head(self, commit, i, commitId):
             self.drawnRefs["HEAD"] = head
             self.prevRef = head
 
-            if i == 0:
+            if i == 0 and self.first_parse:
                 self.topref = self.prevRef
 
     def draw_branch(self, commit, i):
@@ -340,8 +345,6 @@ def draw_branch(self, commit, i):
             branches.insert(0, branches.pop(branches.index(selected_branch)))
 
         for branch in branches:
-            # 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 self.is_remote_tracking_branch(branch)  # local branch
                 and commit.hexsha == self.repo.heads[branch].commit.hexsha
@@ -375,7 +378,7 @@ def draw_branch(self, commit, i):
                 self.toFadeOut.add(branchRec, branchText)
                 self.drawnRefs[branch] = fullbranch
 
-                if i == 0:
+                if i == 0 and self.first_parse:
                     self.topref = self.prevRef
 
                 x += 1
@@ -421,7 +424,7 @@ def draw_tag(self, commit, i):
 
                     self.toFadeOut.add(tagRec, tagText)
 
-                    if i == 0:
+                    if i == 0 and self.first_parse:
                         self.topref = self.prevRef
 
                     x += 1
@@ -925,7 +928,7 @@ def draw_ref(self, commit, i, top, text="HEAD", color=m.BLUE):
         self.drawnRefs[text] = ref
         self.prevRef = ref
 
-        if i == 0:
+        if i == 0 and self.first_parse:
             self.topref = self.prevRef
 
     def draw_dark_ref(self):

git_sim/log.py

@@ -20,22 +20,27 @@ def __init__(self, ctx: typer.Context, n: int, all: bool):
         self.n = n
         self.n_orig = self.n
 
+        all_command = ctx.parent.params.get("all")
+        self.all_subcommand = all
+        if self.all_subcommand:
+            all = self.all_subcommand
+        else:
+            all = all_command
+        self.all = all
+
         try:
             self.selected_branches.append(self.repo.active_branch.name)
         except TypeError:
             pass
-        self.all = all
 
     def construct(self):
         if not settings.stdout:
             print(
-                f"{settings.INFO_STRING} {type(self).__name__.lower()}{' --all' if self.all else ''}{' -n ' + str(self.n) if self.n_subcommand else ''}"
+                f"{settings.INFO_STRING} {type(self).__name__.lower()}{' --all' if self.all_subcommand else ''}{' -n ' + str(self.n) if self.n_subcommand else ''}"
             )
         self.show_intro()
         self.parse_commits()
-        if self.all:
-            for branch in self.get_nonparent_branch_names():
-                self.parse_commits(self.get_commit(branch.name))
+        self.parse_all()
         self.recenter_frame()
         self.scale_frame()
         self.fadeout()
@@ -45,13 +50,13 @@ def construct(self):
 def log(
     ctx: typer.Context,
     n: int = typer.Option(
-        settings.n_subcommand,
+        None,
         "-n",
         help="Number of commits to display from branch heads",
-        min=1,
     ),
     all: bool = typer.Option(
         False,
+        "--all",
         help="Display all local branches in the log output",
     ),
 ):

git_sim/merge.py

@@ -70,6 +70,7 @@ def construct(self):
 
         if self.ff:
             self.parse_commits(branch_commit)
+            self.parse_all()
             reset_head_to = branch_commit.hexsha
             shift = numpy.array([0.0, 0.6, 0.0])
 
@@ -95,6 +96,7 @@ def construct(self):
         else:
             self.parse_commits(head_commit)
             self.parse_commits(branch_commit, shift=4 * m.DOWN)
+            self.parse_all()
             self.center_frame_on_commit(head_commit)
             self.setup_and_draw_parent(
                 head_commit,

git_sim/rebase.py

@@ -76,6 +76,7 @@ def construct(self):
                 reached_base = True
 
         self.parse_commits(head_commit, shift=4 * m.DOWN)
+        self.parse_all()
         self.center_frame_on_commit(branch_commit)
 
         to_rebase = []

git_sim/settings.py

@@ -21,7 +21,6 @@ class Settings(BaseSettings):
     auto_open = True
     n_default = 5
     n = 5
-    n_subcommand: Union[int, None] = None
     files: Union[List[pathlib.Path], None] = None
     hide_first_tag = False
     img_format: ImgFormat = ImgFormat.jpg
@@ -43,6 +42,7 @@ class Settings(BaseSettings):
     stdout = False
     invert_branches = False
     hide_merged_branches = False
+    all = False
 
     class Config:
         env_prefix = "git_sim_"

git_sim/tag.py

@@ -17,8 +17,8 @@ def construct(self):
 
         self.show_intro()
         self.parse_commits()
-        self.recenter_frame()
-        self.scale_frame()
+        self.parse_all()
+        self.center_frame_on_commit(self.get_commit())
 
         tagText = m.Text(
             self.name,
@@ -45,7 +45,10 @@ def construct(self):
             self.add(fulltag)
 
         self.toFadeOut.add(tagRec, tagText)
+        self.drawnRefs[self.name] = fulltag
 
+        self.recenter_frame()
+        self.scale_frame()
         self.fadeout()
         self.show_outro()