Remove the flag --incompatible_show_all_print_messages
RELNOTES[INC]: The flag --incompatible_show_all_print_messages is removed.
Messages generated by `print` statements from any package will be displayed as
DEBUG messages.
PiperOrigin-RevId: 190043451
diff --git a/site/docs/skylark/backward-compatibility.md b/site/docs/skylark/backward-compatibility.md
index 28057bb..8cffaea 100644
--- a/site/docs/skylark/backward-compatibility.md
+++ b/site/docs/skylark/backward-compatibility.md
@@ -39,7 +39,6 @@
* [String is no longer iterable](#string-is-no-longer-iterable)
* [New actions API](#new-actions-api)
* [Glob tracking](#glob-tracking)
-* [Print statements](#print-statements)
### Set constructor
@@ -195,17 +194,4 @@
* Flag: `--incompatible_disable_glob_tracking`
* Default: `true`
-
-### Print statements
-
-`print` statements in Skylark code are supposed to be used for debugging only.
-Messages they yield used to be filtered out so that only messages from the same
-package as the top level target being built were shown by default (it was
-possible to override by providing, for example, `--output_filter=`). That made
-debugging hard. When the flag is set to true, all print messages are shown in
-the console without exceptions.
-
-* Flag: `--incompatible_show_all_print_messages`
-* Default: `true`
-
<!-- Add new options here -->
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java
index 94e7c91..ab6e6ed 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java
@@ -55,7 +55,6 @@
codedOut.writeBoolNoTag(semantics.incompatibleNewActionsApi());
codedOut.writeBoolNoTag(semantics.incompatibleRemoveNativeGitRepository());
codedOut.writeBoolNoTag(semantics.incompatibleRemoveNativeHttpArchive());
- codedOut.writeBoolNoTag(semantics.incompatibleShowAllPrintMessages());
codedOut.writeBoolNoTag(semantics.incompatibleStringIsNotIterable());
codedOut.writeBoolNoTag(semantics.internalSkylarkFlagTestCanary());
}
@@ -78,7 +77,6 @@
builder.incompatibleNewActionsApi(codedIn.readBool());
builder.incompatibleRemoveNativeGitRepository(codedIn.readBool());
builder.incompatibleRemoveNativeHttpArchive(codedIn.readBool());
- builder.incompatibleShowAllPrintMessages(codedIn.readBool());
builder.incompatibleStringIsNotIterable(codedIn.readBool());
builder.internalSkylarkFlagTestCanary(codedIn.readBool());
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
index 6db4386..b61f730 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
@@ -206,20 +206,6 @@
public boolean incompatibleRemoveNativeHttpArchive;
@Option(
- name = "incompatible_show_all_print_messages",
- defaultValue = "true",
- category = "incompatible changes",
- documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
- effectTags = {OptionEffectTag.UNKNOWN},
- metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
- help =
- "If set to true, the print function will generate DEBUG messages that aren't affected by "
- + "the --output_filter option. Otherwise it will generate filterable WARNING "
- + "messages."
- )
- public boolean incompatibleShowAllPrintMessages;
-
- @Option(
name = "incompatible_string_is_not_iterable",
defaultValue = "false",
category = "incompatible changes",
@@ -257,7 +243,6 @@
.incompatibleNewActionsApi(incompatibleNewActionsApi)
.incompatibleRemoveNativeGitRepository(incompatibleRemoveNativeGitRepository)
.incompatibleRemoveNativeHttpArchive(incompatibleRemoveNativeHttpArchive)
- .incompatibleShowAllPrintMessages(incompatibleShowAllPrintMessages)
.incompatibleStringIsNotIterable(incompatibleStringIsNotIterable)
.internalSkylarkFlagTestCanary(internalSkylarkFlagTestCanary)
.build();
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java b/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java
index 9856c7a..83d954d 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java
@@ -2152,10 +2152,7 @@
if (env.getSemantics().internalSkylarkFlagTestCanary()) {
msg += "<== skylark flag test ==>";
}
- env.handleEvent(
- env.getSemantics().incompatibleShowAllPrintMessages()
- ? Event.debug(loc, msg)
- : Event.warn(loc, msg));
+ env.handleEvent(Event.debug(loc, msg));
return Runtime.NONE;
}
};
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
index 427a939..fc9edda 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
@@ -53,7 +53,6 @@
public abstract boolean incompatibleDisallowUncalledSetConstructor();
public abstract boolean incompatibleNewActionsApi();
- public abstract boolean incompatibleShowAllPrintMessages();
public abstract boolean incompatibleRemoveNativeGitRepository();
@@ -89,7 +88,6 @@
.incompatibleNewActionsApi(false)
.incompatibleRemoveNativeGitRepository(false)
.incompatibleRemoveNativeHttpArchive(false)
- .incompatibleShowAllPrintMessages(true)
.incompatibleStringIsNotIterable(false)
.internalSkylarkFlagTestCanary(false)
.build();
@@ -101,23 +99,16 @@
// <== Add new options here in alphabetic order ==>
public abstract Builder incompatibleBzlDisallowLoadAfterStatement(boolean value);
public abstract Builder incompatibleDepsetIsNotIterable(boolean value);
-
public abstract Builder incompatibleDepsetUnion(boolean value);
-
public abstract Builder incompatibleDisableGlobTracking(boolean value);
public abstract Builder incompatibleDisableObjcProviderResources(boolean value);
-
public abstract Builder incompatibleDisallowDictPlus(boolean value);
public abstract Builder incompatibleDisallowThreeArgVardef(boolean value);
public abstract Builder incompatibleDisallowToplevelIfStatement(boolean value);
public abstract Builder incompatibleDisallowUncalledSetConstructor(boolean value);
public abstract Builder incompatibleNewActionsApi(boolean value);
-
public abstract Builder incompatibleRemoveNativeGitRepository(boolean value);
-
public abstract Builder incompatibleRemoveNativeHttpArchive(boolean value);
-
- public abstract Builder incompatibleShowAllPrintMessages(boolean value);
public abstract Builder incompatibleStringIsNotIterable(boolean value);
public abstract Builder internalSkylarkFlagTestCanary(boolean value);
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
index 3ad68c0..bcbee28 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
@@ -482,40 +482,11 @@
"java_library(name = 'b', srcs = [':src'])");
reporter.setOutputFilter(RegexOutputFilter.forPattern(Pattern.compile("^//java/a")));
- useConfiguration("--incompatible_show_all_print_messages=true");
update("//java/a:a");
assertContainsEvent("DEBUG /workspace/java/b/rules.bzl:2:3: debug in b");
}
@Test
- public void testOutputFilterWithWarning() throws Exception {
- scratch.file(
- "java/a/BUILD",
- "java_library(name = 'a',",
- " srcs = ['A.java'],",
- " deps = ['//java/b'])");
- scratch.file(
- "java/b/rules.bzl",
- "def _impl(ctx):",
- " print('debug in b')",
- " ctx.file_action(",
- " output = ctx.outputs.my_output,",
- " content = 'foo',",
- " )",
- "gen = rule(implementation = _impl, outputs = {'my_output': 'B.java'})");
- scratch.file(
- "java/b/BUILD",
- "load(':rules.bzl', 'gen')",
- "gen(name='src')",
- "java_library(name = 'b', srcs = [':src'])");
- reporter.setOutputFilter(RegexOutputFilter.forPattern(Pattern.compile("^//java/a")));
-
- useConfiguration("--incompatible_show_all_print_messages=false");
- update("//java/a:a");
- assertDoesNotContainEvent("rules.bzl:2:3: debug in b");
- }
-
- @Test
public void testAnalysisErrorMessageWithKeepGoing() throws Exception {
scratch.file("a/BUILD", "sh_binary(name='a', srcs=['a1.sh', 'a2.sh'])");
reporter.removeHandler(failFastHandler);
diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
index 92ffef6..7cde32f 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
@@ -131,7 +131,6 @@
"--incompatible_new_actions_api=" + rand.nextBoolean(),
"--incompatible_remove_native_git_repository=" + rand.nextBoolean(),
"--incompatible_remove_native_http_archive=" + rand.nextBoolean(),
- "--incompatible_show_all_print_messages=" + rand.nextBoolean(),
"--incompatible_string_is_not_iterable=" + rand.nextBoolean(),
"--internal_skylark_flag_test_canary=" + rand.nextBoolean());
}
@@ -155,7 +154,6 @@
.incompatibleNewActionsApi(rand.nextBoolean())
.incompatibleRemoveNativeGitRepository(rand.nextBoolean())
.incompatibleRemoveNativeHttpArchive(rand.nextBoolean())
- .incompatibleShowAllPrintMessages(rand.nextBoolean())
.incompatibleStringIsNotIterable(rand.nextBoolean())
.internalSkylarkFlagTestCanary(rand.nextBoolean())
.build();
