[upstream_utils] Refactor upstream_utils scripts (#4367)

* Root folder variable names are now more descriptive
* clone_repo() now restores the current working directory
* Removed setup_upstream_repo() since it's now identical to clone_repo()
* Moved am_patches()'s for loop into user scripts so the filename prefix
  doesn't need to be included in every patch filename
* Renamed am_patches() to git_am() since its only job now is to run "git am"
* Removed unused apply_patches() function
* Fixed typo in git_am()'s ignore_whitespace arg name

upstream_utils/update_libuv.py

@@ -2,38 +2,35 @@
 
 import os
 import shutil
-import re
 
 from upstream_utils import (
-    setup_upstream_repo,
+    get_repo_root,
+    clone_repo,
     comment_out_invalid_includes,
     walk_cwd_and_copy_if,
-    am_patches,
-    walk_if,
-    copy_to,
+    git_am,
 )
 
 
 def main():
-    root, repo = setup_upstream_repo("https://github.com/libuv/libuv", "v1.44.2")
-    wpinet = os.path.join(root, "wpinet")
+    upstream_root = clone_repo("https://github.com/libuv/libuv", "v1.44.2")
+    wpilib_root = get_repo_root()
+    wpinet = os.path.join(wpilib_root, "wpinet")
 
-    # Apply patches to original git repo
-    prefix = os.path.join(root, "upstream_utils/libuv_patches")
-    am_patches(
-        repo,
-        [
-            os.path.join(prefix, "0001-Fix-missing-casts.patch"),
-            os.path.join(prefix, "0002-Fix-warnings.patch"),
-            os.path.join(prefix, "0003-Preprocessor-cleanup.patch"),
-            os.path.join(prefix, "0004-Cleanup-problematic-language.patch"),
-            os.path.join(prefix, "0005-Use-roborio-time.patch"),
-            os.path.join(prefix, "0006-Style-comments-cleanup.patch"),
-            os.path.join(prefix, "0007-Squelch-GCC-12.1-warnings.patch"),
-            os.path.join(prefix, "0008-Fix-Win32-warning-suppression-pragma.patch"),
-            os.path.join(prefix, "0009-Avoid-unused-variable-warning-on-Mac.patch"),
-        ],
-    )
+    # Apply patches to upstream Git repo
+    os.chdir(upstream_root)
+    for f in [
+        "0001-Fix-missing-casts.patch",
+        "0002-Fix-warnings.patch",
+        "0003-Preprocessor-cleanup.patch",
+        "0004-Cleanup-problematic-language.patch",
+        "0005-Use-roborio-time.patch",
+        "0006-Style-comments-cleanup.patch",
+        "0007-Squelch-GCC-12.1-warnings.patch",
+        "0008-Fix-Win32-warning-suppression-pragma.patch",
+        "0009-Avoid-unused-variable-warning-on-Mac.patch",
+    ]:
+        git_am(os.path.join(wpilib_root, "upstream_utils/libuv_patches", f))
 
     # Delete old install
     for d in ["src/main/native/thirdparty/libuv"]: