bazel syntax: reverse syntax->events dependency

adonovan · hsudhof · commit c12c048c95bc · 2020-04-02T18:37:52.000Z
PiperOrigin-RevId: 304268008
Change-Id: Ie1c9703f56a737c98915e8dd4798cf7e46ba73c6
diff --git a/java/com/google/copybara/Core.java b/java/com/google/copybara/Core.java
@@ -55,14 +55,14 @@
 import com.google.copybara.transform.VerifyMatch;
 import com.google.copybara.transform.debug.DebugOptions;
 import com.google.copybara.util.Glob;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.skylarkinterface.Param;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.syntax.BaseFunction;
 import com.google.devtools.build.lib.syntax.Dict;
 import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.devtools.build.lib.syntax.Module;
 import com.google.devtools.build.lib.syntax.NoneType;
 import com.google.devtools.build.lib.syntax.Starlark;
diff --git a/java/com/google/copybara/MapMapper.java b/java/com/google/copybara/MapMapper.java
@@ -20,7 +20,7 @@
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableMap;
 import com.google.copybara.transform.ReversibleFunction;
-import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.syntax.Location;
 
 public class MapMapper implements ReversibleFunction<String, String> {
 
diff --git a/java/com/google/copybara/NonReversibleValidationException.java b/java/com/google/copybara/NonReversibleValidationException.java
@@ -16,8 +16,8 @@
 
 package com.google.copybara;
 
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.Location;
 
 /**
  * Exception thrown when a {@link Transformation} is not reversible but the configuration asked for
diff --git a/java/com/google/copybara/Transformation.java b/java/com/google/copybara/Transformation.java
@@ -17,9 +17,9 @@
 package com.google.copybara;
 
 import com.google.copybara.exception.ValidationException;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.devtools.build.lib.syntax.StarlarkValue;
 import java.io.IOException;
 
diff --git a/java/com/google/copybara/authoring/Authoring.java b/java/com/google/copybara/authoring/Authoring.java
@@ -20,12 +20,12 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import com.google.copybara.doc.annotations.Example;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.skylarkinterface.Param;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.devtools.build.lib.syntax.Sequence;
 import com.google.devtools.build.lib.syntax.Starlark;
 import com.google.devtools.build.lib.syntax.StarlarkValue;
diff --git a/java/com/google/copybara/buildozer/BuildozerCreate.java b/java/com/google/copybara/buildozer/BuildozerCreate.java
@@ -23,10 +23,10 @@
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
 import com.google.copybara.WorkflowOptions;
+import com.google.copybara.buildozer.BuildozerOptions.BuildozerCommand;
 import com.google.copybara.exception.ValidationException;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.EvalException;
-import com.google.copybara.buildozer.BuildozerOptions.BuildozerCommand;
+import com.google.devtools.build.lib.syntax.Location;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/java/com/google/copybara/buildozer/BuildozerDelete.java b/java/com/google/copybara/buildozer/BuildozerDelete.java
@@ -24,9 +24,9 @@
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
 import com.google.copybara.WorkflowOptions;
-import com.google.copybara.exception.ValidationException;
-import com.google.devtools.build.lib.events.Location;
 import com.google.copybara.buildozer.BuildozerOptions.BuildozerCommand;
+import com.google.copybara.exception.ValidationException;
+import com.google.devtools.build.lib.syntax.Location;
 import java.io.IOException;
 import javax.annotation.Nullable;
 
diff --git a/java/com/google/copybara/buildozer/BuildozerModule.java b/java/com/google/copybara/buildozer/BuildozerModule.java
@@ -21,13 +21,13 @@
 import com.google.copybara.WorkflowOptions;
 import com.google.copybara.config.SkylarkUtil;
 import com.google.copybara.doc.annotations.Example;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.skylarkinterface.Param;
 import com.google.devtools.build.lib.skylarkinterface.ParamType;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.devtools.build.lib.syntax.Sequence;
 import com.google.devtools.build.lib.syntax.Starlark;
 import com.google.devtools.build.lib.syntax.StarlarkThread;
diff --git a/java/com/google/copybara/buildozer/Command.java b/java/com/google/copybara/buildozer/Command.java
@@ -22,8 +22,8 @@
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 import com.google.copybara.NonReversibleValidationException;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.devtools.build.lib.syntax.Printer;
 import com.google.devtools.build.lib.syntax.StarlarkValue;
 import java.util.ArrayList;
diff --git a/java/com/google/copybara/buildozer/Target.java b/java/com/google/copybara/buildozer/Target.java
@@ -20,8 +20,8 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.Location;
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
diff --git a/java/com/google/copybara/config/SkylarkParser.java b/java/com/google/copybara/config/SkylarkParser.java
@@ -218,7 +218,7 @@ private Module eval(ConfigFile content)
               moduleName, new Extension(ImmutableMap.copyOf(imp.getExportedBindings()), ""));
         }
       }
-      StarlarkThread.PrintHandler printHandler = StarlarkThread.makeDebugPrintHandler(eventHandler);
+      StarlarkThread.PrintHandler printHandler = Event.makeDebugPrintHandler(eventHandler);
       updateEnvironmentForConfigFile(printHandler, content, mainConfigFile, environment, moduleSet);
 
       // Create a Starlark thread making the modules available as predeclared bindings.
diff --git a/java/com/google/copybara/git/GitModule.java b/java/com/google/copybara/git/GitModule.java
@@ -67,14 +67,14 @@
 import com.google.copybara.transform.patch.PatchTransformation;
 import com.google.copybara.util.RepositoryUtil;
 import com.google.copybara.util.console.Console;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.skylarkinterface.Param;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.syntax.Dict;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.EvalUtils;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.devtools.build.lib.syntax.Module;
 import com.google.devtools.build.lib.syntax.NoneType;
 import com.google.devtools.build.lib.syntax.Sequence;
diff --git a/java/com/google/copybara/git/LatestVersionSelector.java b/java/com/google/copybara/git/LatestVersionSelector.java
@@ -27,8 +27,8 @@
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.transform.RegexTemplateTokens;
 import com.google.copybara.util.console.Console;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.devtools.build.lib.syntax.Printer;
 import com.google.re2j.Matcher;
 import com.google.re2j.Pattern;
diff --git a/java/com/google/copybara/transform/CopyOrMove.java b/java/com/google/copybara/transform/CopyOrMove.java
@@ -28,8 +28,8 @@
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.util.FileUtil;
 import com.google.copybara.util.Glob;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.devtools.build.lib.syntax.Starlark;
 import java.io.IOException;
 import java.nio.file.DirectoryNotEmptyException;
diff --git a/java/com/google/copybara/transform/ExplicitReversal.java b/java/com/google/copybara/transform/ExplicitReversal.java
@@ -22,7 +22,7 @@
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
 import com.google.copybara.exception.ValidationException;
-import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.syntax.Location;
 import java.io.IOException;
 
 /**
diff --git a/java/com/google/copybara/transform/FilterReplace.java b/java/com/google/copybara/transform/FilterReplace.java
@@ -29,9 +29,9 @@
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.treestate.TreeState.FileState;
 import com.google.copybara.util.Glob;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.re2j.Matcher;
 import com.google.re2j.Pattern;
 import java.io.IOException;
diff --git a/java/com/google/copybara/transform/RegexTemplateTokens.java b/java/com/google/copybara/transform/RegexTemplateTokens.java
@@ -30,8 +30,8 @@
 import com.google.common.collect.Sets;
 import com.google.copybara.templatetoken.Parser;
 import com.google.copybara.templatetoken.Token;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.re2j.Matcher;
 import com.google.re2j.Pattern;
 import java.util.ArrayList;
diff --git a/java/com/google/copybara/transform/Remove.java b/java/com/google/copybara/transform/Remove.java
@@ -27,7 +27,7 @@
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.util.FileUtil;
 import com.google.copybara.util.Glob;
-import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.syntax.Location;
 import java.io.IOException;
 
 /**
diff --git a/java/com/google/copybara/transform/Replace.java b/java/com/google/copybara/transform/Replace.java
@@ -33,8 +33,8 @@
 import com.google.copybara.transform.RegexTemplateTokens.Replacer;
 import com.google.copybara.treestate.TreeState.FileState;
 import com.google.copybara.util.Glob;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.devtools.build.lib.syntax.Starlark;
 import com.google.re2j.Pattern;
 import com.google.re2j.PatternSyntaxException;
diff --git a/java/com/google/copybara/transform/SkylarkTransformation.java b/java/com/google/copybara/transform/SkylarkTransformation.java
@@ -26,10 +26,10 @@
 import com.google.copybara.Transformation;
 import com.google.copybara.exception.EmptyChangeException;
 import com.google.copybara.exception.ValidationException;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.BaseFunction;
 import com.google.devtools.build.lib.syntax.Dict;
 import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.devtools.build.lib.syntax.Starlark;
 import com.google.devtools.build.lib.syntax.StarlarkThread;
 import java.io.IOException;
diff --git a/java/com/google/copybara/transform/TodoReplace.java b/java/com/google/copybara/transform/TodoReplace.java
@@ -36,7 +36,7 @@
 import com.google.copybara.treestate.TreeState.FileState;
 import com.google.copybara.util.Glob;
 import com.google.copybara.util.console.Console;
-import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.re2j.Matcher;
 import com.google.re2j.Pattern;
 import java.io.IOException;
diff --git a/java/com/google/copybara/transform/VerifyMatch.java b/java/com/google/copybara/transform/VerifyMatch.java
@@ -28,8 +28,8 @@
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.treestate.TreeState.FileState;
 import com.google.copybara.util.Glob;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.re2j.Pattern;
 import com.google.re2j.PatternSyntaxException;
 import java.io.IOException;
diff --git a/java/com/google/copybara/transform/metadata/ExposeLabelInMessage.java b/java/com/google/copybara/transform/metadata/ExposeLabelInMessage.java
@@ -24,7 +24,7 @@
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.transform.ExplicitReversal;
 import com.google.copybara.transform.IntentionalNoop;
-import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.syntax.Location;
 import java.io.IOException;
 import java.util.LinkedHashSet;
 
diff --git a/java/com/google/copybara/transform/metadata/MapAuthor.java b/java/com/google/copybara/transform/metadata/MapAuthor.java
@@ -32,8 +32,8 @@
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.transform.ExplicitReversal;
 import com.google.copybara.transform.IntentionalNoop;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.Location;
 import java.io.IOException;
 import java.util.Map;
 import java.util.Map.Entry;
diff --git a/java/com/google/copybara/transform/metadata/MetadataSquashNotes.java b/java/com/google/copybara/transform/metadata/MetadataSquashNotes.java
@@ -26,7 +26,7 @@
 import com.google.copybara.templatetoken.LabelTemplate.LabelNotFoundException;
 import com.google.copybara.transform.ExplicitReversal;
 import com.google.copybara.transform.IntentionalNoop;
-import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.syntax.Location;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/java/com/google/copybara/transform/metadata/MetadataVerifyMatch.java b/java/com/google/copybara/transform/metadata/MetadataVerifyMatch.java
@@ -25,7 +25,7 @@
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.transform.ExplicitReversal;
 import com.google.copybara.transform.IntentionalNoop;
-import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.re2j.Pattern;
 import java.io.IOException;
 
diff --git a/java/com/google/copybara/transform/metadata/ReferenceMigrator.java b/java/com/google/copybara/transform/metadata/ReferenceMigrator.java
@@ -35,8 +35,8 @@
 import com.google.copybara.transform.IntentionalNoop;
 import com.google.copybara.transform.RegexTemplateTokens;
 import com.google.copybara.transform.RegexTemplateTokens.Replacer;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.re2j.Pattern;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/java/com/google/copybara/transform/metadata/RemoveLabelInMessage.java b/java/com/google/copybara/transform/metadata/RemoveLabelInMessage.java
@@ -22,7 +22,7 @@
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.transform.ExplicitReversal;
 import com.google.copybara.transform.IntentionalNoop;
-import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.syntax.Location;
 import java.io.IOException;
 
 public class RemoveLabelInMessage implements Transformation {
diff --git a/java/com/google/copybara/transform/metadata/RestoreOriginalAuthor.java b/java/com/google/copybara/transform/metadata/RestoreOriginalAuthor.java
@@ -25,8 +25,8 @@
 import com.google.copybara.Transformation;
 import com.google.copybara.authoring.Author;
 import com.google.copybara.exception.ValidationException;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.Location;
 import java.io.IOException;
 
 /**
diff --git a/java/com/google/copybara/transform/metadata/SaveOriginalAuthor.java b/java/com/google/copybara/transform/metadata/SaveOriginalAuthor.java
@@ -21,7 +21,7 @@
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
 import com.google.copybara.exception.ValidationException;
-import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.syntax.Location;
 import java.io.IOException;
 
 /**
diff --git a/java/com/google/copybara/transform/metadata/Scrubber.java b/java/com/google/copybara/transform/metadata/Scrubber.java
@@ -23,7 +23,7 @@
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.transform.ExplicitReversal;
 import com.google.copybara.transform.IntentionalNoop;
-import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.re2j.Pattern;
 import java.io.IOException;
 import javax.annotation.Nullable;
@@ -61,8 +61,11 @@ public void transform(TransformWork work)
         work.setMessage(scrubbedMessage);
         return;
       }
-      ValidationException.checkCondition(!failIfNotMacth,
-          "Scrubber regex: '%s' didn't match for description: '%s'", pattern.pattern(), work.getMessage());
+      ValidationException.checkCondition(
+          !failIfNotMacth,
+          "Scrubber regex: '%s' didn't match for description: '%s'",
+          pattern.pattern(),
+          work.getMessage());
       if (defaultPublicMsg != null) {
         work.setMessage(defaultPublicMsg);
       }
diff --git a/java/com/google/copybara/transform/metadata/TemplateMessage.java b/java/com/google/copybara/transform/metadata/TemplateMessage.java
@@ -21,10 +21,10 @@
 import com.google.copybara.Transformation;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.templatetoken.LabelTemplate;
+import com.google.copybara.templatetoken.LabelTemplate.LabelNotFoundException;
 import com.google.copybara.transform.ExplicitReversal;
 import com.google.copybara.transform.IntentionalNoop;
-import com.google.copybara.templatetoken.LabelTemplate.LabelNotFoundException;
-import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.syntax.Location;
 import java.io.IOException;
 
 /**
diff --git a/java/com/google/copybara/transform/metadata/UseLastChange.java b/java/com/google/copybara/transform/metadata/UseLastChange.java
@@ -24,7 +24,7 @@
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.transform.ExplicitReversal;
 import com.google.copybara.transform.IntentionalNoop;
-import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.syntax.Location;
 import java.io.IOException;
 import javax.annotation.Nullable;
 
diff --git a/java/com/google/copybara/transform/patch/PatchTransformation.java b/java/com/google/copybara/transform/patch/PatchTransformation.java
@@ -26,7 +26,7 @@
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.util.InsideGitDirException;
 import com.google.copybara.util.console.Console;
-import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.syntax.Location;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.stream.Collectors;
diff --git a/javatests/com/google/copybara/transform/metadata/RevisionMigratorTest.java b/javatests/com/google/copybara/transform/metadata/RevisionMigratorTest.java
@@ -39,7 +39,7 @@
 import com.google.copybara.testing.OptionsBuilder;
 import com.google.copybara.testing.SkylarkTestExecutor;
 import com.google.copybara.util.console.testing.TestingConsole;
-import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.syntax.Location;
 import com.google.re2j.Pattern;
 import java.nio.file.FileSystem;
 import java.nio.file.Path;
diff --git a/javatests/com/google/copybara/transform/patch/PatchTransformationTest.java b/javatests/com/google/copybara/transform/patch/PatchTransformationTest.java
@@ -32,7 +32,7 @@
 import com.google.copybara.testing.TransformWorks;
 import com.google.copybara.testing.git.GitTestUtil;
 import com.google.copybara.util.console.testing.TestingConsole;
-import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.syntax.Location;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/third_party/bazel.patch b/third_party/bazel.patch
@@ -9,4 +9,4 @@
 +    # data = [":libcpu_profiler.so"],  # will be loaded dynamically
      deps = [
          ":frontend",
-         "//src/main/java/com/google/devtools/build/lib:events",
+         "//src/main/java/com/google/devtools/build/lib:util",
