From 1a64db37736b23c4e49114afa9378c7530cdcaa1 Mon Sep 17 00:00:00 2001 From: Jacob Stopak Date: Fri, 31 Mar 2023 20:52:26 -0700 Subject: [PATCH 1/3] Hide first tag in merges with conflicts Signed-off-by: Jacob Stopak --- git_sim/git_sim_base_command.py | 3 ++- git_sim/merge.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/git_sim/git_sim_base_command.py b/git_sim/git_sim_base_command.py index 22f5e26..7c8498d 100644 --- a/git_sim/git_sim_base_command.py +++ b/git_sim/git_sim_base_command.py @@ -53,6 +53,7 @@ def __init__(self): self.logo = m.ImageMobject(settings.logo) self.logo.width = 3 + self.hide_first_tag = settings.hide_first_tag self.fill_opacity = 0.25 self.ref_fill_opacity = 0.25 @@ -477,7 +478,7 @@ def draw_branch(self, commit, i, make_branches_remote=False): def draw_tag(self, commit, i): x = 0 - if settings.hide_first_tag and i == 0: + if self.hide_first_tag and i == 0: return for tag in self.repo.tags: diff --git a/git_sim/merge.py b/git_sim/merge.py index cb4761c..6f5b480 100644 --- a/git_sim/merge.py +++ b/git_sim/merge.py @@ -113,6 +113,7 @@ def construct(self): self.repo.active_branch.name, self.branch ) if merge_result: + self.hide_first_tag = True self.parse_commits(head_commit) self.recenter_frame() self.scale_frame() From b4ae559249d2c85841aaeed6d238194188c350bd Mon Sep 17 00:00:00 2001 From: Jacob Stopak Date: Fri, 31 Mar 2023 20:56:21 -0700 Subject: [PATCH 2/3] Fix frame centering issues with checkout and switch subcommands Signed-off-by: Jacob Stopak --- git_sim/checkout.py | 2 ++ git_sim/switch.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/git_sim/checkout.py b/git_sim/checkout.py index b03746e..9c6d44b 100644 --- a/git_sim/checkout.py +++ b/git_sim/checkout.py @@ -94,6 +94,8 @@ def construct(self): else: self.parse_commits(branch_commit) self.draw_ref(branch_commit, self.topref) + self.recenter_frame() + self.scale_frame() elif self.is_descendant: self.parse_commits(branch_commit) diff --git a/git_sim/switch.py b/git_sim/switch.py index 51863b5..e265585 100644 --- a/git_sim/switch.py +++ b/git_sim/switch.py @@ -94,6 +94,8 @@ def construct(self): else: self.parse_commits(branch_commit) self.draw_ref(branch_commit, self.topref) + self.recenter_frame() + self.scale_frame() elif self.is_descendant: self.parse_commits(branch_commit) From cc116cbb8d250f7f2fd0d3183e6c2965f5821fd3 Mon Sep 17 00:00:00 2001 From: Jacob Stopak Date: Fri, 31 Mar 2023 20:57:31 -0700 Subject: [PATCH 3/3] Bump version to 0.2.9 Signed-off-by: Jacob Stopak --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7ffb1e8..a4c8295 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="git-sim", - version="0.2.8", + version="0.2.9", author="Jacob Stopak", author_email="jacob@initialcommit.io", description="Simulate Git commands on your own repos by generating an image (default) or video visualization depicting the command's behavior.",