Add global flags for --invert-branches and --hide-merged-chains

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

Author: initialcommit-io

README.md

@@ -139,7 +139,9 @@ The `[global options]` apply to the overarching `git-sim` simulation itself, inc
 `-d`: Disable the automatic opening of the image/video file after generation. Useful to avoid errors in console mode with no GUI.  
 `--reverse, -r`: Display commit history in the reverse direction.  
 `--img-format`: Output format for the image file, i.e. `jpg` or `png`. Default output format is `jpg`.  
-`--stdout`: Write raw image data to stdout while suppressing all other program output.
+`--stdout`: Write raw image data to stdout while suppressing all other program output.  
+`--invert-branches`: Invert positioning of branches by reversing order of multiple parents where applicable.  
+`--hide-merged-chains`: Hide commits from merged branches, i.e. only display mainline commits.
 
 Animation-only global options (to be used in conjunction with `--animate`):
 

git_sim/__main__.py

@@ -107,6 +107,14 @@ def main(
         settings.stdout,
         help="Write raw image data to stdout while suppressing all other program output",
     ),
+    invert_branches: bool = typer.Option(
+        settings.invert_branches,
+        help="Invert positioning of branches by reversing order of multiple parents where applicable",
+    ),
+    hide_merged_chains: bool = typer.Option(
+        settings.hide_merged_chains,
+        help="Hide commits from merged branches, i.e. only display mainline commits",
+    ),
 ):
     settings.animate = animate
     settings.auto_open = auto_open
@@ -126,6 +134,8 @@ def main(
     settings.title = title
     settings.video_format = video_format
     settings.stdout = stdout
+    settings.invert_branches = invert_branches
+    settings.hide_merged_chains = hide_merged_chains
 
     if sys.platform == "linux" or sys.platform == "darwin":
         repo_name = git.repo.Repo(

git_sim/log.py

@@ -73,14 +73,14 @@ def parse_commits(
                 i += 1
                 commitParents = list(commit.parents)
                 if len(commitParents) > 0:
-                    #    if ( self.args.invert_branches ):
-                    #        commitParents.reverse()
-
-                    #    if ( self.args.hide_merged_chains ):
-                    #        self.parseCommits(commitParents[0], i+1,  prevCircle, toFadeOut)
-                    # else:
-                    for p in range(len(commitParents)):
-                        self.parse_commits(commitParents[p], i, circle)
+                    if settings.invert_branches:
+                        commitParents.reverse()
+
+                    if settings.hide_merged_chains:
+                        self.parse_commits(commitParents[0], i, circle)
+                    else:
+                        for p in range(len(commitParents)):
+                            self.parse_commits(commitParents[p], i, circle)
 
     def draw_commit(self, commit, prevCircle, shift=numpy.array([0.0, 0.0, 0.0])):
         if commit == "dark":

git_sim/settings.py

@@ -39,6 +39,8 @@ class Settings(BaseSettings):
     title = "Git-Sim, by initialcommit.com"
     video_format: VideoFormat = VideoFormat.mp4
     stdout = False
+    invert_branches = False
+    hide_merged_chains = False
 
     class Config:
         env_prefix = "git_sim_"