Commit Graph

6121 Commits

Author SHA1 Message Date
Kevin Sawicki
060ed27a2f Set context lines to 1 for line diffs 2013-03-04 21:43:34 -08:00
Kevin Sawicki
885da83df2 💄 2013-03-04 21:43:34 -08:00
Kevin Sawicki
c9ef846727 Only replace .git segment if trailing 2013-03-04 21:43:34 -08:00
Kevin Sawicki
c14aa3b86f Default status to 0 if undefined
This keeps the status-changed event from triggering
the first time the status is requested as it goes
from undefined to 0 which should be treated as no
change.
2013-03-04 21:43:34 -08:00
Kevin Sawicki
1be0b817de Specify text as second parameter 2013-03-04 21:43:34 -08:00
Kevin Sawicki
14a73337ce Remove unused diff options 2013-03-04 21:43:34 -08:00
Kevin Sawicki
72851486d8 💄 2013-03-04 21:43:34 -08:00
Kevin Sawicki
ab5043f890 Add method to get line diffs for path and text 2013-03-04 21:43:34 -08:00
Kevin Sawicki
e3ebda7d30 Show commits ahead/behind upstream in status bar 2013-03-04 21:43:34 -08:00
Kevin Sawicki
fd82f3f8a4 Add method to get ahead/behind commit counts 2013-03-04 21:43:34 -08:00
Kevin Sawicki
3703877ae8 Default status flags to 0 2013-03-04 21:43:34 -08:00
Kevin Sawicki
4384c69dcf Delete cached statuses unless non-zero 2013-03-04 21:43:34 -08:00
Kevin Sawicki
7838f3741f Update status finder keybinding to meta-B 2013-03-04 21:43:33 -08:00
Kevin Sawicki
4c773439d2 Bind meta-T to display modified/untracked files 2013-03-04 21:43:33 -08:00
Kevin Sawicki
77bc42bd45 Put status indicator on right side of fuzzy finder
Closes #313
2013-03-04 21:43:33 -08:00
Kevin Sawicki
3852b7212b Remove git-status-changed event from Buffer
This is now fired as a status-changed event from
the Git class when the checkout completes normally
and the status of the path changes.
2013-03-04 21:43:33 -08:00
Kevin Sawicki
31690d16ec Remove unused import 2013-03-04 21:43:33 -08:00
Kevin Sawicki
77a5f4775a Show Git status indicators on directories
Closes #301
2013-03-04 21:43:33 -08:00
Kevin Sawicki
587a6552ea Use subscribe instead of on 2013-03-04 21:43:33 -08:00
Kevin Sawicki
2e7e4b3ee4 💄 2013-03-04 21:43:33 -08:00
Kevin Sawicki
4fe6db240b Consolidate Git status checking
Now the status bar and tree view both listen for
status change events and use the cached information
available from the git object to update their views.
2013-03-04 21:43:33 -08:00
Kevin Sawicki
2ec4d558ba Make project's Git repository a window global
This allows it to operate independently of the
project and mirror the availability of the root view
and project.
2013-03-04 21:43:33 -08:00
Kevin Sawicki
219a8581fd 💄 2013-03-04 21:43:33 -08:00
Kevin Sawicki
94449f772c Initialize statuses and task variables correctly 2013-03-04 21:43:33 -08:00
Kevin Sawicki
910be149ab Show status icons in fuzzy finder 2013-03-04 21:43:33 -08:00
Kevin Sawicki
68b61d71c6 Trigger event when path status changes 2013-03-04 21:43:32 -08:00
Kevin Sawicki
083562e1aa Abort status task when destroyed 2013-03-04 21:43:32 -08:00
Kevin Sawicki
c6e89d33f8 Git.refreshStatuses() -> Git.refreshStatus() 2013-03-04 21:43:32 -08:00
Kevin Sawicki
50bc1aac74 Add task to refresh status of repository
By default this will occur when the window gains
focus and the Git class can now be subscribed to
so listeners can become notified when the status
of a repository changes.
2013-03-04 21:43:32 -08:00
Kevin Sawicki
4add7b6213 Support getting status of entire repository
New Git.getAllStatuses() method returns all non-ignored
status entries in the repository.
2013-03-04 21:43:32 -08:00
Kevin Sawicki
69f79b940b Update nof task for new package generator naming scheme 2013-03-04 20:05:42 -08:00
Kevin Sawicki & Nathan Sobo
41e1ce4a09 Remove cson2json dependency
The latest release does not work because of CoffeeScript
changes so use a simple compile script to convert CSON
files to JSON files when buildilng.

Closes #348
2013-03-04 18:27:51 -08:00
probablycorey
30d4cb81b8 Use Courier as the default font for specs
Fixes #323
2013-03-04 16:40:02 -08:00
probablycorey
0fe570fc47 Log warning instead of throwing error when installing atom binary 2013-03-04 15:44:49 -08:00
Joshua Peek
04ec1b01be Fallback to /usr/local/bin/atom 2013-03-04 14:45:24 -06:00
probablycorey
fd2d1f2dfc Peg CoffeeScript to 1.5.x 2013-03-04 09:42:54 -08:00
Adam Roben
73e0b72479 Only source /opt/github/env.sh if needed
If node is already in PATH and functional, we don't need to spend a
bunch of time running all of Boxen's setup scripts.

This reduces clean build time on my MacBook Pro from 46 seconds to 31
seconds.
2013-03-04 11:52:51 -05:00
Adam Roben
83ee2d23b3 Use gyp's rules functionality to compile .coffee/.cson files
Instead of finding and compiling all .coffee/.cson files in
script/copy-files-to-bundle, we now tell gyp how to do this for us. It
works like this:

1. Rakefile invokes the new script/generate-sources-gypi script to
   generate sources.gypi. This file lists all the .coffee/.cson files in
   the src, static, and vendor directories, as well as a new
   compiled_sources_dir variable that specifies where the compiled
   versions of the files should be placed.
2. atom.gyp includes sources.gypi.
3. atom.gyp has a new target, generated_sources, which contains all the
   .coffee/.cson files, and uses two rules to tell gyp how to compile
   them. The rules invoke the new script/compile-coffee and
   script/compile-cson files once for each file.
4. gyp generates one Makefile for each rule to actually perform the
   compilation.
5. script/copy-files-to-bundle now takes the compiled_sources_dir
   variable as an argument, and copies files both from there and from
   the repository into the Resources directory.

By putting the compilation into a different target, we can do it in
parallel with compiling/linking our binaries. And gyp automatically runs
make using -j$(sysctl -n hw.ncpu), so compilation of .coffee/.cson files
happens in parallel, too.

These changes reduce clean build time on my MacBook Pro from 55 seconds
to 46 seconds.
2013-03-04 11:32:06 -05:00
Adam Roben
6511d0e111 Replace ## in package-generator templates with __
This is a workaround for
<http://code.google.com/p/gyp/issues/detail?id=323>.

A future change will cause gyp to generate Makefiles to compile
.coffee/.cson files to .js/.json. Makefiles use # as the comment
character, and gyp isn't smart enough to escape the #. So now we don't
use # in filenames to work around this bug.
2013-03-04 11:21:29 -05:00
Adam Roben
c96e9acb64 Merge pull request #326 from github/framework
Move all code and resources into Atom.framework
2013-03-04 06:10:27 -08:00
Kevin Sawicki
b0e7abac60 Update image in README 2013-03-03 11:54:07 -08:00
Kevin Sawicki
7952dfc196 Add command after first argument
This forces the object to be interpreted as the
second argument to the callWorkerMethod function
instead of as the first argument to function returned
from callWorkerMethod.

Closes #338
2013-03-03 11:07:52 -08:00
probablycorey
32d57892a2 Use correct resource path in dev mode 2013-03-01 16:58:31 -08:00
probablycorey
d6309ec31c Add autorelease pool wrappers around CefV8Handler::Execute methods
This removes all BlahBlahBlah was not autoreleased console warnings.
2013-03-01 15:01:14 -08:00
probablycorey
5e25d3634c Set CFBundleTypeRole to Editor
This gets ride of an annoying console warning.
2013-03-01 14:56:42 -08:00
probablycorey
467e30aeb1 Remove worker log message 2013-03-01 14:55:44 -08:00
probablycorey
591aba3faf Revert "wip"
This reverts commit 2966cdb033.
2013-03-01 14:09:43 -08:00
probablycorey
4e971b085e Now that specs can handle symlinks, put atom-build in /tmp 2013-03-01 13:54:19 -08:00
probablycorey
b7976cac68 Use the /Applications directory to test cwd on Child Processes 2013-03-01 13:54:19 -08:00
Corey Johnson
2966cdb033 wip 2013-03-01 13:54:19 -08:00