Commit graph

910 commits

Author SHA1 Message Date
Anthony Scopatz
f7163b01b2 Merge branch 'windows-shebang' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-windows-shebang 2015-05-17 15:57:32 -05:00
Anthony Scopatz
96a89a9b01 Merge pull request #237 from rbrewer123/feature-windows-doc
windows: doc updates
2015-05-17 15:45:11 -05:00
adam j hartz
fb5a070975 test to make sure everything in path is a valid directory 2015-05-17 14:51:51 -04:00
adam j hartz
68ea0b3c6f windows shebang 2015-05-17 14:43:12 -04:00
adam j hartz
cee9de4795 windows shebang handling 2015-05-17 14:35:53 -04:00
adam j hartz
e6f0650b6c base_shell needs os on Windows 2015-05-17 14:35:33 -04:00
Anthony Scopatz
23659a4083 Merge branch 'anula-opt_prompt_toolkit' 2015-05-16 13:09:22 -05:00
Anthony Scopatz
c2ad717627 fixed conflicts 2015-05-16 13:06:29 -05:00
adam j hartz
7ba286dd5d Merge branch 'scopatz-env' 2015-05-16 13:58:37 -04:00
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
Anthony Scopatz
a8cc361aa4 ensurer docstring 2015-05-16 09:28:58 -05: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