From 69df5d08362adced494a40325eaaaa87da1cf2f4 Mon Sep 17 00:00:00 2001 From: joshaber Date: Tue, 9 Feb 2016 13:40:36 -0500 Subject: [PATCH 1/6] 1.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6815ed9c6..f1dee8def 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "1.5.0-beta3", + "version": "1.5.0", "description": "A hackable text editor for the 21st Century.", "main": "./src/browser/main.js", "repository": { From 1b416c789e16d98617ba74aa36c0f9fcd96e02b8 Mon Sep 17 00:00:00 2001 From: joshaber Date: Tue, 9 Feb 2016 13:40:37 -0500 Subject: [PATCH 2/6] 1.6.0-beta0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6b430a90f..e1b386a76 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "1.6.0-dev", + "version": "1.6.0-beta0", "description": "A hackable text editor for the 21st Century.", "main": "./src/browser/main.js", "repository": { From b7da70a7e9b3c18139cbc84b8850bb3788ec6072 Mon Sep 17 00:00:00 2001 From: Josh Abernathy Date: Wed, 10 Feb 2016 15:15:10 -0500 Subject: [PATCH 3/6] Merge pull request #10758 from atom/fix-status-in-subdir Fix status in subdir --- package.json | 2 +- spec/git-spec.coffee | 30 +++++++++++++++++++++++++++++- src/git-repository.coffee | 1 + 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f1dee8def..802221fb6 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "fs-plus": "^2.8.0", "fstream": "0.1.24", "fuzzaldrin": "^2.1", - "git-utils": "^4.1.0", + "git-utils": "^4.1.2", "grim": "1.5.0", "jasmine-json": "~0.0", "jasmine-tagged": "^1.1.4", diff --git a/spec/git-spec.coffee b/spec/git-spec.coffee index 31ac176f7..c84ff6aa9 100644 --- a/spec/git-spec.coffee +++ b/spec/git-spec.coffee @@ -195,7 +195,7 @@ describe "GitRepository", -> expect(repo.isStatusModified(repo.getDirectoryStatus(directoryPath))).toBe true describe ".refreshStatus()", -> - [newPath, modifiedPath, cleanPath, originalModifiedPathText] = [] + [newPath, modifiedPath, cleanPath, originalModifiedPathText, workingDirectory] = [] beforeEach -> workingDirectory = copyRepository() @@ -221,6 +221,34 @@ describe "GitRepository", -> expect(repo.isStatusNew(repo.getCachedPathStatus(newPath))).toBeTruthy() expect(repo.isStatusModified(repo.getCachedPathStatus(modifiedPath))).toBeTruthy() + it 'caches the proper statuses when a subdir is open', -> + subDir = path.join(workingDirectory, 'dir') + fs.mkdirSync(subDir) + + filePath = path.join(subDir, 'b.txt') + fs.writeFileSync(filePath, '') + + atom.project.setPaths([subDir]) + + waitsForPromise -> + atom.workspace.open('b.txt') + + statusHandler = null + runs -> + repo = atom.project.getRepositories()[0] + + statusHandler = jasmine.createSpy('statusHandler') + repo.onDidChangeStatuses statusHandler + repo.refreshStatus() + + waitsFor -> + statusHandler.callCount > 0 + + runs -> + status = repo.getCachedPathStatus(filePath) + expect(repo.isStatusModified(status)).toBe false + expect(repo.isStatusNew(status)).toBe false + describe "buffer events", -> [editor] = [] diff --git a/src/git-repository.coffee b/src/git-repository.coffee index ee27f87a5..cf85cb076 100644 --- a/src/git-repository.coffee +++ b/src/git-repository.coffee @@ -466,6 +466,7 @@ class GitRepository relativeProjectPaths = @project?.getPaths() .map (path) => @relativize(path) .filter (path) -> path.length > 0 + .map (path) -> path + '/**' @statusTask?.terminate() @statusTask = Task.once @handlerPath, @getPath(), relativeProjectPaths, ({statuses, upstream, branch, submodules}) => From 88524b19ce457f83e11eec55f298cbfeb5c4935e Mon Sep 17 00:00:00 2001 From: joshaber Date: Wed, 10 Feb 2016 15:17:43 -0500 Subject: [PATCH 4/6] 1.5.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 802221fb6..a92749be0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "1.5.0", + "version": "1.5.1", "description": "A hackable text editor for the 21st Century.", "main": "./src/browser/main.js", "repository": { From 262459829ccc7a91b96593ce378db134955fc345 Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Wed, 10 Feb 2016 17:04:04 -0800 Subject: [PATCH 5/6] :arrow_up: tree-view --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7783579b2..d9187684e 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "symbols-view": "0.110.1", "tabs": "0.90.0", "timecop": "0.33.0", - "tree-view": "0.201.0", + "tree-view": "0.201.1", "update-package-dependencies": "0.10.0", "welcome": "0.33.0", "whitespace": "0.32.1", From 7ed8623480b788e85762a6556c36876140ecd645 Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Wed, 10 Feb 2016 17:05:47 -0800 Subject: [PATCH 6/6] 1.6.0-beta2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d9187684e..4cc92242d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "1.6.0-beta1", + "version": "1.6.0-beta2", "description": "A hackable text editor for the 21st Century.", "main": "./src/browser/main.js", "repository": {