Commit graph

1048 commits

Author SHA1 Message Date
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
Michał Zając
9ae796e477 updated gitignore 2015-05-19 18:07:30 +02:00
Michał Zając
e25c99a454 stub of completion from manpages 2015-05-19 18:07:04 +02: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
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
Nathan Goldbaum
fdb1218649 Fix corner case in hg branch checking.
Newly created repositories don't have a branch file, so we infer by calling
the hg binary.  This is slower but should still be pretty quick since it should
only happen in new repositories.
2015-05-17 00:25:46 -07:00
Nathan Goldbaum
4f29bf0ff2 Strip newline from hg id output 2015-05-16 22:54:30 -07:00
Nathan Goldbaum
b581e80f64 Avoid one call to hg by caching the path to the repository root 2015-05-16 22:45:56 -07:00
Nathan Goldbaum
bf9c02f2dc Refactor mercurial prompt integration to call hg via a subprocess 2015-05-16 22:24:41 -07:00
adam j hartz
e6e82178c0 bugfixes with stdin and last_cmd 2015-05-16 23:58:07 -04:00
adam j hartz
62c837eefa lexer state bugfix 2015-05-16 23:45:32 -04:00
adam j hartz
8f2070ba1f io: almost there 2015-05-16 23:27:03 -04:00
adam j hartz
7010210c4e fix bugs with lexer state 2015-05-16 23:26:52 -04:00
Nathan Goldbaum
c723cb9802 Merge branch 'master' of https://github.com/scopatz/xonsh into hg-prompt
Conflicts:
	xonsh/environ.py
2015-05-16 19:08:13 -07:00
Nathan Goldbaum
a12e9f143d Add prompt output for mercurial repository branches and bookmarks 2015-05-16 19:01:01 -07:00
adam j hartz
e796d706cb io: parser and lexer 2015-05-16 15:14:20 -04:00
adam j hartz
66541da12d Merge branch 'io' of https://github.com/wrywerytwreywery/xonsh into io 2015-05-16 14:18:37 -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
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