github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-18 02:21:43 -05:00
Code Issues Packages Projects Releases Wiki Activity
30,347 Commits 140 Branches 571 Tags
f293b80e607f4a5fadd47b6d5dfd75bdfd1ff874
Commit Graph

14990 Commits

Author SHA1 Message Date
Antonio Scandurra
d00164dc3c Deal with rows instead of points in LineTopIndex 2016-01-08 11:05:55 +01:00
joshaber
2dd5cb6081 Merge branch 'master' into dh-async-repo 2016-01-07 20:55:28 -05:00
Katrina Uychaco
28517563eb Merge pull request #10310 from atom/ku-handle-more-fs-errors 
Handle EAGAIN and ETIMEDOUT errors on open/save
 2016-01-07 16:49:14 -08:00
joshaber
6948dd4e8d Linter was mad about these now. 2016-01-07 17:13:56 -05:00
joshaber
11e72d0580 Just Use Or 2016-01-07 17:12:57 -05:00
joshaber
92839a1f4f Test .isSubmodule. 2016-01-07 16:48:28 -05:00
joshaber
565f28dfc4 Update . getCachedUpstreamAheadBehindCount() 
Take submodules into account.
 2016-01-07 16:36:55 -05:00
joshaber
a79a528fd1 Make .getRepo() submodule-aware. 2016-01-07 16:13:46 -05:00
joshaber
957c8557cc Use Grown Up repositories for submodules. 2016-01-07 15:29:01 -05:00
Max Brunsfeld
ec66a66bb3 Merge pull request #9990 from scv119/test 
Add a core config `core.automaticallyUpdate` to disable Atom autoupdate.
 2016-01-07 11:05:43 -08:00
joshaber
a86d3b6d94 Stop logging. 2016-01-07 12:44:56 -05:00
joshaber
75fe311e22 Refresh the status for submodules too. 2016-01-07 12:19:51 -05:00
Katrina Uychaco
41c8792a7d Handle EAGAIN errors on open 2016-01-06 18:27:18 -08:00
Katrina Uychaco
3bcb062ab0 Add friendly message for ETIMEDOUT 2016-01-06 18:23:25 -08:00
Katrina Uychaco
9efb3328bc Add helper to map error codes to friendly messages 2016-01-06 18:20:46 -08:00
Dave Rael
91253910ef 🏁 Fix corrupting Windows Paths 
containing non-Ascii characters
Remove workaround that just didn't update the path at all - now including
the Atom path update and preserving the non-Ascii characters
 2016-01-06 12:52:29 -07:00
joshaber
6c4d97d0f2 Merge branch 'master' into dh-async-repo 2016-01-06 13:52:18 -05:00
Josh Abernathy
61475ed77c Merge pull request #10296 from viatsko/repository-providers-priority 
This change gives custom repositoryProviders more priority
 2016-01-06 13:49:46 -05:00
Valerii Iatsko
3b8375d2b4 This change gives custom repositoryProviders more priority - this wil allow us to override base git repository implementation 2016-01-06 00:05:58 +01:00
joshaber
eedac0a951 We'll store them by path instead of by name. 2016-01-05 17:31:34 -05:00
Wliu
d855613340 Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-35 2016-01-05 17:25:51 -05:00
joshaber
26cd7c63cc s/upstreamByPath/upstream 
We’ll track submodule status separately.
 2016-01-05 17:10:01 -05:00
joshaber
e060cfe03b Merge branch 'master' into dh-async-repo 2016-01-05 15:50:43 -05:00
joshaber
5045477b5d path is never used. 2016-01-05 15:28:48 -05:00
joshaber
757bbae1e2 s//openNodeGitRepository/openRepository. 2016-01-05 15:26:16 -05:00
Antonio Scandurra
11a15dce37 Ignore errors when loading an invalid blob store 2016-01-05 19:55:53 +01:00
Katrina Uychaco
cee41a2fb0 Remove new line 2016-01-05 10:42:07 -08:00
joshaber
b6c3b39dfe Merge branch 'master' into cascade-windows 2016-01-05 12:48:30 -05:00
joshaber
24db4586e4 Merge branch 'master' into dh-async-repo 2016-01-05 12:44:35 -05:00
Josh Abernathy
96eff38707 Merge pull request #10249 from atom/use-project-relative-status 
Use .getStatusForPaths.
 2016-01-05 12:40:28 -05:00
joshaber
b8b2c88a0a Merge branch 'master' into dh-async-repo 2016-01-05 12:36:34 -05:00
joshaber
94b77d0998 Separate the offset determination from the dimensions. 2016-01-05 11:59:59 -05:00
Nathan Sobo
2493269f09 Merge pull request #10277 from atom/ns-fix-horizontal-measurement 
Fix measurement of rows that are present in the model but haven't been rendered yet
 2016-01-05 09:43:01 -07:00
Antonio Scandurra
c7a7f0c6dd 🐛 Ignore setting dimensions for destroyed decorations 2016-01-05 10:56:29 +01:00
Nathan Sobo
6669703677 Force a sync render when measuring if we don’t have a DOM node for a row 2016-01-04 16:40:56 -07:00
Nathan Sobo
9f6fbacddd Don’t clip screen positions in yardstick 
By clipping positions only in the TextEditorComponent, we can ensure
that we check for the presence of a rendered line for the clipped row
value.
 2016-01-04 16:32:38 -07:00
joshaber
fb8b25dc16 Merge branch 'master' into cascade-windows 2016-01-04 16:49:07 -05:00
Josh Abernathy
29590d94ac Merge pull request #10233 from atom/fix-new-file 
Fix New File with no open windows
 2016-01-04 16:43:46 -05:00
joshaber
6bf9d7eb7d Added .openNodeGitRepository 2016-01-04 16:17:16 -05:00
joshaber
a63e30362f Documentation for .DestroyedErrorName 2016-01-04 16:16:50 -05:00
joshaber
b234f8481d We don't actually use repo. 2016-01-04 16:12:22 -05:00
joshaber
a2ab84c3e6 Catch errors that are thrown while we're refreshing. 2016-01-04 13:36:13 -05:00
joshaber
3752f66160 Use .getRepo everywhere. 2016-01-04 13:27:55 -05:00
joshaber
843442a741 So much depends upon a return statement. 2016-01-04 13:25:59 -05:00
joshaber
60fc0acb71 Relativize these paths too. 2016-01-04 13:25:51 -05:00
joshaber
5a7b4562e1 Use a default parameter. 2016-01-04 13:14:02 -05:00
joshaber
e3451090ed We might not have a project. 2016-01-04 12:48:39 -05:00
joshaber
1a35545bd7 _destroyed => _isDestroyed 2016-01-04 12:48:29 -05:00
joshaber
d9b39323cf Fix the openExt call. 2016-01-04 12:20:54 -05:00
joshaber
d8a5418f1e Only refresh the status for the open project. 2016-01-04 12:14:24 -05:00