Commit graph

1873 commits

Author SHA1 Message Date
adam j hartz
8f049cad83 merge from master 2015-11-30 05:31:15 -05:00
adam j hartz
f6e81056a8 force_posix_paths ensurer 2015-11-30 05:25:53 -05:00
adam j hartz
453c919977 Merge branch 'collapsed_path' of https://github.com/adqm/xonsh into collapsed_paths 2015-11-30 05:22:55 -05:00
adam j hartz
993f5bfb2f quick docs for short_cwd 2015-11-29 20:38:23 -05:00
Anthony Scopatz
30f6b8095c Merge branch 'adqm-pt_colors' 2015-11-29 20:37:39 -05:00
Anthony Scopatz
881e84acb2 Merge branch 'pt_colors' of https://github.com/adqm/xonsh into adqm-pt_colors 2015-11-29 20:35:53 -05:00
adam j hartz
d2a1aeb838 use proper separators instead of hard-coding '/' 2015-11-29 20:34:53 -05:00
adam j hartz
de1bde3b0e replace lists with tuples for keyword args 2015-11-29 20:27:11 -05:00
Anthony Scopatz
ef4646b585 Merge pull request #530 from nicfit/histcontrol
Add support for $HISTCONTROL ignoredups and ignoreerr options.
2015-11-29 19:59:02 -05:00
Travis Shirk
5ba2b81fa4 test fix 2015-11-29 17:27:33 -07:00
Travis Shirk
5cda563f58 Fixes based on scopatz' feedback. 2015-11-29 16:50:20 -07:00
adam j hartz
c0c1a4fa2e fish-style shortened pwd as short_cwd 2015-11-29 18:06:49 -05:00
Anthony Scopatz
578f05845b Merge pull request #542 from adqm/home_replace
modify twiddle replacement to happen only at the start of the path
2015-11-29 18:03:21 -05:00
adam j hartz
4cdacc0fea modify twiddle replacement only to happen at the start of the path 2015-11-29 17:39:47 -05:00
adam j hartz
b6c221fd2a use new Env interface for PROMPT_TOOLKIT_COLORS 2015-11-29 15:49:12 -05:00
adam j hartz
01783aef7e change default color scheme 2015-11-29 15:48:52 -05:00
adam j hartz
bd0d391b6e document PROMPT_TOOLKIT_COLORS 2015-11-29 15:42:34 -05:00
adam j hartz
e835daf9df modify prompt_toolkit pygments style to use custom colors 2015-11-29 15:39:00 -05:00
Anthony Scopatz
9566c9097e măjˈĭk 2015-11-29 13:34:01 -05:00
Anthony Scopatz
4da6900b1c Merge branch 'adqm-completer_execution' 2015-11-29 13:13:38 -05:00
Anthony Scopatz
e186786243 minor style fixes 2015-11-29 13:13:08 -05:00
Anthony Scopatz
36a6aa7afc Merge branch 'completer_execution' of https://github.com/adqm/xonsh into adqm-completer_execution 2015-11-29 13:10:28 -05:00
Anthony Scopatz
f4a80e7158 Merge pull request #538 from stonebig/manifest
make pip work again
2015-11-29 12:25:00 -05:00
adam j hartz
1b20b53785 add custom color case to tests 2015-11-29 10:57:30 -05:00
adam j hartz
005aaf98cf attempt to fix test case 2015-11-29 10:55:19 -05:00
adam j hartz
043dacc5ba allow use of custom color mappings with prompt_toolkit 2015-11-29 10:38:04 -05:00
adam j hartz
4b11418c07 fix erroneous change attrs->attr 2015-11-29 10:16:28 -05:00
adam j hartz
965cee834a disallow invalid options for attribute completion 2015-11-29 09:03:51 -05:00
adam j hartz
deb4b7f8a5 use python eval instead of evalx for attribute completion 2015-11-29 08:50:26 -05:00
stonebig
65559cbecf make pip work again 2015-11-29 10:36:20 +01:00
Travis Shirk
4929c329a2 Updated docs 2015-11-28 16:33:27 -07:00
Travis Shirk
70383217a6 set type and unit test 2015-11-28 16:12:41 -07:00
Anthony Scopatz
e88eb8c98d Merge branch 'master' of github.com:scopatz/xonsh 2015-11-28 14:36:09 -05:00
Anthony Scopatz
9a5b48640a Merge branch 'Carreau-prompt_toolkit_highlight' 2015-11-28 14:35:54 -05:00
Anthony Scopatz
08972cd510 Merge branch 'prompt_toolkit_highlight' of https://github.com/Carreau/xonsh into Carreau-prompt_toolkit_highlight 2015-11-28 14:31:22 -05:00
Matthias Bussonnier
fd37067bf6 'use absolute import of pyghooks' 2015-11-28 20:20:00 +01:00
Matthias Bussonnier
13ab4b0a3f use XonshLexer instead of PythonLexer 2015-11-28 19:41:38 +01:00
Travis Shirk
366af72580 Explicit 'return None' 2015-11-27 13:27:16 -07:00
Travis Shirk
2920d83fc6 Debug cruft 2015-11-27 13:22:12 -07:00
Travis Shirk
bdeb690fb0 Tests for HISTCONTROL 2015-11-27 13:17:57 -07:00
Anthony Scopatz
c4862a4cfa Merge pull request #532 from nicfit/cmderrors
Example of 3-tuple alias retval added to tutorial.
2015-11-27 14:22:35 -05:00
Travis Shirk
08c727efaf Example of 3-tuple alias retval added to tutorial. 2015-11-27 11:36:18 -07:00
Anthony Scopatz
1320484bf9 Merge branch 'nicfit-cmderrors' 2015-11-27 11:36:45 -05:00
Matthias Bussonnier
94a3826712 Highlight code when using prompt_toolkit
rely on Pygments Python Lexer for now,
One need to write a XonshLexer, but lexers based on the current one dont'
work as they don't return whitespace.
2015-11-27 10:01:22 +01:00
Travis Shirk
5855567d77 Add support for $HISTCONTROL ignoredups and ignoreerr options. 2015-11-26 19:17:03 -07:00
Travis Shirk
20520c17d6 Support 3-tuple alias retval to include return code. 2015-11-26 18:57:53 -07:00
Benjamin Pollack
3e960c230a Enable specifying the static config file via a command-line flag
Fixes #511
2015-11-25 17:33:42 -05:00
Anthony Scopatz
9338c6710f Merge pull request #527 from scopatz/ae
modifications to alias expansion
2015-11-24 21:52:07 -05:00
Anthony Scopatz
21ee0b4ce3 modifications to alias expandsion 2015-11-24 15:16:29 -05:00
Anthony Scopatz
d63c5ae7a5 Merge pull request #526 from gforsyth/alias_expansion
add alias expansion to completer
2015-11-24 14:36:16 -05:00