Rename --hide-merged-chains to --hide-merged-branches

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

Author: initialcommit-io

README.md

@@ -141,7 +141,7 @@ The `[global options]` apply to the overarching `git-sim` simulation itself, inc
 `--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.  
 `--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.
+`--hide-merged-branches`: 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

@@ -116,8 +116,8 @@ def main(
         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,
+    hide_merged_branches: bool = typer.Option(
+        settings.hide_merged_branches,
         help="Hide commits from merged branches, i.e. only display mainline commits",
     ),
 ):
@@ -141,7 +141,7 @@ def main(
     settings.video_format = video_format
     settings.stdout = stdout
     settings.invert_branches = invert_branches
-    settings.hide_merged_chains = hide_merged_chains
+    settings.hide_merged_branches = hide_merged_branches
 
     if sys.platform == "linux" or sys.platform == "darwin":
         repo_name = git.repo.Repo(

git_sim/add.py

@@ -16,7 +16,7 @@ def __init__(self, files: List[str]):
         self.hide_first_tag = True
         self.allow_no_commits = True
         self.files = files
-        settings.hide_merged_chains = True
+        settings.hide_merged_branches = True
 
         try:
             self.selected_branches.append(self.repo.active_branch.name)

git_sim/commit.py

@@ -19,7 +19,7 @@ def __init__(self, message: str, amend: bool):
         self.n = self.n_default
 
         self.hide_first_tag = True
-        settings.hide_merged_chains = True
+        settings.hide_merged_branches = True
 
         try:
             self.selected_branches.append(self.repo.active_branch.name)

git_sim/git_sim_base_command.py

@@ -104,7 +104,7 @@ def parse_commits(
                     if settings.invert_branches:
                         commitParents.reverse()
 
-                    if settings.hide_merged_chains:
+                    if settings.hide_merged_branches:
                         self.parse_commits(commitParents[0], i, circle)
                     else:
                         for p in range(len(commitParents)):

git_sim/reset.py

@@ -24,7 +24,7 @@ def __init__(
         super().__init__()
         self.commit = commit
         self.mode = mode
-        settings.hide_merged_chains = True
+        settings.hide_merged_branches = True
 
         try:
             self.resetTo = git.repo.fun.rev_parse(self.repo, self.commit)

git_sim/restore.py

@@ -14,7 +14,7 @@ def __init__(self, files: List[str]):
         super().__init__()
         self.hide_first_tag = True
         self.files = files
-        settings.hide_merged_chains = True
+        settings.hide_merged_branches = True
 
         try:
             self.selected_branches.append(self.repo.active_branch.name)

git_sim/revert.py

@@ -27,7 +27,7 @@ def __init__(self, commit: str):
 
         self.n_default = 4
         self.n = self.n_default
-        settings.hide_merged_chains = True
+        settings.hide_merged_branches = True
 
         self.hide_first_tag = True
         self.zone_title_offset += 0.1

git_sim/settings.py

@@ -42,7 +42,7 @@ class Settings(BaseSettings):
     video_format: VideoFormat = VideoFormat.mp4
     stdout = False
     invert_branches = False
-    hide_merged_chains = False
+    hide_merged_branches = False
 
     class Config:
         env_prefix = "git_sim_"

git_sim/stash.py

@@ -23,7 +23,7 @@ def __init__(self, files: List[str], command: StashSubCommand):
         self.files = files
         self.no_files = True if not self.files else False
         self.command = command
-        settings.hide_merged_chains = True
+        settings.hide_merged_branches = True
 
         try:
             self.selected_branches.append(self.repo.active_branch.name)

git_sim/status.py

@@ -10,7 +10,7 @@ def __init__(self):
             self.selected_branches.append(self.repo.active_branch.name)
         except TypeError:
             pass
-        settings.hide_merged_chains = True
+        settings.hide_merged_branches = True
 
     def construct(self):
         if not settings.stdout: