Revert "fix(turborepo): SCM tests and renaming (#4462)"

cli/internal/ffi/ffi.go

@@ -116,15 +116,15 @@ func stringToRef(s string) *string {
 }
 
 // ChangedFiles returns the files changed in between two commits, the workdir and the index, and optionally untracked files
-func ChangedFiles(gitRoot string, turboRoot string, fromCommit string, toCommit string) ([]string, error) {
+func ChangedFiles(repoRoot string, monorepoRoot string, fromCommit string, toCommit string) ([]string, error) {
 	fromCommitRef := stringToRef(fromCommit)
 	toCommitRef := stringToRef(toCommit)
 
 	req := ffi_proto.ChangedFilesReq{
-		GitRoot:    gitRoot,
-		FromCommit: fromCommitRef,
-		ToCommit:   toCommitRef,
-		TurboRoot:  turboRoot,
+		RepoRoot:     repoRoot,
+		FromCommit:   fromCommitRef,
+		ToCommit:     toCommitRef,
+		MonorepoRoot: monorepoRoot,
 	}
 
 	reqBuf := Marshal(&req)
@@ -144,9 +144,9 @@ func ChangedFiles(gitRoot string, turboRoot string, fromCommit string, toCommit
 }
 
 // PreviousContent returns the content of a file at a previous commit
-func PreviousContent(gitRoot, fromCommit, filePath string) ([]byte, error) {
+func PreviousContent(repoRoot, fromCommit, filePath string) ([]byte, error) {
 	req := ffi_proto.PreviousContentReq{
-		GitRoot:    gitRoot,
+		RepoRoot:   repoRoot,
 		FromCommit: fromCommit,
 		FilePath:   filePath,
 	}

cli/internal/scm/git_go.go

@@ -1,6 +1,3 @@
-//go:build go || !rust
-// +build go !rust
-
 // Package scm abstracts operations on various tools like git
 // Currently, only git is supported.
 //

crates/turborepo-ffi/messages.proto

@@ -24,10 +24,10 @@ message GlobRespList {
 }
 
 message ChangedFilesReq {
-  string git_root = 1;
-  string turbo_root = 2;
+  string repo_root = 1;
+  string monorepo_root = 2;
   optional string from_commit = 3;
-  string to_commit = 4;
+  optional string to_commit = 4;
 }
 
 message ChangedFilesResp {
@@ -42,7 +42,7 @@ message ChangedFilesList {
 }
 
 message PreviousContentReq {
-  string git_root = 1;
+  string repo_root = 1;
   string from_commit = 2;
   string file_path = 3;
 }

crates/turborepo-ffi/src/lib.rs

@@ -74,11 +74,11 @@ pub extern "C" fn changed_files(buffer: Buffer) -> Buffer {
         }
     };
 
+    let commit_range = req.from_commit.as_deref().zip(req.to_commit.as_deref());
     let response = match turborepo_scm::git::changed_files(
-        req.git_root.into(),
-        req.turbo_root.into(),
-        req.from_commit.as_deref(),
-        &req.to_commit,
+        req.repo_root.into(),
+        req.monorepo_root.into(),
+        commit_range,
     ) {
         Ok(files) => {
             let files: Vec<_> = files.into_iter().collect();
@@ -108,7 +108,7 @@ pub extern "C" fn previous_content(buffer: Buffer) -> Buffer {
     };
 
     let response = match turborepo_scm::git::previous_content(
-        req.git_root.into(),
+        req.repo_root.into(),
         &req.from_commit,
         PathBuf::from(req.file_path),
     ) {