refactor(release): modify reset_hard signature to enforce keyword argument

- Renames the parameter to .
- Requires it to be passed as a keyword argument.
- Updates all callers and tests.

Author: rickeylev

tests/tools/private/release/git_test.py

@@ -41,7 +41,7 @@ def test_checkout_track_remote_existing_branch(
         self.mock_run_git.assert_called_once_with(
             "checkout", "my-branch", capture_output=False
         )
-        mock_reset_hard.assert_called_once_with("origin/my-branch")
+        mock_reset_hard.assert_called_once_with(reset_to="origin/my-branch")
 
 
 class GitFetchTest(unittest.TestCase):
@@ -165,5 +165,25 @@ def test_apply_check_conflict(self):
         self.assertFalse(result)
 
 
+class GitResetHardTest(unittest.TestCase):
+    def setUp(self):
+        self.git = Git(".")
+        self.patcher = patch.object(self.git, "_run_git")
+        self.mock_run_git = self.patcher.start()
+        self.addCleanup(self.patcher.stop)
+
+    def test_reset_hard_default(self):
+        self.git.reset_hard()
+        self.mock_run_git.assert_called_once_with(
+            "reset", "--hard", "HEAD", capture_output=False
+        )
+
+    def test_reset_hard_custom(self):
+        self.git.reset_hard(reset_to="my-commit")
+        self.mock_run_git.assert_called_once_with(
+            "reset", "--hard", "my-commit", capture_output=False
+        )
+
+
 if __name__ == "__main__":
     unittest.main()

tests/tools/private/release/process_backports_test.py

@@ -193,7 +193,7 @@ def mock_resolve(items):
         # Verify reset_hard was called to reset the existing branch to main
         self.mock_git.reset_hard.assert_has_calls(
             [
-                call("main"),
+                call(reset_to="main"),
             ]
         )
         self.mock_git.cherry_pick.assert_called_once_with("abcdef12")
@@ -315,8 +315,8 @@ def mock_resolve(items):
         )
         self.mock_git.reset_hard.assert_has_calls(
             [
-                call("12345678"),
-                call("main_sha"),
+                call(reset_to="12345678"),
+                call(reset_to="main_sha"),
             ]
         )
         self.mock_git.push.assert_not_called()

tools/private/release/git.py

@@ -80,7 +80,7 @@ def checkout(
         self._run_git(*cmd, capture_output=False)
 
         if should_reset_hard:
-            self.reset_hard(f"{track_remote}/{ref}")
+            self.reset_hard(reset_to=f"{track_remote}/{ref}")
 
     def add(self, *files: str) -> None:
         """Stages files for commit.
@@ -191,13 +191,13 @@ def cherry_pick_abort(self) -> None:
         """Aborts an in-progress cherry-pick operation."""
         self._run_git("cherry-pick", "--abort", capture_output=False)
 
-    def reset_hard(self, ref: str = "HEAD") -> None:
+    def reset_hard(self, *, reset_to: str = "HEAD") -> None:
         """Resets the index and working tree to a specific reference.
 
         Args:
-            ref: The git reference to reset to. Defaults to 'HEAD'.
+            reset_to: The git reference to reset to. Defaults to 'HEAD'.
         """
-        self._run_git("reset", "--hard", ref, capture_output=False)
+        self._run_git("reset", "--hard", reset_to, capture_output=False)
 
     def status(self) -> str:
         """Returns the output of git status --porcelain.

tools/private/release/process_backports.py

@@ -256,7 +256,7 @@ def _sync_changelog_to_main(
             else:
                 if self.git.branch_exists(backport_branch):
                     self.git.checkout(backport_branch)
-                    self.git.reset_hard(main_branch)
+                    self.git.reset_hard(reset_to=main_branch)
                 else:
                     self.git.checkout(backport_branch, create_branch=True)
 
@@ -325,7 +325,7 @@ def _sync_changelog_to_main(
                     print(f"Warning: Failed to enable auto-merge: {e}")
         finally:
             if args.dry_run:
-                self.git.reset_hard(main_start_sha)
+                self.git.reset_hard(reset_to=main_start_sha)
             self.git.checkout(release_branch)
 
     def _apply_version_marker_diffs(
@@ -527,7 +527,7 @@ def _run_internal(self) -> int:
         finally:
             if args.dry_run:
                 print(f"[DRY RUN] Resetting branch {branch_name} to {start_sha}")
-                self.git.reset_hard(start_sha)
+                self.git.reset_hard(reset_to=start_sha)
 
         if successful_pr_nums:
             self._sync_changelog_to_main(