Commit graph

1810 commits

Author SHA1 Message Date
adam j hartz
5c6cfba70e Merge branch 'executable_title' of https://github.com/adqm/xonsh into executable_title 2015-12-05 16:28:27 -05:00
adam j hartz
6d2d5e030b small bit of documentation for current_job 2015-12-05 15:37:00 -05:00
adam j hartz
07176d664d update tests to have __xonsh_shell__ 2015-12-05 15:32:38 -05:00
adam j hartz
0c132528c4 fix for failing import tests? 2015-12-05 13:58:54 -05:00
adam j hartz
0a46ebf54f include the command being run in the title 2015-12-05 13:39:31 -05:00
Gil Forsyth
09702594a1 move completion wrap expression to separate function 2015-12-05 12:37:56 -05:00
Gil Forsyth
72170c5f30 remove unnecessarily complicated conditional 2015-12-04 17:33:37 -05:00
Gil Forsyth
f5b86b6a0f add set of completion wrap tokens for bash escape
I've noticed a few more problems in the way that the xonsh parser can
interfere with bash completion (or vice versa).  This adds a set of
tokens that might show up in filenames that cause trouble.  If one of
these tokens is in a filename/path then the bash completer will return
the `repr` of the filename and the xonsh parser won't try to interpret
the special symbols in the filename
2015-12-04 17:11:17 -05:00
Gil Forsyth
4651e66154 add space escaping to bash completion function
On Linux, if there's a foldername with a space in it, like "bad folder"
then tab-completion using `cd` will wrap single quotes around the name,
e.g.

```
cd bad(TAB)
```

completes to

```
cd 'bad folder/'
```

This behavior is encoded in `path_complete` in `completer.py`.  But if
you want to remove that poorly named folder, the argument to `rm` is
completed by `bash_complete` which didn't have this tweak and so the
result is

```
rm -r bad(TAB)
```
leads to

```
rm -r bad folder
/usr/bin/rm: cannot remove 'bad': No such file or directory
/usr/bin/rm: cannot remove 'folder/': No such file or directory
```

This tweaks the `bash_complete` function so that

```
rm -r bad(TAB)
```

returns

```
rm -r 'bad folder/'
```
2015-12-04 15:34:55 -05:00
Anthony Scopatz
d3447bef08 Merge branch 'adqm-cd_error' 2015-12-04 11:42:31 -05:00
adam j hartz
d66d525775 dirstack command returncodes, plus fix bug with dirs -c 2015-12-04 11:31:58 -05:00
adam j hartz
6677da9af7 Merge branch 'cd_error' of https://github.com/adqm/xonsh into cd_error 2015-12-04 11:19:15 -05:00
Anthony Scopatz
bb5c417267 Merge pull request #556 from scopatz/update_conda_install_docs
Added xonsh channel to the conda install documentation.
2015-12-04 09:36:17 -05:00
adam j hartz
2b6e260968 error on trying to cd to directory without executable bit 2015-12-04 08:12:29 -05:00
Morten Enemark Lund
2439c48f9f Added xonsh channel to the conda install documentation. 2015-12-04 11:22:44 +01:00
Anthony Scopatz
6e98119c46 Merge pull request #555 from scopatz/conda_build
Update conda recipes
2015-12-03 19:33:09 -05:00
Morten Enemark Lund
5d19bed903 Remove the Menu entry since it only works for windows. 2015-12-04 00:19:17 +01:00
Morten Enemark Lund
f7081ac853 Update conda recipes
Removed the app entry in meta.yaml, since this feature is not very mature. Instead added a menu item entry to start xonsh.
2015-12-03 22:30:27 +01:00
Morten Enemark Lund
0b007a0c70 Merge pull request #553 from scopatz/funcscmd
fixes bash funcscmd to allow for spaces in filenames
2015-12-03 08:28:52 +01:00
Anthony Scopatz
bb91e05f55 seems to work 2015-12-02 17:33:22 -05:00
Anthony Scopatz
979b9a7ba5 win try1 2015-12-02 17:30:28 -05:00
Anthony Scopatz
582a13e96e win try0 2015-12-02 17:18:19 -05:00
Anthony Scopatz
dee7a1fa17 fixes bash funcscmd to allow for spaces in filenames 2015-12-02 16:03:57 -05:00
Anthony Scopatz
12cb3329f7 Merge pull request #550 from scopatz/prevcmd
Logic bug in source-foreign alias
2015-12-02 12:41:11 -05:00
Anthony Scopatz
07952af766 Logic error in source-foreign 2015-12-02 00:02:49 -05:00
Anthony Scopatz
65c359473d Merge branch 'master' into random 2015-12-01 23:38:26 -05:00
Anthony Scopatz
f23ace04ee Merge branch 'gforsyth-up_history' 2015-12-01 17:32:55 -05:00
Gil Forsyth
63a0c10156 enable string matching on history search 2015-12-01 16:02:11 -05:00
Anthony Scopatz
a9c606b825 random shell type 2015-12-01 11:38:07 -05:00
Anthony Scopatz
fcf23bbc57 Merge pull request #546 from scopatz/default_colors_for_promt_tk
Better default colors for promt tk
2015-12-01 10:49:04 -05:00
Morten Enemark Lund
0061617f4e Update tests 2015-12-01 13:56:20 +01:00
Morten Enemark Lund
d68600a9d8 Change the default prompt for winodows. On windows the blue color does not work well in cmd.exe, so we use CYAN instead. 2015-12-01 13:30:13 +01:00
Morten Enemark Lund
85312dcef4 Tweak the prompt_toolkit colors to work better with black backgrounds. This is necessary since cmd.exe on windows only support a limited number of the colors, and prompt_toolkit tries to find the best match to these colors. 2015-12-01 13:28:28 +01:00
Anthony Scopatz
7e137adc3d Merge pull request #543 from adqm/collapsed_path
fish-style shortened cwd as short_cwd
2015-11-30 15:49:48 -05:00
Anthony Scopatz
5e284f6abd Merge pull request #522 from bpollack/configpath
Add support for --config-path option
2015-11-30 10:52:34 -05:00
Anthony Scopatz
3f3a50884e Merge pull request #544 from adqm/completer_cache_bugfix
bug fix for cache validation in completer
2015-11-30 10:43:39 -05:00
adam j hartz
f355b94820 bug fix for cache validation in completer 2015-11-30 08:46:31 -05:00
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