adam j hartz
a6fe0dc4fb
pep8 changes
2015-05-16 13:58:11 -04:00
anula
c56c2c8330
Add prompt_toolkit based shell.
...
This adds prompt_toolkit based shell in addition to existing readline
shell. By default regular readline shell is loaded, to use
prompt_toolkit version you need to add:
$PROMPT_TOOLKIT_SHELL = True
to your ~/.xonshrc
Another nice thing to add there is:
from xonsh.pyghooks import XonshLexer
$HIGHLIGHTING_LEXER = XonshLexer
that adds highlighting of shell input (may be a bit annoying sometimes).
There is no key for inserting indentation yet, it will be improved in the
future.
2015-05-16 19:34:44 +02:00
Robert W. Brewer
aa966c2781
windows: enable git branch checking in prompt
2015-05-16 11:07:19 -04:00
Anthony Scopatz
a8cc361aa4
ensurer docstring
2015-05-16 09:28:58 -05:00
adam j hartz
8ed25ea571
some initial io things
2015-05-16 10:05:22 -04:00
Robert W. Brewer
2647d7ec15
windows: doc updates
2015-05-16 01:37:06 -04:00
Anthony Scopatz
3f27fbffaa
fixed merge conflcts
2015-05-15 09:59:28 -05:00
Anthony Scopatz
066524c51a
Merge branch 'gthole-git-dirty'
2015-05-15 09:55:58 -05:00
Greg Thole
30d8f81d94
Review issues addressed
2015-05-15 08:21:49 -04:00
Greg Thole
4a276d1fa8
Update prompt to display different color branch if dirty
2015-05-15 08:21:49 -04:00
Anthony Scopatz
7c32956501
fixed merge conflicts
2015-05-15 00:37:29 -05:00
Anthony Scopatz
f8e81335ec
Merge branch 'rbrewer123-feature-windows'
2015-05-15 00:26:53 -05:00
Anthony Scopatz
00ecc29bc9
Merge branch 'feature-windows' of https://github.com/rbrewer123/xonsh into rbrewer123-feature-windows
2015-05-15 00:24:47 -05:00
Robert W. Brewer
6557730c05
Merge branch 'wrywerytwreywery-rbrewer-windows' into feature-windows
2015-05-15 00:07:30 -04:00
Robert W. Brewer
29f609191b
windows: correct proc.py to pass test_imphooks tests
2015-05-15 00:05:12 -04:00
Anthony Scopatz
588d8885e8
removes errant try
2015-05-14 20:08:41 -05:00
Anthony Scopatz
7b3483d01e
added ability to set env vars from the command line
2015-05-14 20:06:52 -05:00
Anthony Scopatz
752cd980fd
added validation and coversion to env vars
2015-05-14 19:59:16 -05:00
Anthony Scopatz
9af75b321f
moved Env to environ.py
2015-05-14 18:18:46 -05:00
Robert W. Brewer
2fb5ed6cf3
Merge branch 'feature-windows' into wrywerytwreywery-rbrewer-windows
...
Conflicts:
xonsh/built_ins.py
2015-05-14 01:06:25 -04:00
Robert W. Brewer
a2ca0d885b
simplify and rename escape_windows_command_string() -> escape_windows_title_string(); add test for it; pep8 improvements
2015-05-13 23:14:31 -04:00
Robert W. Brewer
23df3e2778
aliases: remove xdir aliases; alias dir on Windows only
2015-05-13 18:43:35 -04:00
Robert W. Brewer
4063f22bc1
windows: bugfix environment variable setup
2015-05-13 01:08:25 -04:00
Robert W. Brewer
2c03fe98d4
windows: remove HOME and OLDPWD environment variables inherited from bash which can cause problems
2015-05-13 00:44:55 -04:00
Robert W. Brewer
1b0c1f291f
windows: clarify that regex globbing with backslashes unavailable on windows. Add test to verify it on non-windows.
2015-05-12 23:54:21 -04:00
Anthony Scopatz
ba3f1ede16
Merge branch 'wrywerytwreywery-paren'
2015-05-12 22:06:26 -05:00
Robert W. Brewer
10b84320c7
remove d alias; add xdir alias for non-windows platforms
2015-05-12 23:00:31 -04:00
adam j hartz
fd5c9513eb
need Handle from subproc as well
2015-05-12 22:58:08 -04:00
adam j hartz
b5ccaa3d07
fixes for POSIX jobs
2015-05-12 21:59:04 -04:00
adam j hartz
cb02c4a360
small bugfix
2015-05-12 21:50:49 -04:00
adam j hartz
686366c545
avoid rechecking ON_WINDOWS in jobs
2015-05-12 21:43:44 -04:00
adam j hartz
4696cfcb85
merge from master
2015-05-12 21:24:47 -04:00
Anthony Scopatz
12d8653763
Merge branch 'wrywerytwreywery-paren'
2015-05-12 20:15:08 -05:00
adam j hartz
c5180cf6bd
refactor of check for windows
2015-05-12 21:05:17 -04:00
adam j hartz
04ed8eedb1
grammar
2015-05-12 19:29:17 -04:00
adam j hartz
f768664d10
documentation for ProcProxy
2015-05-12 19:26:27 -04:00
adam j hartz
9323d2446a
fix prev_is_proxy
2015-05-12 13:54:22 -04:00
adam j hartz
915ba1b90e
revert changes to jobs.py
2015-05-12 13:48:18 -04:00
adam j hartz
333f553d7a
wait for procproxy to finish
2015-05-12 13:45:23 -04:00
adam j hartz
0c690d507a
small refactor
2015-05-12 13:41:51 -04:00
adam j hartz
ccb566b9a3
if->elif duh
2015-05-12 13:35:27 -04:00
adam j hartz
576f1c5916
additional imports from subprocess
2015-05-12 13:35:13 -04:00
adam j hartz
076fc3adb0
also import PIPE
2015-05-12 13:30:02 -04:00
adam j hartz
8292f7557c
small refactor
2015-05-12 13:29:34 -04:00
adam j hartz
253f78c323
copy code from subprocess rather than inheriting from Popen
2015-05-12 13:28:06 -04:00
Robert W. Brewer
fb784174ff
windows: revert to obj.kill() for KeyboardInterrupt
2015-05-12 08:58:52 -04:00
Robert W. Brewer
1786444d3e
windows: use ON_POSIX in built_ins
2015-05-12 08:58:10 -04:00
Robert W. Brewer
1a8bdfe55a
windows: send CTRL_C_EVENT instead of KILL on KeyboardInterrupt
2015-05-12 04:17:13 -04:00
Robert W. Brewer
ad741edb6a
windows: prettify test_win_ipconfig()
2015-05-12 03:24:35 -04:00
Robert W. Brewer
0ba6ad3f10
windows: use ON_WINDOWS and $SYSTEMROOT in tests
2015-05-12 03:14:36 -04:00