From d4e13eae03ca22cde97a4af97373d15ecd454620 Mon Sep 17 00:00:00 2001
From: laurentlb <laurentlb@google.com>
Date: Thu, 21 Feb 2019 13:07:26 -0800
Subject: [PATCH] Enable --incompatible_disallow_old_style_args_add by default

Fixes https://github.com/bazelbuild/bazel/issues/5822

RELNOTES: --incompatible_disallow_old_style_args_add is enabled by default.
PiperOrigin-RevId: 235053596
---
 site/docs/skylark/backward-compatibility.md                     | 2 +-
 .../devtools/build/lib/packages/StarlarkSemanticsOptions.java   | 2 +-
 .../com/google/devtools/build/lib/syntax/StarlarkSemantics.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/docs/skylark/backward-compatibility.md b/site/docs/skylark/backward-compatibility.md
index 291950f0203b71..8040418b679562 100644
--- a/site/docs/skylark/backward-compatibility.md
+++ b/site/docs/skylark/backward-compatibility.md
@@ -232,7 +232,7 @@ parameters are disabled. To add many arguments at once you must use `add_all()`
 or `add_joined()` instead.
 
 *   Flag: `--incompatible_disallow_old_style_args_add`
-*   Default: `false`
+*   Default: `true`
 *   Tracking issue: [#5822](https://github.com/bazelbuild/bazel/issues/5822)
 
 
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
index 369774e3e45810..0bab4bf721aba9 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -333,7 +333,7 @@ public class StarlarkSemanticsOptions extends OptionsBase implements Serializabl
   /** Controls legacy arguments to ctx.actions.Args#add. */
   @Option(
       name = "incompatible_disallow_old_style_args_add",
-      defaultValue = "false",
+      defaultValue = "true",
       category = "incompatible changes",
       documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
       effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
index 87ae5ced94020c..4b01e2373d5aef 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -221,7 +221,7 @@ public static Builder builderWithDefaults() {
           .incompatibleDisallowLegacyJavaProvider(false)
           .incompatibleDisallowLegacyJavaInfo(false)
           .incompatibleDisallowLoadLabelsToCrossPackageBoundaries(false)
-          .incompatibleDisallowOldStyleArgsAdd(false)
+          .incompatibleDisallowOldStyleArgsAdd(true)
           .incompatibleDisallowStructProviderSyntax(false)
           .incompatibleExpandDirectories(true)
           .incompatibleNewActionsApi(false)