Add -d flag and commit specification for tag subcommand

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

Author: initialcommit-io

src/git_sim/commands.py

@@ -399,10 +399,19 @@ def switch(
 def tag(
     name: str = typer.Argument(
         ...,
-        help="The name of the new tag",
-    )
+        help="The name of the tag",
+    ),
+    commit: str = typer.Argument(
+        default=None,
+        help="The commit to tag",
+    ),
+    d: bool = typer.Option(
+        False,
+        "-d",
+        help="Delete the specified tag",
+    ),
 ):
     from git_sim.tag import Tag
 
-    scene = Tag(name=name)
+    scene = Tag(name=name, commit=commit, d=d)
     handle_animations(scene=scene)

src/git_sim/git_sim_base_command.py

@@ -25,6 +25,7 @@ def __init__(self):
         self.fontColor = m.BLACK if settings.light_mode else m.WHITE
         self.drawnCommits = {}
         self.drawnRefs = {}
+        self.drawnRefsByCommit = {}
         self.drawnCommitIds = {}
         self.toFadeOut = m.Group()
         self.prevRef = None
@@ -455,6 +456,7 @@ def draw_head(self, commit, i, commitId):
 
             self.toFadeOut.add(head)
             self.drawnRefs["HEAD"] = head
+            self.add_ref_to_drawn_refs_by_commit(commit.hexsha, head)
             self.prevRef = head
 
             if i == 0 and self.first_parse:
@@ -518,6 +520,7 @@ def draw_branch(self, commit, i, make_branches_remote=False):
 
                 self.toFadeOut.add(fullbranch)
                 self.drawnRefs[branch] = fullbranch
+                self.add_ref_to_drawn_refs_by_commit(commit.hexsha, fullbranch)
 
                 if i == 0 and self.first_parse:
                     self.topref = self.prevRef
@@ -566,7 +569,8 @@ def draw_tag(self, commit, i):
                         self.add(fulltag)
 
                     self.toFadeOut.add(fulltag)
-                    self.drawnRefs[tag] = fulltag
+                    self.drawnRefs[tag.name] = fulltag
+                    self.add_ref_to_drawn_refs_by_commit(commit.hexsha, fulltag)
 
                     if i == 0 and self.first_parse:
                         self.topref = self.prevRef
@@ -1353,6 +1357,12 @@ def check_all_dark(self):
             return True
         return False
 
+    def add_ref_to_drawn_refs_by_commit(self, hexsha, ref):
+        try:
+            self.drawnRefsByCommit[hexsha].append(ref)
+        except KeyError:
+            self.drawnRefsByCommit[hexsha] = [ref,]
+
 
 class DottedLine(m.Line):
     def __init__(self, *args, dot_spacing=0.4, dot_kwargs={}, **kwargs):

src/git_sim/tag.py

@@ -1,14 +1,42 @@
+import sys
 import manim as m
 
 from git_sim.git_sim_base_command import GitSimBaseCommand
 from git_sim.settings import settings
 
 
 class Tag(GitSimBaseCommand):
-    def __init__(self, name: str):
+    def __init__(self, name: str, commit: str, d: bool):
         super().__init__()
         self.name = name
-        self.cmd += f"{type(self).__name__.lower()} {self.name}"
+        self.commit = commit
+        self.d = d
+
+        if self.d:
+            if self.commit:
+                print(
+                    "git-sim error: can't specify commit '"
+                    + self.commit
+                    + "', when using -d flag"
+                )
+                sys.exit(1)
+            if self.name not in self.repo.tags:
+                print(
+                    "git-sim error: can't delete tag '"
+                    + self.name
+                    + "', tag doesn't exist"
+                )
+                sys.exit(1)
+        else:
+            if self.name in self.repo.tags:
+                print(
+                    "git-sim error: can't create tag '"
+                    + self.name
+                    + "', tag already exists"
+                )
+                sys.exit(1)
+
+        self.cmd += f"{type(self).__name__.lower()}{' -d' if self.d else ''}{' self.commit' if self.commit else ''} {self.name}"
 
     def construct(self):
         if not settings.stdout and not settings.output_only_path and not settings.quiet:
@@ -19,32 +47,56 @@ def construct(self):
         self.parse_all()
         self.center_frame_on_commit(self.get_commit())
 
-        tagText = m.Text(
-            self.name,
-            font=self.font,
-            font_size=20,
-            color=self.fontColor,
-        )
-        tagRec = m.Rectangle(
-            color=m.YELLOW,
-            fill_color=m.YELLOW,
-            fill_opacity=0.25,
-            height=0.4,
-            width=tagText.width + 0.25,
-        )
-
-        tagRec.next_to(self.topref, m.UP)
-        tagText.move_to(tagRec.get_center())
-
-        fulltag = m.VGroup(tagRec, tagText)
-
-        if settings.animate:
-            self.play(m.Create(fulltag), run_time=1 / settings.speed)
-        else:
-            self.add(fulltag)
+        if not self.d:
+            tagText = m.Text(
+                self.name,
+                font=self.font,
+                font_size=20,
+                color=self.fontColor,
+            )
+            tagRec = m.Rectangle(
+                color=m.YELLOW,
+                fill_color=m.YELLOW,
+                fill_opacity=0.25,
+                height=0.4,
+                width=tagText.width + 0.25,
+            )
+            
+            if self.commit:
+                commit = self.repo.commit(self.commit)
+                try:
+                    tagRec.next_to(self.drawnRefsByCommit[commit.hexsha][-1], m.UP)
+                except KeyError:
+                    try:
+                        tagRec.next_to(self.drawnCommitIds[commit.hexsha], m.UP)
+                    except KeyError:
+                        print(
+                            "git-sim error: can't create tag '"
+                            + self.name
+                            + "' on commit '"
+                            + self.commit
+                            + "', commit not in frame"
+                        )
+                        sys.exit(1)
+            else:
+                tagRec.next_to(self.topref, m.UP)
+            tagText.move_to(tagRec.get_center())
 
-        self.toFadeOut.add(tagRec, tagText)
-        self.drawnRefs[self.name] = fulltag
+            fulltag = m.VGroup(tagRec, tagText)
+
+            if settings.animate:
+                self.play(m.Create(fulltag), run_time=1 / settings.speed)
+            else:
+                self.add(fulltag)
+
+            self.toFadeOut.add(tagRec, tagText)
+            self.drawnRefs[self.name] = fulltag
+        else:
+            fulltag = self.drawnRefs[self.name]
+            if settings.animate:
+                self.play(m.Uncreate(fulltag), run_time=1 / settings.speed)
+            else:
+                self.remove(fulltag)
 
         self.recenter_frame()
         self.scale_frame()