Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module(
name = "bazel-diff",
version = "11.0.3",
version = "12.0.0",
compatibility_level = 0,
)

Expand Down
2 changes: 1 addition & 1 deletion MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ First, add the following snippet to your project:
#### Bzlmod snippet

```bazel
bazel_dep(name = "bazel-diff", version = "11.0.3")
bazel_dep(name = "bazel-diff", version = "12.0.0")
```

You can now run the tool with:
Expand Down
6 changes: 6 additions & 0 deletions cli/src/main/kotlin/com/bazel_diff/hash/SourceFileHasher.kt
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ class SourceFileHasherImpl : KoinComponent, SourceFileHasher {
if (relativeFilenameToContentHash?.contains(filenamePathString) == true) {
val contentHash = relativeFilenameToContentHash.getValue(filenamePathString)
safePutBytes(contentHash.toByteArray())
// Mark that file exists (via content hash)
putBytes(byteArrayOf(0x01))
} else {
val absoluteFilePath = workingDirectory.resolve(filenamePath)
val file = absoluteFilePath.toFile()
Expand All @@ -98,9 +100,13 @@ class SourceFileHasherImpl : KoinComponent, SourceFileHasher {
} else if (modifiedFilepaths.any { workingDirectory.resolve(it) == absoluteFilePath }) {
putFile(file)
}
// Mark that file exists
putBytes(byteArrayOf(0x01))
}
} else {
logger.w { "File $absoluteFilePath not found" }
// Mark that file is missing
putBytes(byteArrayOf(0x00))
}
}
safePutBytes(sourceFileTarget.seed)
Expand Down
39 changes: 39 additions & 0 deletions cli/src/test/kotlin/com/bazel_diff/hash/SourceFileHasherTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.bazel_diff.hash

import assertk.assertThat
import assertk.assertions.isEqualTo
import assertk.assertions.isNotEqualTo
import assertk.assertions.isNull
import com.bazel_diff.bazel.BazelSourceFileTarget
import com.bazel_diff.extensions.toHexString
Expand Down Expand Up @@ -38,6 +39,7 @@ internal class SourceFileHasherTest : KoinTest {
val expected =
sha256 {
safePutBytes(fixtureFileContent)
putBytes(byteArrayOf(0x01))
safePutBytes(seed)
safePutBytes(fixtureFileTarget.toByteArray())
}
Expand All @@ -53,6 +55,7 @@ internal class SourceFileHasherTest : KoinTest {
val expected =
sha256 {
safePutBytes(fixtureFileContent)
putBytes(byteArrayOf(0x01))
safePutBytes(seed)
safePutBytes(fixtureFileTarget.toByteArray())
}
Expand All @@ -68,6 +71,7 @@ internal class SourceFileHasherTest : KoinTest {
hasher.digest(bazelSourceFileTarget, setOf(Paths.get("some/other/path"))).toHexString()
val expected =
sha256 {
putBytes(byteArrayOf(0x01))
safePutBytes(seed)
safePutBytes(fixtureFileTarget.toByteArray())
}
Expand All @@ -89,6 +93,7 @@ internal class SourceFileHasherTest : KoinTest {
val expected =
sha256 {
safePutBytes(externalRepoFileContent.toByteArray())
putBytes(byteArrayOf(0x01))
safePutBytes(seed)
safePutBytes(externalRepoFileTarget.toByteArray())
}
Expand All @@ -104,6 +109,7 @@ internal class SourceFileHasherTest : KoinTest {
val expected =
sha256 {
safePutBytes(fixtureFileContent)
putBytes(byteArrayOf(0x01))
safePutBytes(seed)
safePutBytes(fixtureFileTarget.toByteArray())
}
Expand Down Expand Up @@ -136,6 +142,7 @@ internal class SourceFileHasherTest : KoinTest {
val actual = hasher.digest(bazelSourceFileTarget).toHexString()
val expected =
sha256 {
putBytes(byteArrayOf(0x00))
safePutBytes(seed)
safePutBytes(target.toByteArray())
}
Expand Down Expand Up @@ -163,6 +170,7 @@ internal class SourceFileHasherTest : KoinTest {
val expected =
sha256 {
safePutBytes("foo-content-hash".toByteArray())
putBytes(byteArrayOf(0x01))
safePutBytes(seed)
safePutBytes(fixtureFileTarget.toByteArray())
}
Expand All @@ -180,6 +188,7 @@ internal class SourceFileHasherTest : KoinTest {
val expected =
sha256 {
safePutBytes(fixtureFileContent)
putBytes(byteArrayOf(0x01))
safePutBytes(seed)
safePutBytes(fixtureFileTarget.toByteArray())
}
Expand All @@ -198,10 +207,40 @@ internal class SourceFileHasherTest : KoinTest {
val expected =
sha256 {
safePutBytes("foo-content-hash".toByteArray())
putBytes(byteArrayOf(0x01))
safePutBytes(seed)
safePutBytes(targetName.toByteArray())
}
.toHexString()
assertThat(actual).isEqualTo(expected)
}

@Test
fun testHashEmptyFileVsDeletedFile() = runBlocking<Unit> {
// Create a temp directory for testing
val testDir = Files.createTempDirectory("empty_file_test")
val emptyFilePath = testDir.resolve("path/to/empty.txt")
Files.createDirectories(emptyFilePath.parent)
Files.createFile(emptyFilePath)

val emptyFileTarget = "//path/to:empty.txt"
val hasher = SourceFileHasherImpl(testDir, null, externalRepoResolver)

// Hash the empty file (file exists)
val emptyFileHash = hasher.digest(BazelSourceFileTarget(emptyFileTarget, seed)).toHexString()

// Delete the file
Files.delete(emptyFilePath)

// Hash the non-existent file
val deletedFileHash = hasher.digest(BazelSourceFileTarget(emptyFileTarget, seed)).toHexString()

// The hashes should be different (file exists vs file missing)
assertThat(emptyFileHash).isNotEqualTo(deletedFileHash)

// Clean up
Files.deleteIfExists(emptyFilePath.parent)
Files.deleteIfExists(testDir.resolve("path"))
Files.deleteIfExists(testDir)
}
}
Loading