Skip to content

Normalize Git-Relative paths to Project-Relative paths. #334

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

Open
Lingviston wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Normalize Git-Relative paths to Project-Relative paths. #334

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
692bdc5
Normalize Git-Relative paths to Project-Relative paths.
Lingviston Dec 29, 2025
75903f2
Reduce code duplication
Lingviston Dec 29, 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
26 changes: 19 additions & 7 deletions ...duledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,20 +646,32 @@ class AffectedModuleDetectorImpl(
}

private fun affectsAllModules(relativeFilePath: String): Boolean {
val rootProjectDir = if (config.baseDir != null) {
File(config.baseDir!!)
} else {
File(projectGraph.getRootProjectPath()!!.path)
}
val rootProjectDir = getRootProjectDir()

// Normalize the file path from git-relative to project-relative
val pathSections = relativeFilePath.toPathSections(rootProjectDir, gitRoot)
val projectRelativePath = pathSections.joinToString(File.separatorChar.toString())

return config.pathsAffectingAllModules.any { projectRelativePath.startsWith(it) }
}

private fun findContainingProject(filePath: String): ProjectPath? {
return projectGraph.findContainingProject(filePath, logger).also {
logger?.info("search result for $filePath resulted in ${it?.path}")
val rootProjectDir = getRootProjectDir()

// Normalize the file path from git-relative to project-relative
val pathSections = filePath.toPathSections(rootProjectDir, gitRoot)
val projectRelativePath = pathSections.joinToString(File.separatorChar.toString())

return projectGraph.findContainingProject(projectRelativePath, logger).also {
logger?.info("search result for $filePath (normalized to $projectRelativePath) resulted in ${it?.path}")
}
}

private fun getRootProjectDir(): File {
return if (config.baseDir != null) {
File(config.baseDir!!)
} else {
File(projectGraph.getRootProjectPath()!!.path)
}
}
}
Expand Down