Merge branch 'master' into fix-cached-status

build/Gruntfile.coffee

@@ -57,7 +57,7 @@ module.exports = (grunt) ->
     homeDir = process.env.USERPROFILE
     contentsDir = shellAppDir
     appDir = path.join(shellAppDir, 'resources', 'app')
-    installDir ?= path.join(process.env.ProgramFiles, appName)
+    installDir ?= path.join(process.env.LOCALAPPDATA, appName, 'app-dev')
     killCommand = 'taskkill /F /IM atom.exe'
   else if process.platform is 'darwin'
     homeDir = process.env.HOME

build/tasks/install-task.coffee

@@ -16,10 +16,22 @@ module.exports = (grunt) ->
     {description} = grunt.config.get('atom.metadata')
 
     if process.platform is 'win32'
-      runas ?= require 'runas'
-      copyFolder = path.resolve 'script', 'copy-folder.cmd'
-      if runas('cmd', ['/c', copyFolder, shellAppDir, installDir], admin: true) isnt 0
-        grunt.log.error("Failed to copy #{shellAppDir} to #{installDir}")
+      done = @async()
+      fs.access(installDir, fs.W_OK, (err) ->
+        adminRequired = true if err
+        if adminRequired
+          grunt.log.ok("User does not have write access to #{installDir}, elevating to admin")
+        runas ?= require 'runas'
+        copyFolder = path.resolve 'script', 'copy-folder.cmd'
+
+        if runas('cmd', ['/c', copyFolder, shellAppDir, installDir], admin: adminRequired) isnt 0
+          grunt.log.error("Failed to copy #{shellAppDir} to #{installDir}")
+        else
+          grunt.log.ok("Installed into #{installDir}")
+
+        done()
+      )
+
     else if process.platform is 'darwin'
       rm installDir
       mkdir path.dirname(installDir)

docs/build-instructions/windows.md

@@ -34,7 +34,7 @@ git clone https://github.com/atom/atom/
 cd atom
 script/build
 ```
-This will create the Atom application in the `out\Atom` folder as well as copy it to a folder named `Atom` within `Program Files`.
+This will create the Atom application in the `out\Atom` folder as well as copy it to a subfolder of your user profile (e.g. `c:\Users\Bob`) called `AppData\Local\atom\app-dev`.
 
 ### `script/build` Options
   * `--install-dir` - Creates the final built application in this directory. Example (trailing slash is optional):

package.json

@@ -77,7 +77,7 @@
     "autocomplete-atom-api": "0.10.0",
     "autocomplete-css": "0.11.1",
     "autocomplete-html": "0.7.2",
-    "autocomplete-plus": "2.29.2",
+    "autocomplete-plus": "2.30.0",
     "autocomplete-snippets": "1.10.0",
     "autoflow": "0.27.0",
     "autosave": "0.23.1",

spec/git-repository-async-spec.js

@@ -55,6 +55,14 @@ describe('GitRepositoryAsync', () => {
     })
   })
 
+  describe('openedPath', () => {
+    it('is the path passed to .open', () => {
+      const workingDirPath = copyRepository()
+      repo = GitRepositoryAsync.open(workingDirPath)
+      expect(repo.openedPath).toBe(workingDirPath)
+    })
+  })
+
   describe('.getRepo()', () => {
     beforeEach(() => {
       const workingDirectory = copySubmoduleRepository()

src/git-repository-async.js

@@ -50,6 +50,10 @@ export default class GitRepositoryAsync {
     return this.repo._refreshingPromise
   }
 
+  get openedPath () {
+    return this.repo.openedPath
+  }
+
   // Public: Destroy this {GitRepositoryAsync} object.
   //
   // This destroys any tasks and subscriptions and releases the underlying