Skip to content

Allow the list of fine grained hashes to be defined by a file #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 1, 2025
Merged

Allow the list of fine grained hashes to be defined by a file #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71aed29
Allow the list of fine grained hashes to be defined by a file
blockjon-dd Jun 30, 2025
985c36a
Make the flags mutually exclusive
blockjon-dd Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions cli/src/main/kotlin/com/bazel_diff/cli/GenerateHashesCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ class GenerateHashesCommand : Callable<Int> {
)
var fineGrainedHashExternalRepos: Set<String> = emptySet()

@CommandLine.Option(
names = ["--fineGrainedHashExternalReposFile"],
description =
[
"A text file containing a newline separated list of external repos. Similar to --fineGrainedHashExternalRepos but helps you avoid exceeding max arg length. Mutually exclusive with --fineGrainedHashExternalRepos."])
var fineGrainedHashExternalReposFile: File? = null

@CommandLine.Option(
names = ["--useCquery"],
negatable = true,
Expand Down Expand Up @@ -192,6 +199,7 @@ class GenerateHashesCommand : Callable<Int> {
keepGoing,
depsMappingJSONPath != null,
fineGrainedHashExternalRepos,
fineGrainedHashExternalReposFile,
excludeExternalTargets,
),
loggingModule(parent.verbose),
Expand Down
17 changes: 14 additions & 3 deletions cli/src/main/kotlin/com/bazel_diff/di/Modules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,19 @@ fun hasherModule(
keepGoing: Boolean,
trackDeps: Boolean,
fineGrainedHashExternalRepos: Set<String>,
fineGrainedHashExternalReposFile: File?,
excludeExternalTargets: Boolean,
): Module = module {
if (fineGrainedHashExternalReposFile != null && fineGrainedHashExternalRepos.isNotEmpty()) {
System.err.println("Error: fineGrainedHashExternalReposFile and fineGrainedHashExternalRepos are mutually exclusive - please provide only one of them")
System.exit(1)
}
val updatedFineGrainedHashExternalRepos = fineGrainedHashExternalReposFile?.let { file ->
file.readLines()
.filter { it.isNotBlank() }
.toSet()
} ?: fineGrainedHashExternalRepos

val cmd: MutableList<String> =
ArrayList<String>().apply {
add(bazelPath.toString())
Expand Down Expand Up @@ -60,11 +71,11 @@ fun hasherModule(
keepGoing,
debug)
}
single { BazelClient(useCquery, fineGrainedHashExternalRepos, excludeExternalTargets) }
single { BazelClient(useCquery, updatedFineGrainedHashExternalRepos, excludeExternalTargets) }
single { BuildGraphHasher(get()) }
single { TargetHasher() }
single { RuleHasher(useCquery, trackDeps, fineGrainedHashExternalRepos) }
single<SourceFileHasher> { SourceFileHasherImpl(fineGrainedHashExternalRepos) }
single { RuleHasher(useCquery, trackDeps, updatedFineGrainedHashExternalRepos) }
single<SourceFileHasher> { SourceFileHasherImpl(updatedFineGrainedHashExternalRepos) }
single { ExternalRepoResolver(workingDirectory, bazelPath, outputPath) }
single(named("working-directory")) { workingDirectory }
single(named("output-base")) { outputPath }
Expand Down
Loading