[SR-5437] Check for untracked files (swiftlang#1396)

* SR-5437 Check for untracked files * SR-5437 Add comment * SR-5437 Use Process.checkNonZeroExit

Author: noefroidevaux

Sources/SourceControl/GitRepository.swift

@@ -302,18 +302,11 @@ public class GitRepository: Repository, WorkingCheckout {
  // Only a work tree can have changes.
  guard isWorkingRepo else { return false }
  return queue.sync {
- // Detect if there is a staged or unstaged diff.
- // This won't detect new untracked files, but it is
- // just a safety measure for now.
- let args = [Git.tool, "-C", path.asString, "diff", "--no-ext-diff", "--quiet", "--exit-code"]
- var nonZeroExit = false
-
- for args in [args, args + ["--cached"]] {
- let result = try? Process.popen(arguments: args)
- nonZeroExit = nonZeroExit || result?.exitStatus != .terminated(code: 0)
+ // Check nothing has been changed
+ guard let result = try? Process.checkNonZeroExit(args: Git.tool, "-C", path.asString, "status", "-s") else {
+ return false
  }
-
- return nonZeroExit
+ return !result.chomp().isEmpty
  }
  }
 

Tests/SourceControlTests/GitRepositoryTests.swift

@@ -402,7 +402,13 @@ class GitRepositoryTests: XCTestCase {
  // Create a file (which we will modify later).
  try localFileSystem.writeFileContents(testRepoPath.appending(component: "test.txt"), bytes: "Hi")
  let repo = GitRepository(path: testRepoPath)
+
+ XCTAssert(repo.hasUncommitedChanges())
+
  try repo.stage(file: "test.txt")
+
+ XCTAssert(repo.hasUncommitedChanges())
+
  try repo.commit()
 
  XCTAssertFalse(repo.hasUncommitedChanges())