Automatically stage transport version state files

Transport version state files should be managed by the relevant gradle
tasks. After running these tasks, developers should not need to worry
about which files they need to add to their commit. This commit makes
every update to transport state files automatically stage the change in
git.

Author: rjernst

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/AbstractGenerateTransportVersionDefinitionTask.java

@@ -159,7 +159,7 @@ private void resetUpperBound(
             resetValue = idsForUpperBound.get(idsForUpperBound.size() - 2);
         }
         var resetUpperBound = new TransportVersionUpperBound(upperBound.name(), resetValue.definition().name(), resetValue.id());
-        resources.writeUpperBound(resetUpperBound, false);
+        resources.writeUpperBound(resetUpperBound);
     }
 
     private TransportVersionId maybeGetExistingId(

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/GenerateInitialTransportVersionTask.java

@@ -54,13 +54,13 @@ public void run() throws IOException {
             var definition = new TransportVersionDefinition(initialDefinitionName, List.of(id), false);
             resources.writeDefinition(definition);
             var newUpperBound = new TransportVersionUpperBound(upperBoundName, initialDefinitionName, id);
-            resources.writeUpperBound(newUpperBound, false);
+            resources.writeUpperBound(newUpperBound);
 
             if (releaseVersion.getRevision() == 0) {
                 Version currentVersion = getCurrentVersion().get();
                 String currentUpperBoundName = getUpperBoundName(currentVersion);
                 var currentUpperBound = new TransportVersionUpperBound(currentUpperBoundName, initialDefinitionName, id);
-                resources.writeUpperBound(currentUpperBound, false);
+                resources.writeUpperBound(currentUpperBound);
             }
         }
     }

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/GenerateTransportVersionDefinitionTask.java

@@ -170,7 +170,7 @@ private void resetUpperBound(
             resetValue = idsForUpperBound.get(idsForUpperBound.size() - 2);
         }
         var resetUpperBound = new TransportVersionUpperBound(upperBound.name(), resetValue.definition().name(), resetValue.id());
-        resources.writeUpperBound(resetUpperBound, false);
+        resources.writeUpperBound(resetUpperBound);
     }
 
     private void removeUnusedNamedDefinitions(
@@ -190,6 +190,6 @@ private void removeUnusedNamedDefinitions(
     @Override
     protected void writeUpperBound(TransportVersionResourcesService resources, TransportVersionUpperBound newUpperBound)
         throws IOException {
-        resources.writeUpperBound(newUpperBound, false);
+        resources.writeUpperBound(newUpperBound);
     }
 }

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ResolveTransportVersionConflictTask.java

@@ -69,6 +69,6 @@ protected Set<String> getTargetUpperBoundNames(
     @Override
     protected void writeUpperBound(TransportVersionResourcesService resources, TransportVersionUpperBound newUpperBound)
         throws IOException {
-        resources.writeUpperBound(newUpperBound, true);
+        resources.writeUpperBound(newUpperBound);
     }
 }

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesService.java

@@ -164,11 +164,14 @@ void writeDefinition(TransportVersionDefinition definition) throws IOException {
             definition.ids().stream().map(Object::toString).collect(Collectors.joining(",")) + "\n",
             StandardCharsets.UTF_8
         );
+        gitCommand("add", path.toString());
     }
 
     void deleteReferableDefinition(String name) throws IOException {
         Path path = transportResourcesDir.resolve(getDefinitionRelativePath(name, true));
-        Files.deleteIfExists(path);
+        if (Files.deleteIfExists(path)) {
+            gitCommand("rm", "--ignore-unmatch", path.toString());
+        }
     }
 
     /** Return all unreferable definitions, mapped by their name. */
@@ -241,14 +244,12 @@ Set<String> getChangedUpperBoundNames() {
     }
 
     /** Write the given upper bound to a file in the transport resources */
-    void writeUpperBound(TransportVersionUpperBound upperBound, boolean stageInGit) throws IOException {
+    void writeUpperBound(TransportVersionUpperBound upperBound) throws IOException {
         Path path = transportResourcesDir.resolve(getUpperBoundRelativePath(upperBound.name()));
         logger.debug("Writing upper bound [" + upperBound + "] to [" + path + "]");
         Files.writeString(path, upperBound.definitionName() + "," + upperBound.definitionId().complete() + "\n", StandardCharsets.UTF_8);
 
-        if (stageInGit) {
-            gitCommand("add", path.toString());
-        }
+        gitCommand("add", path.toString());
     }
 
     /** Return the path within the repository of the given latest */