Commit graph

1515 commits

Author SHA1 Message Date
selepo
ed8b6ce37c bugfix for issue 466 with xonsh.bat installed in non-windows 2015-11-18 18:50:17 +01:00
Anthony Scopatz
53a20d1925 Merge pull request #461 from mdraw/completions-display
Make prompt_toolkit Python completions configurable
2015-11-03 15:06:47 -05:00
mdraw
7bf7c4686b Merge branch 'completions-display' of https://github.com/mdraw/xonsh into completions-display 2015-11-03 20:59:26 +01:00
mdraw
4e9290fdb7 Minor cleanups for $COMPLETIONS_DISPLAY handling 2015-11-03 20:56:05 +01:00
Anthony Scopatz
8b63dc1bac Merge pull request #465 from selepo/win-docs
Added info to windows.rst
2015-11-03 14:55:39 -05:00
selepo
432d0ed56b added info about .xonshrc needed to be created and tips about console emulators to use on windows. 2015-11-03 20:41:32 +01:00
Anthony Scopatz
0b05d27f89 Merge pull request #464 from selepo/master
bugfix for install missing scripts/xonsh.bat (windows)
2015-11-03 14:26:34 -05:00
selepo
ffb3608dbf bugfix for install missing scripts/xonsh.bat (windows) 2015-11-03 19:42:29 +01:00
Anthony Scopatz
002a61b66b Merge branch 'fsffi' 2015-11-03 11:40:37 -05:00
mdraw
c4f63ab841 Improve formatting of recent entries in envvars.rst 2015-11-02 17:13:32 +01:00
mdraw
d8252dadf6 Make prompt_toolkit Python completions configurable
Completions provided by prompt_toolkit are now configurable
by setting $COMPLETIONS_DISPLAY.
Changing it at runtime will take immediate effect, so you can quickly
disable and enable completions during shell sessions.

Possible values for $COMPLETIONS_DISPLAY are:
- 'none' for no completions,
- 'single' for single-column completions,
- 'multi' for multi-column completions (default).
2015-11-02 16:46:07 +01:00
Anthony Scopatz
3eddfaef9b some doc updates 2015-11-01 16:52:15 -05:00
Anthony Scopatz
cc291d5c4e foreign shell aliases seem to work 2015-11-01 16:43:37 -05:00
Anthony Scopatz
34244eabb6 more stuff 2015-11-01 15:08:43 -05:00
Anthony Scopatz
4d515edc61 pieces are there 2015-11-01 14:55:24 -05:00
Anthony Scopatz
81439747ac some ffi stuff 2015-11-01 14:10:14 -05:00
Anthony Scopatz
0d3ba14711 implements the source-foreign alias and refactors source-bash 2015-10-31 19:37:07 -04:00
Anthony Scopatz
f8e90fef7e Merge branch 'enc' 2015-10-31 16:34:17 -04:00
Anthony Scopatz
97ed7d25a1 added docs 2015-10-31 14:38:12 -04:00
Anthony Scopatz
4a7ebb6a86 some test fixes 2015-10-31 14:31:17 -04:00
Anthony Scopatz
800719f88d manually decode captured subproc 2015-10-31 14:25:37 -04:00
Anthony Scopatz
a4b57b5345 seems to work for teepty now 2015-10-31 13:52:10 -04:00
Anthony Scopatz
ec6123fc86 first pass at setting encoding 2015-10-31 13:31:52 -04:00
Anthony Scopatz
5c4e7cc4e7 Merge branch 'locale' 2015-10-31 12:55:24 -04:00
Anthony Scopatz
c9431758a8 locale fixes to rely on the system better 2015-10-30 12:02:43 -04:00
Anthony Scopatz
69651adf9b Merge pull request #446 from gforsyth/source_path
have source_alias search on $PATH if not in cwd
2015-10-29 23:58:13 -04:00
Gil Forsyth
bb0809feb9 have source_alias search on $PATH if not in cwd
Similar to bash and zsh behavior, this will allow the `source` command
to be used for files not in the current working directory that are
contained in $PATH.
2015-10-29 16:07:49 -04:00
Anthony Scopatz
8ea38564d7 Merge pull request #436 from mdraw/autosuggest-optional
Make prompt_toolkit's auto_suggest optional
2015-10-26 17:31:40 -04:00
Anthony Scopatz
6d577654c5 Merge pull request #438 from gforsyth/patch-1
Update xonshrc.rst for multiple xonshrc files
2015-10-26 17:07:09 -04:00
mdraw
9eb0629ae6 Make AUTO_SUGGEST and MOUSE_SUPPORT runtime-configurable
... and resolve the merge conflict
2015-10-26 21:56:09 +01:00
Gil Forsyth
c1cbf117fd Update xonshrc.rst for multiple xonshrc files 2015-10-26 16:44:51 -04:00
Anthony Scopatz
f27019358c Merge pull request #437 from gforsyth/on_arch
add ON_ARCH env to adjust $BASH_COMPLETIONS per os
2015-10-26 15:19:28 -04:00
Gil Forsyth
096ec71e93 update documentation with Arch specific info 2015-10-26 15:11:51 -04:00
Gil Forsyth
f1a7eadc1e add ON_ARCH env to adjust $BASH_COMPLETIONS per os
Arch places the default bash_completion scriptlet in
/usr/share/bash-completion, not in /etc/bash_completion as in most *nix
systems.

This adds an extra flag to tools.py to check if the current OS is
Arch (according to `platform.linux_distribution`) and if it is, adjusts
the default location for bash_completion accordingly.
2015-10-26 14:37:06 -04:00
Anthony Scopatz
6ca183580f Merge branch 'gforsyth-master' 2015-10-26 11:26:18 -04:00
Gil Forsyth
c125785b84 fix envvars description of XONSHRC
default value is a tuple of the paths with the system-wide file defined
first, then the user config file
2015-10-26 11:18:54 -04:00
Gil Forsyth
e85a9f8951 change location of windows system-wide xonshrc 2015-10-26 10:34:09 -04:00
mdraw
f05c39a572 Make prompt_toolkit's auto_suggest optional
Introducing the new AUTO_SUGGEST environment variable for this,
which can either be True or False. Default is True.

In addition, make mouse_support a class variable of PromptToolkitShell
for consistency's sake.
2015-10-26 00:15:59 +01:00
Anthony Scopatz
ffcad78b3c Merge branch 'master' of github.com:scopatz/xonsh 2015-10-25 12:01:49 -04:00
Anthony Scopatz
c98a380c9e Merge branch 'multi-exit' 2015-10-25 12:01:38 -04:00
Anthony Scopatz
6e1de14fd7 prevent multiple exits 2015-10-24 13:03:32 -04:00
Gil Forsyth
79e2180d9d move env outside of loop 2015-10-21 18:05:04 -04:00
Gil Forsyth
c9136c23b0 update docs description of XONSHRC 2015-10-21 17:17:05 -04:00
Gil Forsyth
214f599c89 swap try: except for if: continue
I learned something today!  And this is much cleaner.
2015-10-21 17:16:34 -04:00
Gil Forsyth
30e7e7a8b7 add 'XONSHRC' to DEFAULT_ENSURERS dict 2015-10-21 17:00:25 -04:00
Gil Forsyth
bcabc7c019 fix formatting (PEP8) and env file execution order
Formatting:
One line was 100 characters long.  Also swapped out \s for a set of
wrapping parentheses.

Execution order:
Since xonshrc_context loads the two environment files successively, I
swapped the order in which they're fed in so that the userspace xonshrc
will override any conflicts in the systemwide xonshrc
2015-10-21 16:15:33 -04:00
Gil Forsyth
67a2e92bc3 add support for windows system-wide xonshrc
pypa/pip had a similar conversation about this a few years ago
(see: https://github.com/pypa/pip/issues/309) and determined that
placing global configuration files in `%ALLUSERSPROFILE%\Application
Data` was the best solution without messing around with the registry.
Following their lead on this, specifically from
pypa/pip@2b5029c5
2015-10-21 15:45:12 -04:00
Gil Forsyth
6383654180 small change of kwarg to xonshrc_context
to keep things compatible with changes to environ.py which allow for a
system-wide xonshrc in addition to the user defined file
2015-10-21 14:57:05 -04:00
Gil Forsyth
3f769c85c5 add support for system xonshrc file to environ.py
Redefines the XONSHRC environment tuple to include the .xonshrc file in
user's home directory as well as a system-wide file that lives in
/etc/xonshrc (for Linux and OSX) and (TODO) somewhere else on Windows.

Then xonshrc_context does more or less what it always has, except now it
checks and places the contents of both files into the xonsh environment.
2015-10-21 14:55:07 -04:00
Anthony Scopatz
f30c7db25e more test skipping 2015-10-20 17:53:12 -04:00