From a458f7581d3b3c356ccd81960a198d956503aeb8 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 12:11:18 -0700 Subject: [PATCH 1/7] Upgrade to git-utils@0.29.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 43b3748df..55dd5289b 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "first-mate": "0.5.0", "fs-plus": "0.7.0", "fuzzaldrin": "0.1.0", - "git-utils": "0.28.0", + "git-utils": "0.29.0", "guid": "0.0.10", "jasmine-focused": "~0.15.0", "mkdirp": "0.3.5", From 132c6f74148eb60c54f0676c2cad30f9532bf956 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 12:14:00 -0700 Subject: [PATCH 2/7] Enable ignoreEolWhitespace in getLineDiffs on windows --- src/git.coffee | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/git.coffee b/src/git.coffee index c58b06079..c1fb57853 100644 --- a/src/git.coffee +++ b/src/git.coffee @@ -235,7 +235,11 @@ class Git # # Returns an object with two keys, `ahead` and `behind`. These will always be # greater than zero. - getLineDiffs: (path, text) -> @getRepo().getLineDiffs(@relativize(path), text) + getLineDiffs: (path, text) -> + # Ignore eol of line differences on windows so that files checked in as + # LF don't report every line modified when the text contains CRLF endings. + options = ignoreEolWhitespace: process.platform is 'win32' + @getRepo().getLineDiffs(@relativize(path), text, options) # Public: Returns the git configuration value specified by the key. getConfigValue: (key) -> @getRepo().getConfigValue(key) From e8f8cd2dcdf813a6cd93a3a98d4465a4fe6377d0 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 12:14:32 -0700 Subject: [PATCH 3/7] Normalize forward slashes on windows --- src/directory.coffee | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/directory.coffee b/src/directory.coffee index 9e433a2de..33148f8dd 100644 --- a/src/directory.coffee +++ b/src/directory.coffee @@ -65,6 +65,9 @@ class Directory relativize: (fullPath) -> return fullPath unless fullPath + # Normalize forward slashes to back slashes on windows + fullPath = fullPath.replace(/\//g, '\\') if process.platform is 'windows' + if fullPath is @getPath() '' else if fullPath.indexOf(path.join(@getPath(), path.sep)) is 0 From 7e043f5bc61485d56beb4509addbd8d121d8c6c3 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 12:27:20 -0700 Subject: [PATCH 4/7] Change platform check from windows to win32 --- src/directory.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/directory.coffee b/src/directory.coffee index 33148f8dd..1e1b76ba1 100644 --- a/src/directory.coffee +++ b/src/directory.coffee @@ -66,7 +66,7 @@ class Directory return fullPath unless fullPath # Normalize forward slashes to back slashes on windows - fullPath = fullPath.replace(/\//g, '\\') if process.platform is 'windows' + fullPath = fullPath.replace(/\//g, '\\') if process.platform is 'win32' if fullPath is @getPath() '' From a03a89d3595db39d374c5085055ee63a1f2efd18 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 12:28:21 -0700 Subject: [PATCH 5/7] Ignore debug.log --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 981541515..2d2370139 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ .nvm-version node_modules npm-debug.log +debug.log /tags /atom-shell/ docs/output From 9d9ff979951793b19d03811ae57d76e2a504cb97 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 12:38:07 -0700 Subject: [PATCH 6/7] Upgrade to tree-view@0.26.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 55dd5289b..5a667c6e2 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "terminal": "0.15.0", "timecop": "0.9.0", "to-the-hubs": "0.8.0", - "tree-view": "0.25.0", + "tree-view": "0.26.0", "visual-bell": "0.3.0", "whitespace": "0.8.0", "wrap-guide": "0.4.0", From bc0a268841a7291c8c6a6e31dbb2074a49c1c03c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 13:47:42 -0700 Subject: [PATCH 7/7] Upgrade to find-and-replace@0.36.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5a667c6e2..028b56d38 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "dev-live-reload": "0.13.0", "editor-stats": "0.5.0", "exception-reporting": "0.5.0", - "find-and-replace": "0.35.0", + "find-and-replace": "0.36.0", "fuzzy-finder": "0.19.0", "gists": "0.6.0", "git-diff": "0.13.0",