mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-06 09:20:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
2798 commits 40 branches 136 tags 39 MiB
Commit graph

2798 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony Scopatz
4d86b7bdec Merge pull request #946 from sebastien/master 
Fixed _add_cdpaths in autocomplete, amending #916
 2016-05-19 17:05:38 -04:00
Anthony Scopatz
5e47f97559 Merge pull request #944 from scopatz/fix_test_imports 
fix broken imports in certain tests
 2016-05-19 16:03:48 -04:00
Gil Forsyth
99ea707ae7 fix broken imports in certain tests 
these were introduced in a few places but there is no __init__.py file
in the tests directory so the import breaks (at least on my machine)
 2016-05-19 15:17:42 -04:00
adam j hartz
c85864b249 Merge pull request #934 from scopatz/which_updates 
Which updates
 2016-05-19 14:04:42 -04:00
Sébastien Pierre
84e61badc8 Fixed _add_cdpaths in autocomplete, amending #191 2016-05-19 10:38:34 -04:00
Morten Enemark Lund
683115f6cf Merge pull request #933 from scopatz/chatty 
Fix many logic issues with xontribs
 2016-05-19 15:35:51 +02:00
Anthony Scopatz
59747a6c27 fix many logic issues with xontribs 2016-05-18 23:29:45 -04:00
Anthony Scopatz
08554ab8ad quick json fix 2016-05-18 22:38:10 -04:00
Anthony Scopatz
d76489b0a4 Merge pull request #931 from Siecje/xontrib-prompt-ret-code 
Adding xontrib-prompt-ret-code extension
 2016-05-18 21:14:41 -04:00
Anthony Scopatz
e222c74fd2 Merge pull request #929 from terrycloth/bash-documentation 
Document Bash config conflicts, according to issue #208.
 2016-05-18 20:55:58 -04:00
Cody Scott
28b70110f0 Adding xontrib-prompt-ret-code extension 2016-05-18 20:30:11 -04:00
Andrew Toskin
b0746fa638
Document Bash config conflicts, according to issue #208. 2016-05-18 16:51:37 -07:00
Morten Enemark Lund
d0714e5bfd Update the which alias to always show where commands where found, and move the '-v' option to specify version instead of verbose. 2016-05-18 23:09:35 +02:00
Morten Enemark Lund
cba99b5a7b Updated tests to match the new whichgen returns 2016-05-18 23:09:35 +02:00
Morten Enemark Lund
cb5c1803b0 Update version information of the _which.py module 2016-05-18 23:09:34 +02:00
Morten Enemark Lund
df79469ec7 Updated whichgen() function to always return tuples of (<path to command>, <where path found>). Before the return type was determined by the verbose option. Now the caller functions decides how the result is presented. 2016-05-18 22:59:52 +02:00
Anthony Scopatz
33e9723321 Merge branch 'sebastien-master' 2016-05-18 10:48:21 -04:00
Anthony Scopatz
c0cb5edc2b Merge branch 'master' of https://github.com/sebastien/xonsh into sebastien-master 2016-05-18 10:47:27 -04:00
Anthony Scopatz
b4dcf30bcc Merge pull request #924 from adqm/empty_rc 
don't crash on empty .xonshrc file
 2016-05-18 10:43:04 -04:00
Sébastien Pierre
f68650a218 Added tests, CHANGELOG and expand_path support to #916 2016-05-18 09:42:36 -04:00
adam j hartz
fe39fcef71 Merge branch 'rl' of https://github.com/scopatz/xonsh into scopatz-rl 2016-05-18 08:38:46 -04:00
adam j hartz
c035db458a don't break on empty .xonshrc file 2016-05-18 07:55:23 -04:00
Morten Enemark Lund
d9d7c7e918 Merge pull request #909 from scopatz/configload 
Don't die on JSON config fail
 2016-05-18 12:56:15 +02:00
Anthony Scopatz
7ec0427a12 load_static_config() in foreign shells 2016-05-18 03:50:33 -04:00
Anthony Scopatz
90ad4bd2b9 better docs 2016-05-18 03:27:57 -04:00
Anthony Scopatz
83df15459d moved rl back 2016-05-18 03:14:41 -04:00
Anthony Scopatz
f2d3163749 many readline updates 2016-05-18 03:12:43 -04:00
Anthony Scopatz
cbe756a2c6 Merge branch 'master' into rl 2016-05-18 02:30:45 -04:00
Anthony Scopatz
fbd21e099e Merge pull request #921 from adqm/which-plain 
Add argument to which, to allow printing only the name of an alias
 2016-05-18 02:19:33 -04:00
Anthony Scopatz
b445d3624e Merge branch 'adqm-r-i-search' 2016-05-18 02:16:11 -04:00
adam j hartz
cd8d003d6f don't let pyreadline destroy itself 2016-05-18 00:46:03 -04:00
adam j hartz
890470ed8d actual fix for pyreadline 2016-05-18 00:46:03 -04:00
adam j hartz
e28758f4a7 fix for windows 2016-05-18 00:46:03 -04:00
adam j hartz
f24c2488a1 update changelog 2016-05-18 00:46:03 -04:00
adam j hartz
baf08e35bf add workaround for ctrl-c not quitting reverse-i-search in readline shell 2016-05-18 00:46:03 -04:00
adam j hartz
2583777944 add argument to which, to allow printing only the name of the alias 2016-05-17 23:35:13 -04:00
Anthony Scopatz
fbd61b0c20 Merge pull request #878 from tsingakbar/master 
fix vi_mode set but still not enabled in prompt_tookit shell
 2016-05-17 22:14:17 -04:00
Anthony Scopatz
60e4750980 Merge pull request #900 from funkyfuture/completions.d 
Load autocompletions from directory
 2016-05-17 22:04:05 -04:00
Anthony Scopatz
7082369952 make print_exception() more robust to not having xonsh env. 2016-05-17 20:36:59 -04:00
Anthony Scopatz
103b0418fb Merge branch 'master' into configload 2016-05-17 20:32:07 -04:00
Anthony Scopatz
6664b9ef41 Merge branch 'whichwhich' 2016-05-17 11:49:24 -04:00
Anthony Scopatz
086078b098 Merge branch 'master' into whichwhich 2016-05-17 11:47:06 -04:00
Gil Forsyth
44b03a420e Merge pull request #883 from scopatz/update_alias_docs 
Update aliases.rst with deactivate/activate aliases
 2016-05-17 09:18:41 -04:00
Sébastien Pierre
190cbbb435 Fixed dirstack._try_cdpath to work with CDPATH values prefixed with ~/ 2016-05-17 09:17:32 -04:00
Morten Enemark Lund
67f569065a Fix typo 2016-05-17 13:46:10 +02:00
Morten Enemark Lund
b47a8da549 Update aliases.rst with deactivate/activate aliases and remove documentation on which->where alias 2016-05-17 13:43:59 +02:00
Morten Enemark Lund
2ef0a484a1 Don't report 'command is not in builtins.aliases' if the skip parameter was given 2016-05-17 12:29:42 +02:00
Morten Enemark Lund
f3e3362204 Add tests for which functionality. This does not test the actual alias function, only the whichgen() function we are using from the external which.py module. 2016-05-17 11:28:34 +02:00
Morten Enemark Lund
d310257114 Update which aliases with some Windows related functionality. Use 'PATHEXT' from the xonsh environment and ensure that files with original case. 2016-05-17 11:24:20 +02:00
Anthony Scopatz
2abddcabce Merge pull request #905 from funkyfuture/docs 
Updates to docs
 2016-05-16 10:30:36 -04:00