Rename --keep_incrementality_data to --track_incremental_state.

New name clears the namespace a 2nd flag that will wipe the build graph after the build. The old name would be confusing as it could easily apply to that, and so needs to be more specifically just about tracking state in the first place. The new flag can be clearly separate and about keeping state after the build.

Partial roll forward of https://github.com/bazelbuild/bazel/commit/9321316b34767b06c3071b2cf2a4de189874fcce, with fixes to documentation that are still relevant.

RELNOTES: Rename --keep_incrementality_data to --track_incremental_state
PiperOrigin-RevId: 179078292

2 files changed, 17 insertions, 17 deletions

diff --git a/src/test/shell/integration/discard_graph_edges_lib.sh b/src/test/shell/integration/discard_graph_edges_lib.sh
index 683b96b4dd..0992d34433 100644
--- a/src/test/shell/integration/discard_graph_edges_lib.sh
+++ b/src/test/shell/integration/discard_graph_edges_lib.sh
@@ -17,7 +17,7 @@
 # discard_graph_edges_lib.sh: functions needed by discard_graph_edges_test.sh
 
 STARTUP_FLAGS="--batch"
-BUILD_FLAGS="--discard_analysis_cache --nokeep_incrementality_data"
+BUILD_FLAGS="--discard_analysis_cache --notrack_incremental_state"
 
 function extract_histogram_count() {
   local histofile="$1"
diff --git a/src/test/shell/integration/discard_graph_edges_test.sh b/src/test/shell/integration/discard_graph_edges_test.sh
index 4b0311c6a7..0ec8559979 100755
--- a/src/test/shell/integration/discard_graph_edges_test.sh
+++ b/src/test/shell/integration/discard_graph_edges_test.sh
@@ -334,13 +334,13 @@ EOF
 # The following tests are not expected to exercise codepath -- make sure nothing bad happens.
 
 function test_no_batch() {
-  bazel $STARTUP_FLAGS --nobatch test $BUILD_FLAGS --keep_incrementality_data \
+  bazel $STARTUP_FLAGS --nobatch test $BUILD_FLAGS --track_incremental_state \
       //testing:mytest >& "$TEST_log" || fail "Expected success"
 }
 
 function test_no_discard_analysis_cache() {
   bazel $STARTUP_FLAGS test $BUILD_FLAGS --nodiscard_analysis_cache \
-      --keep_incrementality_data //testing:mytest >& "$TEST_log" \
+      --track_incremental_state //testing:mytest >& "$TEST_log" \
       || fail "Expected success"
 }
 
@@ -348,7 +348,7 @@ function test_packages_cleared_nobatch() {
   readonly local old_startup_flags="$STARTUP_FLAGS"
   STARTUP_FLAGS="--nobatch"
   readonly local old_build_flags="$BUILD_FLAGS"
-  BUILD_FLAGS="--nokeep_incrementality_data --discard_analysis_cache"
+  BUILD_FLAGS="--notrack_incremental_state --discard_analysis_cache"
   test_packages_cleared
   STARTUP_FLAGS="$old_startup_flags"
   BUILD_FLAGS="$old_build_flags"
@@ -356,7 +356,7 @@ function test_packages_cleared_nobatch() {
 
 function test_packages_cleared_implicit_noincrementality_data() {
   readonly local old_build_flags="$BUILD_FLAGS"
-  BUILD_FLAGS="$BUILD_FLAGS --keep_incrementality_data"
+  BUILD_FLAGS="$BUILD_FLAGS --track_incremental_state"
   test_packages_cleared
   BUILD_FLAGS="$old_build_flags"
 }
@@ -365,21 +365,21 @@ function test_actions_deleted_after_execution_nobatch_keep_analysis () {
   readonly local old_startup_flags="$STARTUP_FLAGS"
   STARTUP_FLAGS="--nobatch"
   readonly local old_build_flags="$BUILD_FLAGS"
-  BUILD_FLAGS="--nokeep_incrementality_data"
+  BUILD_FLAGS="--notrack_incremental_state"
   test_actions_deleted_after_execution
   STARTUP_FLAGS="$old_startup_flags"
   BUILD_FLAGS="$old_build_flags"
 }
 
 function test_dump_after_discard_incrementality_data() {
-  bazel build --nokeep_incrementality_data //testing:mytest >& "$TEST_log" \
+  bazel build --notrack_incremental_state //testing:mytest >& "$TEST_log" \
        || fail "Expected success"
   bazel dump --skyframe=detailed >& "$TEST_log" || fail "Expected success"
   expect_log "//testing:mytest"
 }
 
 function test_query_after_discard_incrementality_data() {
-  bazel build --nobuild --nokeep_incrementality_data //testing:mytest \
+  bazel build --nobuild --notrack_incremental_state //testing:mytest \
        >& "$TEST_log" || fail "Expected success"
   bazel query --noexperimental_ui --output=label_kind //testing:mytest \
        >& "$TEST_log" || fail "Expected success"
@@ -390,7 +390,7 @@ function test_query_after_discard_incrementality_data() {
 function test_shutdown_after_discard_incrementality_data() {
   readonly local server_pid="$(bazel info server_pid 2> /dev/null)"
   [[ -z "$server_pid" ]] && fail "Couldn't get server pid"
-  bazel build --nobuild --nokeep_incrementality_data //testing:mytest \
+  bazel build --nobuild --notrack_incremental_state //testing:mytest \
        >& "$TEST_log" || fail "Expected success"
   bazel shutdown || fail "Expected success"
   readonly local new_server_pid="$(bazel info server_pid 2> /dev/null)"
@@ -399,19 +399,19 @@ function test_shutdown_after_discard_incrementality_data() {
 }
 
 function test_clean_after_discard_incrementality_data() {
-  bazel build --nobuild --nokeep_incrementality_data //testing:mytest \
+  bazel build --nobuild --notrack_incremental_state //testing:mytest \
        >& "$TEST_log" || fail "Expected success"
   bazel clean >& "$TEST_log" || fail "Expected success"
 }
 
 function test_switch_back_and_forth() {
   readonly local server_pid="$(bazel info \
-      --nokeep_incrementality_data server_pid 2> /dev/null)"
+      --notrack_incremental_state server_pid 2> /dev/null)"
   [[ -z "$server_pid" ]] && fail "Couldn't get server pid"
-  bazel test --noexperimental_ui --nokeep_incrementality_data \
+  bazel test --noexperimental_ui --notrack_incremental_state \
       //testing:mytest >& "$TEST_log" || fail "Expected success"
   expect_log "Loading package: testing"
-  bazel test --noexperimental_ui --nokeep_incrementality_data \
+  bazel test --noexperimental_ui --notrack_incremental_state \
       //testing:mytest >& "$TEST_log" || fail "Expected success"
   expect_log "Loading package: testing"
   bazel test --noexperimental_ui //testing:mytest >& "$TEST_log" \
@@ -420,7 +420,7 @@ function test_switch_back_and_forth() {
   bazel test --noexperimental_ui //testing:mytest >& "$TEST_log" \
       || fail "Expected success"
   expect_not_log "Loading package: testing"
-  bazel test --noexperimental_ui --nokeep_incrementality_data \
+  bazel test --noexperimental_ui --notrack_incremental_state \
       //testing:mytest >& "$TEST_log" || fail "Expected success"
   expect_log "Loading package: testing"
   readonly local new_server_pid="$(bazel info server_pid 2> /dev/null)"
@@ -431,10 +431,10 @@ function test_switch_back_and_forth() {
 function test_warns_on_unexpected_combos() {
   bazel --batch build --nobuild --discard_analysis_cache >& "$TEST_log" \
       || fail "Expected success"
-  expect_log "--batch and --discard_analysis_cache specified, but --nokeep_incrementality_data not specified"
-  bazel build --nobuild --discard_analysis_cache --nokeep_incrementality_data \
+  expect_log "--batch and --discard_analysis_cache specified, but --notrack_incremental_state not specified"
+  bazel build --nobuild --discard_analysis_cache --notrack_incremental_state \
       >& "$TEST_log" || fail "Expected success"
-  expect_log "--batch not specified with --nokeep_incrementality_data"
+  expect_log "--batch not specified with --notrack_incremental_state"
 }
 
 run_suite "test for --discard_graph_edges"