[8.0.1] Streamline `ModuleExtensionId#toString()` & Fix edge cases in lockfile handling (#24845)
### Streamline `ModuleExtensionId#toString()` Currently `ModuleExtensionId#toString()` uses the default Java record repr, which isn't very user-friendly. There's really no reason not to use the `asTargetString()` method instead. This PR just renames `asTargetString()` to `toString()` and updates all call sites. Closes #24450. PiperOrigin-RevId: 700050362 Change-Id: I82238d2134e1642694f0b20235fcfe9307ceaa7d (cherry picked from commit d23421a0) ### Fix edge cases in lockfile handling * Don't run the core logic when `--lockfile_mode` is `off` or `error` but the command doesn't forward options to Skyframe. * Honor `reproducible` per extension eval factor, not per extension. * Fix encoding conflict between isolation key and `use_repo_rule`'s fake extension names This doesn't require a lockfile version bump as `use_repo_rule`'s fake extension (so far) isn't included in the lockfile. Work towards #24723 Closes #24754. PiperOrigin-RevId: 712623562 Change-Id: I61fd439539031a01ddec4488276ff2d0484849f2 (cherry picked from commit cfda1780 ) Fixes #24754 Co-authored-by:Xdng Yng <wyverald@gmail.com>
Showing
- src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileModule.java 32 additions, 18 deletions.../devtools/build/lib/bazel/bzlmod/BazelLockFileModule.java
- src/main/java/com/google/devtools/build/lib/bazel/bzlmod/InnateRunnableExtension.java 6 additions, 6 deletions...tools/build/lib/bazel/bzlmod/InnateRunnableExtension.java
- src/main/java/com/google/devtools/build/lib/bazel/bzlmod/LockFileModuleExtension.java 2 additions, 3 deletions...tools/build/lib/bazel/bzlmod/LockFileModuleExtension.java
- src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionEvalStarlarkThreadContext.java 1 addition, 1 deletion...azel/bzlmod/ModuleExtensionEvalStarlarkThreadContext.java
- src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionEvaluationProgress.java 1 addition, 13 deletions...d/lib/bazel/bzlmod/ModuleExtensionEvaluationProgress.java
- src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionId.java 5 additions, 4 deletions...le/devtools/build/lib/bazel/bzlmod/ModuleExtensionId.java
- src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunction.java 1 addition, 1 deletion...e/devtools/build/lib/bazel/bzlmod/ModuleFileFunction.java
- src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileGlobals.java 1 addition, 1 deletion...le/devtools/build/lib/bazel/bzlmod/ModuleFileGlobals.java
- src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RegularRunnableExtension.java 5 additions, 12 deletions...ools/build/lib/bazel/bzlmod/RegularRunnableExtension.java
- src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java 1 addition, 1 deletion...s/build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java
- src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionFunction.java 6 additions, 9 deletions...tools/build/lib/bazel/bzlmod/SingleExtensionFunction.java
- src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/GraphvizOutputFormatter.java 1 addition, 1 deletion.../lib/bazel/bzlmod/modcommand/GraphvizOutputFormatter.java
- src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/JsonOutputFormatter.java 1 addition, 1 deletion...uild/lib/bazel/bzlmod/modcommand/JsonOutputFormatter.java
- src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/ModExecutor.java 2 additions, 3 deletions...vtools/build/lib/bazel/bzlmod/modcommand/ModExecutor.java
- src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/TextOutputFormatter.java 1 addition, 1 deletion...uild/lib/bazel/bzlmod/modcommand/TextOutputFormatter.java
- src/main/java/com/google/devtools/build/lib/skyframe/BzlLoadCycleReporter.java 1 addition, 3 deletions...gle/devtools/build/lib/skyframe/BzlLoadCycleReporter.java
- src/main/java/com/google/devtools/build/lib/skyframe/BzlmodRepoCycleReporter.java 1 addition, 3 deletions.../devtools/build/lib/skyframe/BzlmodRepoCycleReporter.java
- src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BUILD 2 additions, 0 deletions...est/java/com/google/devtools/build/lib/bazel/bzlmod/BUILD
- src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileModuleTest.java 113 additions, 0 deletions...tools/build/lib/bazel/bzlmod/BazelLockFileModuleTest.java
- src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java 34 additions, 28 deletions...build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java
Please register or sign in to comment