Merge pull request #10827 from atom/subdir-status-fixes

Port repository subdirectory status fixes to async repo

spec/git-repository-async-spec.js

@@ -338,10 +338,10 @@ describe('GitRepositoryAsync', () => {
   })
 
   describe('.refreshStatus()', () => {
-    let newPath, modifiedPath, cleanPath
+    let newPath, modifiedPath, cleanPath, workingDirectory
 
     beforeEach(() => {
-      const workingDirectory = copyRepository()
+      workingDirectory = copyRepository()
       repo = GitRepositoryAsync.open(workingDirectory)
       modifiedPath = path.join(workingDirectory, 'file.txt')
       newPath = path.join(workingDirectory, 'untracked.txt')
@@ -362,7 +362,7 @@ describe('GitRepositoryAsync', () => {
 
     describe('in a repository with submodules', () => {
       beforeEach(() => {
-        const workingDirectory = copySubmoduleRepository()
+        workingDirectory = copySubmoduleRepository()
         repo = GitRepositoryAsync.open(workingDirectory)
         modifiedPath = path.join(workingDirectory, 'jstips', 'README.md')
         newPath = path.join(workingDirectory, 'You-Dont-Need-jQuery', 'untracked.txt')
@@ -380,6 +380,48 @@ describe('GitRepositoryAsync', () => {
         expect(repo.isStatusModified(await repo.getCachedPathStatus(modifiedPath))).toBe(true)
       })
     })
+
+    it('caches the proper statuses when a subdir is open', async () => {
+      const subDir = path.join(workingDirectory, 'dir')
+      fs.mkdirSync(subDir)
+
+      const filePath = path.join(subDir, 'b.txt')
+      fs.writeFileSync(filePath, '')
+
+      atom.project.setPaths([subDir])
+
+      await atom.workspace.open('b.txt')
+
+      const repo = atom.project.getRepositories()[0].async
+
+      await repo.refreshStatus()
+
+      const status = await repo.getCachedPathStatus(filePath)
+      expect(repo.isStatusModified(status)).toBe(false)
+      expect(repo.isStatusNew(status)).toBe(false)
+    })
+
+    it('caches the proper statuses when multiple project are open', async () => {
+      const otherWorkingDirectory = copyRepository()
+
+      atom.project.setPaths([workingDirectory, otherWorkingDirectory])
+
+      await atom.workspace.open('b.txt')
+
+      const repo = atom.project.getRepositories()[0].async
+
+      await repo.refreshStatus()
+
+      const subDir = path.join(workingDirectory, 'dir')
+      fs.mkdirSync(subDir)
+
+      const filePath = path.join(subDir, 'b.txt')
+      fs.writeFileSync(filePath, 'some content!')
+
+      const status = await repo.getCachedPathStatus(filePath)
+      expect(repo.isStatusModified(status)).toBe(true)
+      expect(repo.isStatusNew(status)).toBe(false)
+    })
   })
 
   describe('.isProjectAtRoot()', () => {

src/git-repository-async.js

@@ -456,7 +456,10 @@ export default class GitRepositoryAsync {
   // information.
   getDirectoryStatus (directoryPath) {
     return this.relativizeToWorkingDirectory(directoryPath)
-      .then(relativePath => this._getStatus([relativePath]))
+      .then(relativePath => {
+        const pathspec = relativePath + '/**'
+        return this._getStatus([pathspec])
+      })
       .then(statuses => {
         return Promise.all(statuses.map(s => s.statusBit())).then(bits => {
           return bits
@@ -800,7 +803,7 @@ export default class GitRepositoryAsync {
     }
 
     return Promise.all(projectPathsPromises)
-      .then(paths => paths.filter(p => p.length > 0))
+      .then(paths => paths.map(p => p.length > 0 ? p + '/**' : '*'))
       .then(projectPaths => {
         return this._getStatus(projectPaths.length > 0 ? projectPaths : null)
       })
@@ -1032,7 +1035,7 @@ export default class GitRepositoryAsync {
     return this.getRepo()
       .then(repo => {
         const opts = {
-          flags: Git.Status.OPT.INCLUDE_UNTRACKED | Git.Status.OPT.RECURSE_UNTRACKED_DIRS | Git.Status.OPT.DISABLE_PATHSPEC_MATCH
+          flags: Git.Status.OPT.INCLUDE_UNTRACKED | Git.Status.OPT.RECURSE_UNTRACKED_DIRS
         }
 
         if (paths) {