add "cherrypick"

git_sim/__main__.py

@@ -10,6 +10,7 @@
 
 import git_sim.add
 import git_sim.branch
+import git_sim.cherrypick
 import git_sim.commit
 import git_sim.log
 import git_sim.merge
@@ -30,6 +31,7 @@
 app.command()(git_sim.restore.restore)
 app.command()(git_sim.commit.commit)
 app.command()(git_sim.stash.stash)
+app.command()(git_sim.cherrypick.cherrypick)
 app.command()(git_sim.branch.branch)
 app.command()(git_sim.tag.tag)
 app.command()(git_sim.reset.reset)
@@ -138,25 +140,6 @@ def main(
 #     )
 
 
-#     subparsers = parser.add_subparsers(dest="subcommand", help="subcommand help")
-
-
-#     cherrypick = subparsers.add_parser("cherry-pick", help="cherry-pick -h")
-#     cherrypick.add_argument(
-#         "commit",
-#         nargs=1,
-#         type=str,
-#         help="The ref (branch/tag), or commit ID to simulate cherry-pick onto active branch",
-#     )
-
-# cherrypick.add_argument(
-#     "-e",
-#     "--edit",
-#     help="Specify a new commit message for the cherry-picked commit",
-#     type=str,
-# )
-
-
 #     if len(sys.argv) == 1:
 #         parser.print_help()
 #         sys.exit(1)

git_sim/cherrypick.py

@@ -0,0 +1,84 @@
+import sys
+
+import git
+import manim as m
+import typer
+
+from git_sim.animations import handle_animations
+from git_sim.git_sim_base_command import GitSimBaseCommand
+from git_sim.settings import Settings
+
+
+class CherryPick(GitSimBaseCommand):
+    def __init__(self, commit: str, edit: str):
+        super().__init__()
+        self.commit = commit
+        self.edit = edit
+
+        try:
+            git.repo.fun.rev_parse(self.repo, self.commit)
+        except git.exc.BadName:
+            print(
+                "git-sim error: '"
+                + self.commit
+                + "' is not a valid Git ref or identifier."
+            )
+            sys.exit(1)
+
+        if self.commit in [branch.name for branch in self.repo.heads]:
+            self.selected_branches.append(self.commit)
+
+        try:
+            self.selected_branches.append(self.repo.active_branch.name)
+        except TypeError:
+            pass
+
+    def construct(self):
+        substring = ""
+        if self.edit:
+            substring = f' -e "{self.edit}"'
+        print(f"{Settings.INFO_STRING} cherrypick {self.commit}{substring}")
+
+        if self.repo.active_branch.name in self.repo.git.branch(
+            "--contains", self.commit
+        ):
+            print(
+                "git-sim error: Commit '"
+                + self.commit
+                + "' is already included in the history of active branch '"
+                + self.repo.active_branch.name
+                + "'."
+            )
+            sys.exit(1)
+
+        self.show_intro()
+        self.get_commits()
+        self.parse_commits(self.commits[0])
+        self.orig_commits = self.commits
+        self.get_commits(start=self.commit)
+        self.parse_commits(self.commits[0], shift=4 * m.DOWN)
+        self.center_frame_on_commit(self.orig_commits[0])
+        self.setup_and_draw_parent(
+            self.orig_commits[0],
+            self.edit if self.edit else self.commits[0].message,
+        )
+        self.draw_arrow_between_commits(self.commits[0].hexsha, "abcdef")
+        self.recenter_frame()
+        self.scale_frame()
+        self.reset_head_branch("abcdef")
+        self.fadeout()
+        self.show_outro()
+
+
+def cherrypick(
+    commit: str = typer.Argument(
+        ...,
+        help="The ref (branch/tag), or commit ID to simulate cherry-pick onto active branch",
+    ),
+    edit: str = typer.Option(
+        default=None,
+        help="Specify a new commit message for the cherry-picked commit",
+    ),
+):
+    scene = CherryPick(commit=commit, edit=edit)
+    handle_animations(scene=scene)