github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-26 07:19:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Correctly determine new/mod/del status as per git-utils

Browse Source
This commit is contained in:
Daniel Hengeveld
2015-10-26 15:18:37 +01:00
parent 03045674b8
commit 86f6b62176
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,11 @@ const Git = require('nodegit')
const path = require('path')
const {Emitter, Disposable, CompositeDisposable} = require('event-kit')
const modifiedStatusFlags = Git.Status.STATUS.WT_MODIFIED | Git.Status.STATUS.INDEX_MODIFIED | Git.Status.STATUS.WT_DELETED | Git.Status.STATUS.INDEX_DELETED | Git.Status.STATUS.WT_TYPECHANGE | Git.Status.STATUS.INDEX_TYPECHANGE
const newStatusFlags = Git.Status.STATUS.WT_NEW | Git.Status.STATUS.INDEX_NEW
const deletedStatusFlags = Git.Status.STATUS.WT_DELETED | Git.Status.STATUS.INDEX_DELETED
const indexStatusFlags = Git.Status.STATUS.INDEX_NEW | Git.Status.STATUS.INDEX_MODIFIED | Git.Status.STATUS.INDEX_DELETED | Git.Status.STATUS.INDEX_RENAMED | Git.Status.STATUS.INDEX_TYPECHANGE
// Temporary requires
// ==================
// GitUtils is temporarily used for ::relativize only, because I don't want
@@ -133,18 +138,21 @@ module.exports = class GitRepositoryAsync {
// {::isStatusModified} or {::isStatusNew} to get more information.
getDirectoryStatus (directoryPath) {
var relativePath = this._gitUtilsRepo.relativize(directoryPath)
let relativePath = this._gitUtilsRepo.relativize(directoryPath)
// XXX _filterSBD already gets repoPromise
return this.repoPromise.then((repo) => {
return this._filterStatusesByDirectory(relativePath)
}).then((statuses) => {
return Promise.all(statuses.map(function (s) { return s.statusBit() })).then(function (bits) {
var ret = 0
var filteredBits = bits.filter(function (b) { return b > 0 })
let directoryStatus = 0
let filteredBits = bits.filter(function (b) { return b > 0 })
if (filteredBits.length > 0) {
ret = filteredBits.pop()
filteredBits.forEach(function (bit) {
directoryStatus |= bit
})
}
return Promise.resolve(ret)
return directoryStatus
})
})
}
@@ -208,13 +216,24 @@ module.exports = class GitRepositoryAsync {
return this.pathStatusCache[this._gitUtilsRepo.relativize(_path)]
}
// TODO fix with bitwise ops
isStatusNew (statusBit) {
return Object.is(statusBit, Git.Status.STATUS.WT_NEW) || Object.is(statusBit, Git.Status.STATUS.INDEX_NEW)
return (statusBit & newStatusFlags) > 0
}
isStatusModified (statusBit) {
return Object.is(statusBit, Git.Status.STATUS.WT_MODIFIED) || Object.is(statusBit, Git.Status.STATUS.INDEX_MODIFIED)
return (statusBit & modifiedStatusFlags) > 0
}
isStatusStaged (statusBit) {
return (statusBit & indexStatusFlags) > 0
}
isStatusIgnored (statusBit) {
return (statusBit & (1 << 14)) > 0
}
isStatusDeleted (statusBit) {
return (statusBit & deletedStatusFlags) > 0
}
_filterStatusesByPath (_path) {