github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-03 11:14:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Let's use a separate method for side-effecting.

Browse Source
This commit is contained in:
joshaber
2015-12-01 17:41:51 -05:00
parent ca2fc8dbb0
commit 36604141b9
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/git-repository-async.js
View File

@@ -83,7 +83,7 @@ module.exports = class GitRepositoryAsync {
checkoutOptions.checkoutStrategy = Git.Checkout.STRATEGY.FORCE | Git.Checkout.STRATEGY.DISABLE_PATHSPEC_MATCH
return Git.Checkout.head(repo, checkoutOptions)
})
.then(() => this.getPathStatus(_path))
.then(() => this.refreshStatusForPath(_path))
}
checkoutHeadForEditor (editor) {
@@ -100,9 +100,17 @@ module.exports = class GitRepositoryAsync {
}).then(filePath => this.checkoutHead(filePath))
}
// Returns a Promise that resolves to the status bit of a given path if it has
// one, otherwise 'current'.
getPathStatus (_path) {
// Refresh the status bit for the given path.
//
// Note that if the status of the path has changed, this will emit a
// 'did-change-status' event.
//
// path :: String
// The path whose status should be refreshed.
//
// Returns :: Promise<Number>
// The refreshed status bit for the path.
refreshStatusForPath (_path) {
let relativePath
return this.repoPromise
.then(repo => {
@@ -112,14 +120,21 @@ module.exports = class GitRepositoryAsync {
.then(statuses => {
const cachedStatus = this.pathStatusCache[relativePath] || 0
const status = statuses[0] ? statuses[0].statusBit() : Git.Status.STATUS.CURRENT
if (status !== cachedStatus && this.emitter != null) {
if (status !== cachedStatus) {
this.pathStatusCache[relativePath] = status
this.emitter.emit('did-change-status', {path: _path, pathStatus: status})
}
this.pathStatusCache[relativePath] = status
return status
})
}
// Returns a Promise that resolves to the status bit of a given path if it has
// one, otherwise 'current'.
getPathStatus (_path) {
return this.refreshStatusForPath(_path)
}
// Get the status of a directory in the repository's working directory.
//
// * `directoryPath` The {String} path to check.
@@ -192,9 +207,7 @@ module.exports = class GitRepositoryAsync {
const getBufferPathStatus = () => {
const _path = buffer.getPath()
if (_path) {
// We don't need to do anything with this promise, we just want the
// emitted event side effect
this.getPathStatus(_path)
this.refreshStatusForPath(_path)
}
}