Calculate file diffs on demand

lib/controllers/file-patch-controller.js

@@ -5,6 +5,7 @@ import {Emitter, CompositeDisposable} from 'atom'
 import etch from 'etch'
 
 import FilePatchView from '../views/file-patch-view'
+import ModelObserver from '../models/model-observer'
 
 export default class FilePatchController {
   constructor (props) {
@@ -14,28 +15,23 @@ export default class FilePatchController {
     this.unstageHunk = this.unstageHunk.bind(this)
     this.stageLines = this.stageLines.bind(this)
     this.unstageLines = this.unstageLines.bind(this)
-    this.observeFilePatch()
+    this.repositoryObserver = new ModelObserver({
+      didUpdate: () => this.props.onRepoRefresh && this.props.onRepoRefresh()
+    })
+    this.repositoryObserver.setActiveModel(props.repository)
     etch.initialize(this)
   }
 
-  update (props) {
-    this.props = props
-    this.observeFilePatch()
+  async update (props) {
+    this.props = Object.assign({}, this.props, props)
     this.emitter.emit('did-change-title', this.getTitle())
+    await this.repositoryObserver.setActiveModel(props.repository)
     return etch.update(this)
   }
 
-  observeFilePatch () {
-    if (this.filePatchSubscriptions) this.filePatchSubscriptions.dispose()
-    this.filePatchSubscriptions = new CompositeDisposable(
-      this.props.filePatch.onDidUpdate(this.didUpdateFilePatch.bind(this)),
-      this.props.filePatch.onDidDestroy(this.didDestroyFilePatch.bind(this))
-    )
-  }
-
   destroy () {
     this.emitter.emit('did-destroy')
-    this.filePatchSubscriptions.dispose()
+    this.repositoryObserver.destroy()
     return etch.destroy(this)
   }
 

lib/controllers/git-panel-controller.js

@@ -46,8 +46,9 @@ export default class GitPanelController {
         workspace={this.props.workspace}
         commandRegistry={this.props.commandRegistry}
         notificationManager={this.props.notificationManager}
-        didSelectFilePatch={this.props.didSelectFilePatch}
+        didSelectFilePath={this.props.didSelectFilePath}
         didSelectMergeConflictFile={this.props.didSelectMergeConflictFile}
+        focusFilePatchView={this.props.focusFilePatchView}
         stageFilePatch={this.stageFilePatch}
         unstageFilePatch={this.unstageFilePatch}
         stageFiles={this.stageFiles}
@@ -64,9 +65,14 @@ export default class GitPanelController {
     )
   }
 
-  update (props) {
+  async update (props) {
     this.props = Object.assign({}, this.props, props)
-    return this.repositoryObserver.setActiveModel(props.repository)
+    await this.repositoryObserver.setActiveModel(props.repository)
+    return etch.update(this)
+  }
+
+  destroy () {
+    this.repositoryObserver.destroy()
   }
 
   getLastModelDataRefreshPromise () {

lib/controllers/status-bar-tile-controller.js

@@ -38,9 +38,9 @@ export default class StatusBarTileController {
     etch.initialize(this)
   }
 
-  update (props) {
+  async update (props) {
     this.props = Object.assign({}, this.props, props)
-    this.repositoryObserver.setActiveModel(props.repository)
+    await this.repositoryObserver.setActiveModel(props.repository)
     return etch.update(this)
   }
 
@@ -142,11 +142,16 @@ export default class StatusBarTileController {
 
   async fetchChangedFilesCount (repository) {
     const changedFiles = new Set()
-    for (let filePatch of await repository.getUnstagedChanges()) {
-      changedFiles.add(filePatch.getPath())
+    const {stagedFiles, unstagedFiles, mergeConflictFiles} = await repository.getStatusesForChangedFiles()
+
+    for (let filePath in unstagedFiles) {
+      changedFiles.add(filePath)
+    }
+    for (let filePath in stagedFiles) {
+      changedFiles.add(filePath)
     }
-    for (let filePatch of await repository.getStagedChanges()) {
-      changedFiles.add(filePatch.getPath())
+    for (let filePath in mergeConflictFiles) {
+      changedFiles.add(filePath)
     }
     return changedFiles.size
   }
@@ -189,5 +194,6 @@ export default class StatusBarTileController {
   destroy () {
     this.branchTooltipDisposable && this.branchTooltipDisposable.dispose()
     this.pushPullTooltipDisposable && this.pushPullTooltipDisposable.dispose()
+    this.repositoryObserver.destroy()
   }
 }

lib/git-shell-out-strategy.js

@@ -129,13 +129,59 @@ export default class GitShellOutStrategy {
   /**
    * File Status and Diffs
    */
+  async getStatusesForChangedFiles () {
+    const output = await this.exec(['status', '--untracked-files=all', '-z'])
+
+    const statusMap = {
+      A: 'added',
+      M: 'modified',
+      D: 'deleted',
+      U: 'modified',
+      '?': 'added'
+    }
+
+    const stagedFiles = {}
+    const unstagedFiles = {}
+    const mergeConflictFiles = {}
+    const statusToHead = await this.diffFileStatus({target: 'HEAD'})
+
+    if (output) {
+      const lines = output.split('\0')
+      for (let i = 0; i < lines.length; i++) {
+        const line = lines[i]
+        if (line === '') continue
+        const [_, x, y, filePath] = line.match(/(.)(.)\s(.*)/)
+        if (x === 'U' || y === 'U' || (x === 'A' && y === 'A')) {
+          mergeConflictFiles[filePath] = {
+            ours: statusMap[x],
+            theirs: statusMap[y],
+            file: statusToHead[filePath] || 'equivalent'
+          }
+          continue
+        }
+        if (x === 'R') {
+          stagedFiles[filePath] = 'added'
+          stagedFiles[lines[++i]] = 'deleted'
+          continue
+        }
+        if (y !== ' ') {
+          unstagedFiles[filePath] = statusMap[y]
+        }
+        if (x !== ' ' && x !== '?') {
+          stagedFiles[filePath] = statusMap[x]
+        }
+      }
+    }
+
+    return {stagedFiles, unstagedFiles, mergeConflictFiles}
+  }
+
   async diffFileStatus (options = {}) {
     const args = ['diff', '--name-status', '--no-renames']
     if (options.staged) args.push('--staged')
     if (options.target) args.push(options.target)
     if (options.diffFilter === 'unmerged') args.push('--diff-filter=U')
     const output = await this.exec(args)
-    const untracked = await this.getUntrackedFiles()
 
     const statusMap = {
       A: 'added',
@@ -145,11 +191,14 @@ export default class GitShellOutStrategy {
     }
 
     const fileStatuses = {}
-    untracked.forEach(filePath => { fileStatuses[filePath] = 'added' })
     output && output.trim().split(LINE_ENDING_REGEX).forEach(line => {
       const [status, filePath] = line.split('	')
       fileStatuses[filePath] = statusMap[status]
     })
+    if (!options.staged) {
+      const untracked = await this.getUntrackedFiles()
+      untracked.forEach(filePath => { fileStatuses[filePath] = 'added' })
+    }
     return fileStatuses
   }
 
@@ -159,27 +208,25 @@ export default class GitShellOutStrategy {
     return output.trim().split(LINE_ENDING_REGEX)
   }
 
-  async diff (options = {}) {
-    const args = ['diff', '--no-prefix', '--no-renames', '--diff-filter=u']
-    if (options.staged) args.push('--staged')
-    if (options.baseCommit) args.push(options.baseCommit)
+  async getDiffForFilePath (filePath, {staged, baseCommit} = {}) {
+    let args = ['diff', '--no-prefix', '--no-renames', '--diff-filter=u']
+    if (staged) args.push('--staged')
+    if (baseCommit) args.push(baseCommit)
+    args = args.concat(['--', filePath])
     let output = await this.exec(args)
 
     let rawDiffs = []
     if (output) rawDiffs = parseDiff(output).filter(rawDiff => rawDiff.status !== 'unmerged')
 
-    if (!options.staged) {
-      // add untracked files
-      const untrackedFilePatches = await Promise.all((await this.getUntrackedFiles()).map(async (filePath) => {
-        const absPath = path.join(this.workingDir, filePath)
-        const stats = await fsStat(absPath)
-        const contents = await readFile(absPath)
-        return buildAddedFilePatch(filePath, contents, stats)
-      }))
-      rawDiffs = rawDiffs.concat(untrackedFilePatches)
+    if (!staged && (await this.getUntrackedFiles()).includes(filePath)) {
+      // add untracked file
+      const absPath = path.join(this.workingDir, filePath)
+      const stats = await fsStat(absPath)
+      const contents = await readFile(absPath)
+      rawDiffs.push(buildAddedFilePatch(filePath, contents, stats))
     }
-
-    return rawDiffs.sort((a, b) => (a.newPath || a.oldPath).localeCompare(b.newPath || b.oldPath))
+    if (rawDiffs.length > 1) throw new Error(`Expected 0 or 1 diffs for ${filePath} but got ${rawDiffs.length}`)
+    return rawDiffs[0]
   }
 
   /**
@@ -205,30 +252,6 @@ export default class GitShellOutStrategy {
     return this.exec(['merge', branchName])
   }
 
-  async getMergeConflictFileStatus () {
-    const output = await this.exec(['status', '--short'])
-    const statusToHead = await this.diffFileStatus({target: 'HEAD'})
-
-    const statusMap = {
-      A: 'added',
-      U: 'modified',
-      D: 'deleted'
-    }
-
-    const statusesByPath = {}
-    output && output.trim().split(LINE_ENDING_REGEX).forEach(line => {
-      const [oursTheirsStatus, filePath] = line.split(' ')
-      if (['DD', 'AU', 'UD', 'UA', 'DU', 'AA', 'UU'].includes(oursTheirsStatus)) {
-        statusesByPath[filePath] = {
-          ours: statusMap[oursTheirsStatus[0]],
-          theirs: statusMap[oursTheirsStatus[1]],
-          file: statusToHead[filePath] || 'equivalent'
-        }
-      }
-    })
-    return statusesByPath
-  }
-
   async isMerging () {
     try {
       await readFile(path.join(this.workingDir, '.git', 'MERGE_HEAD'))