Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
10 changed files
with
561 additions
and
200 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| //go:build go || !rust | ||
| // +build go !rust | ||
|
|
||
| package hashing | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os/exec" | ||
|
|
||
| "github.com/vercel/turbo/cli/internal/encoding/gitoutput" | ||
| "github.com/vercel/turbo/cli/internal/turbopath" | ||
| ) | ||
|
|
||
| func getPackageFileHashesFromGitIndex(rootPath turbopath.AbsoluteSystemPath, packagePath turbopath.AnchoredSystemPath) (map[turbopath.AnchoredUnixPath]string, error) { | ||
| var result map[turbopath.AnchoredUnixPath]string | ||
| absolutePackagePath := packagePath.RestoreAnchor(rootPath) | ||
|
|
||
| // Get the state of the git index. | ||
| gitLsTreeOutput, err := gitLsTree(absolutePackagePath) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("could not get git hashes for files in package %s: %w", packagePath, err) | ||
| } | ||
| result = gitLsTreeOutput | ||
|
|
||
| // Update the with the state of the working directory. | ||
| // The paths returned from this call are anchored at the package directory | ||
| gitStatusOutput, err := gitStatus(absolutePackagePath) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("Could not get git hashes from git status: %v", err) | ||
| } | ||
|
|
||
| // Review status output to identify the delta. | ||
| var filesToHash []turbopath.AnchoredSystemPath | ||
| for filePath, status := range gitStatusOutput { | ||
| if status.isDelete() { | ||
| delete(result, filePath) | ||
| } else { | ||
| filesToHash = append(filesToHash, filePath.ToSystemPath()) | ||
| } | ||
| } | ||
|
|
||
| // Get the hashes for any modified files in the working directory. | ||
| hashes, err := GetHashesForFiles(absolutePackagePath, filesToHash) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // Zip up file paths and hashes together | ||
| for filePath, hash := range hashes { | ||
| result[filePath] = hash | ||
| } | ||
|
|
||
| return result, nil | ||
| } | ||
|
|
||
| // gitStatus returns a map of paths to their `git` status code. This can be used to identify what should | ||
| // be done with files that do not currently match what is in the index. | ||
| // | ||
| // Note: `git status -z`'s relative path results are relative to the repository's location. | ||
| // We need to calculate where the repository's location is in order to determine what the full path is | ||
| // before we can return those paths relative to the calling directory, normalizing to the behavior of | ||
| // `ls-files` and `ls-tree`. | ||
| func gitStatus(rootPath turbopath.AbsoluteSystemPath) (map[turbopath.AnchoredUnixPath]statusCode, error) { | ||
| cmd := exec.Command( | ||
| "git", // Using `git` from $PATH, | ||
| "status", // tell me about the status of the working tree, | ||
| "--untracked-files", // including information about untracked files, | ||
| "--no-renames", // do not detect renames, | ||
| "-z", // with each file path relative to the repository root and \000-terminated, | ||
| "--", // and any additional argument you see is a path, promise. | ||
| ) | ||
| cmd.Args = append(cmd.Args, ".") // Operate in the current directory instead of the root of the working tree. | ||
| cmd.Dir = rootPath.ToString() // Include files only from this directory. | ||
|
|
||
| entries, err := runGitCommand(cmd, "status", gitoutput.NewStatusReader) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| output := make(map[turbopath.AnchoredUnixPath]statusCode, len(entries)) | ||
| convertedRootPath := turbopath.AbsoluteSystemPathFromUpstream(rootPath.ToString()) | ||
|
|
||
| traversePath, err := memoizedGetTraversePath(convertedRootPath) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| for _, entry := range entries { | ||
| statusEntry := gitoutput.StatusEntry(entry) | ||
| // Anchored at repository. | ||
| pathFromStatus := turbopath.AnchoredUnixPathFromUpstream(statusEntry.GetField(gitoutput.Path)) | ||
| var outputPath turbopath.AnchoredUnixPath | ||
|
|
||
| if len(traversePath) > 0 { | ||
| repositoryPath := convertedRootPath.Join(traversePath.ToSystemPath()) | ||
| fileFullPath := pathFromStatus.ToSystemPath().RestoreAnchor(repositoryPath) | ||
|
|
||
| relativePath, err := fileFullPath.RelativeTo(convertedRootPath) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| outputPath = relativePath.ToUnixPath() | ||
| } else { | ||
| outputPath = pathFromStatus | ||
| } | ||
|
|
||
| output[outputPath] = statusCode{x: statusEntry.GetField(gitoutput.StatusX), y: statusEntry.GetField(gitoutput.StatusY)} | ||
| } | ||
|
|
||
| return output, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| //go:build rust | ||
| // +build rust | ||
|
|
||
| package hashing | ||
|
|
||
| import ( | ||
| "github.com/vercel/turbo/cli/internal/ffi" | ||
| "github.com/vercel/turbo/cli/internal/turbopath" | ||
| ) | ||
|
|
||
| func getPackageFileHashesFromGitIndex(rootPath turbopath.AbsoluteSystemPath, packagePath turbopath.AnchoredSystemPath) (map[turbopath.AnchoredUnixPath]string, error) { | ||
| rawHashes, err := ffi.GetPackageFileHashesFromGitIndex(rootPath.ToString(), packagePath.ToString()) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| hashes := make(map[turbopath.AnchoredUnixPath]string, len(rawHashes)) | ||
| for rawPath, hash := range rawHashes { | ||
| hashes[turbopath.AnchoredUnixPathFromUpstream(rawPath)] = hash | ||
| } | ||
| return hashes, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.