Anthony Scopatz
dcd4a20271
fix for comment only line
2015-03-18 20:14:53 -05:00
Anthony Scopatz
831e0c07b5
Merge branch 'admiralobvious-cd_oldpwd'
2015-03-18 19:44:59 -05:00
Anthony Scopatz
3c31e4ef2d
Merge branch 'cd_oldpwd' of https://github.com/admiralobvious/xonsh into admiralobvious-cd_oldpwd
2015-03-18 19:44:16 -05:00
Anthony Scopatz
d01c48b819
Merge branch 'SavinaRoja-master'
2015-03-18 19:42:43 -05:00
Anthony Scopatz
7573d4472c
Merge branch 'master' of https://github.com/SavinaRoja/xonsh into SavinaRoja-master
2015-03-18 19:41:34 -05:00
Anthony Scopatz
db3c4873a6
Merge branch 'wrywerytwreywery-run_script'
2015-03-18 19:36:14 -05:00
Anthony Scopatz
9accda52ff
added some trailing newline safety to main.py
2015-03-18 19:35:50 -05:00
Alexandre Ferland
4a6d1017fa
change_update
...
Set the value instead of update().
2015-03-18 20:32:18 -04:00
Anthony Scopatz
8c5f9dc643
Merge branch 'run_script' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-run_script
2015-03-18 19:28:57 -05:00
adam j hartz
dfd63dedd6
small refactor
2015-03-18 20:09:29 -04:00
adam j hartz
b03156a047
make script mode recognize contents of xonshrc
2015-03-18 20:01:00 -04:00
Anthony Scopatz
7b64acd574
some cleanup in tools
2015-03-18 18:51:22 -05:00
Anthony Scopatz
4e04bd1f02
Merge pull request #94 from SavinaRoja/master
...
updating the webm with some slight pauses
2015-03-18 18:44:31 -05:00
adam j hartz
5303d6294b
compile scripts with exec mode instead of single
2015-03-18 19:43:23 -04:00
Anthony Scopatz
a371800f91
Merge branch 'corbinbs-master'
2015-03-18 18:29:43 -05:00
Anthony Scopatz
2fcb88b972
Merge branch 'master' of https://github.com/corbinbs/xonsh into corbinbs-master
2015-03-18 18:27:39 -05:00
Paul Barton
ee5f1f4213
Non-recursive refactor of shell.cmdloop()
2015-03-18 19:21:09 -04:00
Anthony Scopatz
8e2203b5df
Merge branch 'ivh-bash_aliases'
2015-03-18 18:09:00 -05:00
Anthony Scopatz
237d8bcb4f
some aliases cleanup
2015-03-18 18:08:48 -05:00
adam j hartz
ad8fd1dda1
main.py takes script file or script on stdin
2015-03-18 19:04:25 -04:00
adam j hartz
b1423b78ee
main.py takes script file or script on stdin
2015-03-18 19:00:01 -04:00
adam j hartz
6aa711916a
Merge branch 'master2' into dirstack
2015-03-18 18:43:21 -04:00
Brian S. Corbin
477ce93c44
Tab Completion on OS X
2015-03-18 16:53:25 -04:00
Anthony Scopatz
83cf04c170
Merge branch 'bash_aliases' of https://github.com/ivh/xonsh into ivh-bash_aliases
2015-03-18 15:51:28 -05:00
Paul Barton
15d61eb14d
updating the webm with some slight pauses
2015-03-18 15:44:03 -04:00
Charlie Arnold
0ff1b8df5f
specify full path to README.rst
...
Fix #88
2015-03-18 10:38:16 -07:00
Thomas Marquart
6fe7cc3e87
loop over bash-aliases to skip problematic ones and issue waring.
2015-03-18 09:24:44 +01:00
Thomas Marquart
b50754d73e
remove offensive line
2015-03-18 07:05:20 +01:00
Thomas Marquart
79d2847476
rebasing off scopatz/master and fixing minor things before merge.
2015-03-18 06:44:29 +01:00
Thomas Marquart
3b9d4a324b
Fixes #56 about taking over bash aliases into xonsh.
2015-03-18 06:33:51 +01:00
Anthony Scopatz
d2072bc4bf
Merge branch 'glenbot-master'
2015-03-17 18:59:20 -05:00
Anthony Scopatz
8eb9851e57
Merge branch 'master' of https://github.com/glenbot/xonsh into glenbot-master
2015-03-17 18:57:47 -05:00
Anthony Scopatz
444bc338ca
aliases had no sense of self to update themselves.
2015-03-17 18:49:31 -05:00
Anthony Scopatz
f030704060
Merge branch 'wrywerytwreywery-subproc_error_msg'
2015-03-17 18:39:03 -05:00
Anthony Scopatz
f73710e8e6
Merge branch 'subproc_error_msg' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-subproc_error_msg
2015-03-17 18:37:06 -05:00
Anthony Scopatz
a79d5a233a
Merge branch 'SavinaRoja-master'
2015-03-17 18:29:25 -05:00
Alexandre Ferland
cc143e28dc
check if oldpwd exists
...
I use get() as you suggested now to check if OLDPWD exist before attempting to use it. At the same, I just use update() on the keys now instead of the previous builtins.__xonsh_env__[key] = value, thought it looks cleaner that way.
2015-03-17 11:22:50 -04:00
Glen Zangirolami
d10eb8266d
Updated environ.current_branch to bounce if git isnt installed and check for multiple locations for the git bash scripts
2015-03-17 09:47:13 -05:00
Pablo Barton
1a5baad916
Adjusting the index for display of the demo as webm; with fallback to gif
2015-03-17 09:47:30 -04:00
Pablo Barton
6bb14cb856
adding the .webm version of the xonsh demo
2015-03-17 09:46:52 -04:00
Anthony Scopatz
d9b3cc3bb0
changes exec mode to globals, which it should have been all along
2015-03-17 00:21:40 -05:00
Anthony Scopatz
8b9f99fb91
Merge branch 'wrap'
2015-03-16 23:04:06 -05:00
Anthony Scopatz
8a5dad4075
some line wrapping fixes
2015-03-16 23:03:37 -05:00
Anthony Scopatz
dd0312c61e
Merge pull request #75 from wrywerytwreywery/wrap
...
minimize calls to reset_screen_size
2015-03-16 22:55:45 -05:00
Alexandre Ferland
ca60a170a2
Update aliases.py
...
Move update to OLDPWD down so we don't overwrite it accidentally.
2015-03-16 23:54:27 -04:00
admiralobvious
b4179c1dc6
update oldpwd when using cd
...
The cd alias now updates $OLDPWD and also checks if the argument is a
‘-‘ (single dash) and cd to $OLDPWD if it is. Based on bash’s cd
behaviour. http://ss64.com/bash/cd.html
2015-03-16 23:33:04 -04:00
adam j hartz
0e012d2191
minimize calls to reset_screen_size
2015-03-16 22:25:10 -04:00
Anthony Scopatz
1e34c2b3a3
Merge branch 'wrywerytwreywery-autocomplete_quote'
2015-03-16 20:39:44 -05:00
adam j hartz
d42c12f1ec
rearranging suggestions code
2015-03-16 21:32:06 -04:00
Anthony Scopatz
1bd58416b3
Merge branch 'autocomplete_quote' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-autocomplete_quote
2015-03-16 20:27:49 -05:00