mirror of
https://github.com/atom/atom.git
synced 2026-02-14 08:35:11 -05:00
Show commits ahead/behind upstream in status bar
This commit is contained in:
@@ -27,9 +27,11 @@ class Git
|
||||
ignore: 1 << 14
|
||||
|
||||
statuses: null
|
||||
upstream: null
|
||||
|
||||
constructor: (path, options={}) ->
|
||||
@statuses = {}
|
||||
@upstream = {ahead: 0, behind: 0}
|
||||
@repo = GitRepository.open(path)
|
||||
refreshOnWindowFocus = options.refreshOnWindowFocus ? true
|
||||
if refreshOnWindowFocus
|
||||
|
||||
@@ -9,8 +9,10 @@ module.exports =
|
||||
statuses = {}
|
||||
for path, status of repo.getRepo().getStatuses()
|
||||
statuses[fs.join(workingDirectoryPath, path)] = status
|
||||
upstream = repo.getAheadBehindCounts() ? {ahead: 0, behind: 0}
|
||||
repo.destroy()
|
||||
else
|
||||
upstream = {}
|
||||
statuses = {}
|
||||
|
||||
callTaskMethod('statusesLoaded', statuses)
|
||||
callTaskMethod('statusesLoaded', {statuses, upstream})
|
||||
|
||||
@@ -9,8 +9,9 @@ class RepositoryStatusTask extends Task
|
||||
started: ->
|
||||
@callWorkerMethod('loadStatuses', @repo.getPath())
|
||||
|
||||
statusesLoaded: (statuses) ->
|
||||
statusesLoaded: ({statuses, upstream}) ->
|
||||
@done()
|
||||
unless _.isEqual(statuses, @repo.statuses)
|
||||
@repo.statuses = statuses
|
||||
@repo.trigger 'statuses-changed'
|
||||
statusesUnchanged = _.isEqual(statuses, @repo.statuses) and _.isEqual(upstream, @repo.upstream)
|
||||
@repo.statuses = statuses
|
||||
@repo.upstream = upstream
|
||||
@repo.trigger 'statuses-changed' unless statusesUnchanged
|
||||
|
||||
Reference in New Issue
Block a user