From 050eafd80255b032068522219d6546793df8c7a2 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Thu, 15 Aug 2024 07:44:50 -0700
Subject: [PATCH] [upstream_utils] Shorten file copy command (#6965)

The new upstream_utils command-line API has been nice, but the
copy-upstream-to-thirdparty command has been annoying to type. Since it
already has documentation, we can shorten it to make it easier to
remember and type.
---
 .github/workflows/upstream-utils.yml | 36 ++++++++++++++--------------
 upstream_utils/README.md             |  4 ++--
 upstream_utils/upstream_utils.py     |  4 ++--
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/upstream-utils.yml b/.github/workflows/upstream-utils.yml
index 2c05509682..15597d0514 100644
--- a/.github/workflows/upstream-utils.yml
+++ b/.github/workflows/upstream-utils.yml
@@ -34,92 +34,92 @@ jobs:
         run: |
           cd upstream_utils
           ./apriltag.py clone
-          ./apriltag.py copy-upstream-to-thirdparty
+          ./apriltag.py copy-src
       - name: Run eigen.py
         run: |
           cd upstream_utils
           ./eigen.py clone
-          ./eigen.py copy-upstream-to-thirdparty
+          ./eigen.py copy-src
       - name: Run fmt.py
         run: |
           cd upstream_utils
           ./fmt.py clone
-          ./fmt.py copy-upstream-to-thirdparty
+          ./fmt.py copy-src
       - name: Run gcem.py
         run: |
           cd upstream_utils
           ./gcem.py clone
-          ./gcem.py copy-upstream-to-thirdparty
+          ./gcem.py copy-src
       - name: Run gl3w.py
         run: |
           cd upstream_utils
           ./gl3w.py clone
-          ./gl3w.py copy-upstream-to-thirdparty
+          ./gl3w.py copy-src
       - name: Run glfw.py
         run: |
           cd upstream_utils
           ./glfw.py clone
-          ./glfw.py copy-upstream-to-thirdparty
+          ./glfw.py copy-src
       - name: Run googletest.py
         run: |
           cd upstream_utils
           ./googletest.py clone
-          ./googletest.py copy-upstream-to-thirdparty
+          ./googletest.py copy-src
       - name: Run imgui.py
         run: |
           cd upstream_utils
           ./imgui.py clone
-          ./imgui.py copy-upstream-to-thirdparty
+          ./imgui.py copy-src
       - name: Run implot.py
         run: |
           cd upstream_utils
           ./implot.py clone
-          ./implot.py copy-upstream-to-thirdparty
+          ./implot.py copy-src
       - name: Run json.py
         run: |
           cd upstream_utils
           ./json.py clone
-          ./json.py copy-upstream-to-thirdparty
+          ./json.py copy-src
       - name: Run libuv.py
         run: |
           cd upstream_utils
           ./libuv.py clone
-          ./libuv.py copy-upstream-to-thirdparty
+          ./libuv.py copy-src
       - name: Run llvm.py
         run: |
           cd upstream_utils
           ./llvm.py clone
-          ./llvm.py copy-upstream-to-thirdparty
+          ./llvm.py copy-src
       - name: Run mpack.py
         run: |
           cd upstream_utils
           ./mpack.py clone
-          ./mpack.py copy-upstream-to-thirdparty
+          ./mpack.py copy-src
       - name: Run stack_walker.py
         run: |
           cd upstream_utils
           ./stack_walker.py clone
-          ./stack_walker.py copy-upstream-to-thirdparty
+          ./stack_walker.py copy-src
       - name: Run memory.py
         run: |
           cd upstream_utils
           ./memory.py clone
-          ./memory.py copy-upstream-to-thirdparty
+          ./memory.py copy-src
       - name: Run protobuf.py
         run: |
           cd upstream_utils
           ./protobuf.py clone
-          ./protobuf.py copy-upstream-to-thirdparty
+          ./protobuf.py copy-src
       - name: Run sleipnir.py
         run: |
           cd upstream_utils
           ./sleipnir.py clone
-          ./sleipnir.py copy-upstream-to-thirdparty
+          ./sleipnir.py copy-src
       - name: Run stb.py
         run: |
           cd upstream_utils
           ./stb.py clone
-          ./stb.py copy-upstream-to-thirdparty
+          ./stb.py copy-src
       - name: Add untracked files to index so they count as changes
         run: git add -A
       - name: Check output
diff --git a/upstream_utils/README.md b/upstream_utils/README.md
index 0ac61e372c..6be6716644 100644
--- a/upstream_utils/README.md
+++ b/upstream_utils/README.md
@@ -37,7 +37,7 @@ Update the `upstream_utils` patch files and the tag in the script.
 
 Copy the updated upstream files into the thirdparty files within allwpilib.
 ```bash
-./<lib>.py copy-upstream-to-thirdparty
+./<lib>.py copy-src
 ```
 
 ## Adding patch to thirdparty library
@@ -78,5 +78,5 @@ Update the `upstream_utils` patch files.
 
 Rerun `<lib>.py` to reimport the thirdparty files.
 ```bash
-./<lib>.py copy-upstream-to-thirdparty
+./<lib>.py copy-src
 ```
diff --git a/upstream_utils/upstream_utils.py b/upstream_utils/upstream_utils.py
index 3872ee9960..f750139f5e 100644
--- a/upstream_utils/upstream_utils.py
+++ b/upstream_utils/upstream_utils.py
@@ -564,7 +564,7 @@ class Lib:
         )
 
         subparsers.add_parser(
-            "copy-upstream-to-thirdparty",
+            "copy-src",
             help="Copies files from the upstream repository into the thirdparty directory in allwpilib",
         )
 
@@ -581,5 +581,5 @@ class Lib:
             self.rebase(args.new_tag)
         elif args.subcommand == "format-patch":
             self.format_patch()
-        elif args.subcommand == "copy-upstream-to-thirdparty":
+        elif args.subcommand == "copy-src":
             self.copy_upstream_to_thirdparty()