Merge branch 'remove-view-registry-dependency' into remove-project-dependency

package.json

@@ -39,7 +39,7 @@
     "marked": "^0.3.4",
     "normalize-package-data": "^2.0.0",
     "nslog": "^3",
-    "ohnogit": "0.0.9",
+    "ohnogit": "0.0.11",
     "oniguruma": "^5",
     "pathwatcher": "~6.2",
     "property-accessors": "^1.1.3",
@@ -107,7 +107,7 @@
     "settings-view": "0.235.1",
     "snippets": "1.0.2",
     "spell-check": "0.67.1",
-    "status-bar": "1.2.4",
+    "status-bar": "1.2.6",
     "styleguide": "0.45.2",
     "symbols-view": "0.112.0",
     "tabs": "0.93.1",

resources/win/atom.cmd

@@ -27,6 +27,7 @@ IF "%EXPECT_OUTPUT%"=="YES" (
   SET ELECTRON_ENABLE_LOGGING=YES
   IF "%WAIT%"=="YES" (
     powershell -noexit "Start-Process -FilePath \"%~dp0\..\..\atom.exe\" -ArgumentList \"--pid=$pid $env:PSARGS\" ; wait-event"
+    exit 0
   ) ELSE (
     "%~dp0\..\..\atom.exe" %*
   )

spec/fixtures/git/repo-with-submodules/git.git/config

@@ -5,6 +5,12 @@
 	logallrefupdates = true
 	ignorecase = true
 	precomposeunicode = true
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master
+[remote "origin"]
+	url = git@github.com:atom/some-repo-i-guess.git
+	fetch = +refs/heads/*:refs/remotes/origin/*
 [submodule "jstips"]
 	url = https://github.com/loverajoel/jstips
 [submodule "You-Dont-Need-jQuery"]

spec/fixtures/git/repo-with-submodules/git.git/refs/remotes/origin/master

@@ -0,0 +1 @@
+d2b0ad9cbc6f6c4372e8956e5cc5af771b2342e5

spec/git-repository-async-spec.js

@@ -877,4 +877,34 @@ describe('GitRepositoryAsync', () => {
       })
     })
   })
+
+  describe('.getOriginURL()', () => {
+    beforeEach(() => {
+      const workingDirectory = copyRepository('repo-with-submodules')
+      repo = GitRepositoryAsync.open(workingDirectory)
+    })
+
+    it('returns the origin URL', async () => {
+      const url = await repo.getOriginURL()
+      expect(url).toBe('git@github.com:atom/some-repo-i-guess.git')
+    })
+  })
+
+  describe('.getUpstreamBranch()', () => {
+    it('returns null when there is no upstream branch', async () => {
+      const workingDirectory = copyRepository()
+      repo = GitRepositoryAsync.open(workingDirectory)
+
+      const upstream = await repo.getUpstreamBranch()
+      expect(upstream).toBe(null)
+    })
+
+    it('returns the upstream branch', async () => {
+      const workingDirectory = copyRepository('repo-with-submodules')
+      repo = GitRepositoryAsync.open(workingDirectory)
+
+      const upstream = await repo.getUpstreamBranch()
+      expect(upstream).toBe('refs/remotes/origin/master')
+    })
+  })
 })

src/git-repository-async.js

@@ -234,7 +234,7 @@ export default class GitRepositoryAsync {
   // Returns a {Promise} which resolves to the {String} origin url of the
   // repository.
   getOriginURL (_path) {
-    return this.repo.getOriginalURL(_path)
+    return this.repo.getOriginURL(_path)
   }
 
   // Public: Returns the upstream branch for the current HEAD, or null if there
@@ -246,7 +246,7 @@ export default class GitRepositoryAsync {
   // Returns a {Promise} which resolves to a {String} branch name such as
   // `refs/remotes/origin/master`.
   getUpstreamBranch (_path) {
-    return this.getUpstreamBranch(_path)
+    return this.repo.getUpstreamBranch(_path)
   }
 
   // Public: Gets all the local and remote references.

src/workspace.coffee

@@ -557,6 +557,8 @@ class Workspace extends Model
       editor
 
   handleGrammarUsed: (grammar) ->
+    return unless grammar?
+
     @packageManager.triggerActivationHook("#{grammar.packageName}:grammar-used")
 
   # Public: Returns a {Boolean} that is `true` if `object` is a `TextEditor`.