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
adam j hartz
350e0b9813
first attempt: modify completer to add quotes where necessary
2015-03-16 21:13:53 -04:00
Anthony Scopatz
a7f8b7a9c3
limit the resize attempts
2015-03-16 19:46:09 -05:00
Anthony Scopatz
70c7d9399d
Merge branch 'naufraghi-patch-2'
2015-03-16 19:41:05 -05:00
Anthony Scopatz
32379aa060
Merge branch 'patch-2' of https://github.com/naufraghi/xonsh into naufraghi-patch-2
2015-03-16 19:38:41 -05:00
Anthony Scopatz
6f5da3d013
quit aliases exit
2015-03-16 18:18:18 -05:00
adam j hartz
6ff6812a05
error message for writing to bad location as well
2015-03-16 16:02:01 -04:00
Matteo Bertini
3859096681
Propagate SyntaxError message in exec-ing .xonshrc to the user
2015-03-16 17:19:21 +01:00
adam j hartz
20e698f6f1
slight efficiency improvement
2015-03-16 08:46:43 -04:00
adam j hartz
90adbaf070
suggestions for unknown commands in subprocess mode
2015-03-16 08:37:12 -04:00
adam j hartz
4177c6bc06
subprocess mode error message
2015-03-16 05:59:18 -04:00
Anthony Scopatz
f5c810fe9b
Merge pull request #52 from juanpabloaj/travis
...
a first approach to a travis file
2015-03-15 22:12:53 -05:00
Anthony Scopatz
6d1e3fce1f
Merge pull request #53 from juanpabloaj/gitignore
...
parser_test_table.py to gitignore
2015-03-15 22:02:40 -05:00
Anthony Scopatz
b5df612b4c
no doubling
2015-03-15 22:00:29 -05:00
JuanPablo
e0e52d4271
parser_test_table.py to gitignore
2015-03-15 23:40:52 -03:00
JuanPablo
dd20e41e65
a first approach to a travis file
...
* to run tests with travis-ci.org
* prerun test, pip install ply and nosetests
* discover and run test with nosetests
2015-03-15 23:37:21 -03:00
Anthony Scopatz
11d4df8e3e
really overdo the resizing
2015-03-15 21:29:04 -05:00
Anthony Scopatz
3c2b3ecf65
Merge pull request #51 from juanpabloaj/gitignore
...
gitignore: lexer_table and parser_table added
2015-03-15 21:22:09 -05:00
Anthony Scopatz
45034bb733
try to reset screen size once
2015-03-15 21:20:46 -05:00
JuanPablo
870c670115
gitignore: lexer_table and parser_table added
2015-03-15 23:18:55 -03:00
Anthony Scopatz
7941d8c8c3
Merge pull request #50 from juanpabloaj/gitignore
...
*.egg to gitignore
2015-03-15 21:09:48 -05:00
JuanPablo
0b21df8b94
*.egg to gitignore
2015-03-15 23:05:07 -03:00
Anthony Scopatz
217cde293a
added missing distutil imports
2015-03-15 20:48:13 -05:00
Anthony Scopatz
4b92b5da4a
RL_CHANGE_ENVIRONMENT.value = 0
2015-03-15 19:49:51 -05:00
Anthony Scopatz
8f6e565e20
diag info
2015-03-15 19:32:12 -05:00
Anthony Scopatz
a587a1719d
version bump to v0.1.2
2015-03-15 18:42:58 -05:00
Anthony Scopatz
714864c68b
Merge branch 'pathglob'
2015-03-15 17:59:15 -05:00
Anthony Scopatz
f32168dedb
completer for paths
2015-03-15 17:55:42 -05:00
Anthony Scopatz
71bb14c385
partial fix for globbing
2015-03-15 17:48:15 -05:00