Commit graph

971 commits

Author SHA1 Message Date
Anthony Scopatz
9c05287754 version bump 2015-05-29 23:48:23 +03:00
anula
ea5da8acc4 Merge branch 'pcli' 2015-05-27 12:47:23 +02:00
Anthony Scopatz
ce55309a34 some minor cli changes to shell type 2015-05-27 13:14:54 +03:00
Anthony Scopatz
61fcd61adc Merge branch 'anula-prompt_toolkit_on_start' 2015-05-27 13:11:33 +03:00
Anthony Scopatz
415373f58d Merge branch 'prompt_toolkit_on_start' of https://github.com/anula/xonsh into anula-prompt_toolkit_on_start 2015-05-27 13:10:46 +03:00
anula
2e892205a3 Add option to run xonsh in prompt_toolkit mode from command line.
Remove $PROMPT_TOOLKIT_SHELL variable - it is replaced with
$SHELL_TYPE that can be set either to 'readline' or 'prompt_toolkit'.
Also introduce command line argument: --shell_type, that can also be set to
'readline' or 'prompt_toolkit' and will override $SHELL_TYPE on start of
the shell.
2015-05-27 11:53:05 +02:00
Anthony Scopatz
7a1647ec1b Merge branch 'wrywerytwreywery-io' 2015-05-24 23:47:43 +03:00
Anthony Scopatz
e6962f15b6 Merge branch 'io' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-io 2015-05-24 23:46:40 +03:00
Anthony Scopatz
8660246cdc Merge branch 'anula-insert_indent' 2015-05-24 23:42:58 +03:00
Anthony Scopatz
033f90f06e Merge branch 'insert_indent' of https://github.com/anula/xonsh into anula-insert_indent 2015-05-24 23:42:30 +03:00
Anthony Scopatz
3f6d5d73a7 Merge branch 'anula-autocompletion_bug' 2015-05-24 13:25:34 +03:00
anula
499f880aad Fix prompt_toolkit autocompletion bug.
Autocompletion worked only at the end of line.
2015-05-23 12:31:46 +02:00
anula
dd828d0897 Add possibility to insert indent using <TAB>. 2015-05-22 20:35:14 +02:00
adam j hartz
d9bf31966a smarter out>err names 2015-05-21 05:45:51 -04:00
adam j hartz
faf861cefd io bugfix 2015-05-21 05:42:01 -04:00
adam j hartz
1974f653c1 Merge branch 'rbrewer123-windows-git' 2015-05-20 22:52:23 -04:00
adam j hartz
ccf2352816 pep8 environ.py 2015-05-20 22:52:06 -04:00
adam j hartz
5f2c96a0a9 Merge branch 'feature-windows-git-prompt' of github.com:rbrewer123/xonsh into rbrewer123-windows-git 2015-05-20 22:34:12 -04:00
adam j hartz
d2a4e8906f some io parser tests 2015-05-20 18:17:34 -04:00
adam j hartz
fb0949194e set->frozenset 2015-05-20 17:43:38 -04:00
adam j hartz
1a76d47c66 io redirection docs 2015-05-20 16:18:45 -04:00
adam j hartz
9972fefe3e pep8 in built_ins 2015-05-20 14:48:15 -04:00
adam j hartz
b05ae3a9f3 PEP8 in lexer 2015-05-20 14:47:25 -04:00
adam j hartz
844ddf342c improving IO docs 2015-05-20 14:43:20 -04:00
adam j hartz
99ceb20e76 io redirection docs: take 1 2015-05-19 21:55:11 -04:00
adam j hartz
14cb4e0de0 small ioredirect tests 2015-05-19 18:05:49 -04:00
adam j hartz
6d18fdaf78 lexer bugfix 2015-05-19 18:00:46 -04:00
adam j hartz
51207f45c1 error reporting issue 2015-05-19 17:46:31 -04:00
adam j hartz
418d81355d redirection to file descriptors 2015-05-19 17:37:06 -04:00
adam j hartz
2a3ac6a4bb bugfix in lexer 2015-05-19 17:36:53 -04:00
adam j hartz
af36590ea0 major lexer refactor 2015-05-19 17:10:54 -04:00
adam j hartz
44348dfa19 some error reporting 2015-05-19 16:18:26 -04:00
adam j hartz
9024c1f9ee need additional check for stderr = stdout 2015-05-19 16:05:33 -04:00
adam j hartz
7a11bd1c77 Merge branch 'io' of github.com:wrywerytwreywery/xonsh into io 2015-05-19 09:59:48 -04:00
Anthony Scopatz
f3f9f0a8c2 Merge branch 'anula-history_tests' 2015-05-19 06:38:48 +03:00
adam j hartz
31cf10016e Merge branch 'master' of github.com:scopatz/xonsh into io 2015-05-18 23:06:18 -04:00
anula
640c3991ab Fix bugs in LimitedFileHistory (plus tests) and move it to different file.
* Move LimitedFileHistory from history.py to prompt_toolkit_history.py
because it is needed only for prompt_toolkit and requires prompt_toolkit.
* Add instalation of prompt_toolkit to .travis.yml
* Update docs hooks
2015-05-18 19:33:37 +02:00
Anthony Scopatz
402513db14 Merge branch 'rbrewer123-feature-windows-shebang' 2015-05-18 10:56:09 -05:00
Robert W. Brewer
3d920ec9fd windows: use PATHEXT to find runnable files and skip shebang parsing 2015-05-17 23:14:43 -04:00
Robert W. Brewer
cb7256915a windows: improve @ensure_git decorator 2015-05-17 21:45:33 -04:00
Robert W. Brewer
18104f15ff Merge branch 'master' into feature-windows-git-prompt 2015-05-17 21:22:29 -04:00
adam j hartz
2be276299a merge upstream changes 2015-05-17 17:56:00 -04:00
Anthony Scopatz
2afb966115 Merge branch 'wrywerytwreywery-shebang' 2015-05-17 16:31:05 -05:00
adam j hartz
5b34f267ef fix for alias bug from #241 2015-05-17 17:26:42 -04:00
Adam Hartz
c07e806002 Merge pull request #239 from ngoldbaum/hg-prompt
Add prompt output for mercurial repository branches and bookmarks
2015-05-17 17:05:01 -04:00
Anthony Scopatz
49d268d973 Merge branch 'wrywerytwreywery-windows-shebang' 2015-05-17 15:58:26 -05:00
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
e0417f6a1f another last_cmd bug 2015-05-17 16:15:41 -04:00
adam j hartz
fb5a070975 test to make sure everything in path is a valid directory 2015-05-17 14:51:51 -04:00