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

3226 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony Scopatz
6f8f82646e Merge pull request #1144 from adqm/pwd 
Attempted fix for #1107
 2016-06-06 22:58:14 -04:00
Anthony Scopatz
1b28213446 Merge branch 'nicolasavru-support-right-prompt-function2' 2016-06-06 22:57:38 -04:00
Nicolas Avrutin
944de11078 support functions in $RIGHT_PROMPT 
Along the way, implement is_callable and is_callable_or_string
validators, and apply them to $PROMT and $MULTILINE_PROMPT.
 2016-06-06 22:53:13 -04:00
adam j hartz
f9d09b7fc6 remove unused function 2016-06-06 22:30:22 -04:00
adam j hartz
d474f10818 update tests appropriately 2016-06-06 22:08:17 -04:00
adam j hartz
2076aac5de add changelog entry 2016-06-06 21:57:48 -04:00
adam j hartz
6d08ee742e Merge branch 'master' into pwd 2016-06-06 21:56:56 -04:00
adam j hartz
eea41431eb attempted fix for #1107 2016-06-06 21:56:32 -04:00
Morten Enemark Lund
f35afddaa2 Merge pull request #1142 from asmeurer/alias-docs 
Add note to docs that alias functions should start with underscores
 2016-06-06 21:03:33 +02:00
Aaron Meurer
8f56f02288 Add note to docs that alias functions should start with underscores 
See #1083.
 2016-06-06 14:58:17 -04:00
Gil Forsyth
41ac538d54 Merge pull request #1139 from adqm/del_literal 
fix issue with trying to delete a literal value
 2016-06-06 11:40:22 -07:00
adam j hartz
1bea4cae2c changelog entry 2016-06-06 13:55:24 -04:00
adam j hartz
e97d3fb663 fix issue with trying to delete a literal value 2016-06-06 13:51:45 -04:00
adam j hartz
7c919b4c97 Merge branch 'master' of https://github.com/scopatz/xonsh 2016-06-06 12:40:42 -04:00
Anthony Scopatz
c1592bb9c8 Merge pull request #1138 from Siecje/xontrib_docs 
Adding xontrib to the title of extensions tutorial
 2016-06-06 09:17:21 -07:00
Cody Scott
ef8735e6d4 Adding xontrib to the title of extensions tutorial 2016-06-06 12:09:41 -04:00
adam j hartz
1c323df5de version bump to 0.3.3 2016-06-06 12:00:49 -04:00
Morten Enemark Lund
85d635e7b7 Merge pull request #1130 from rahiel/master 
environ.py: mention `xonfig styles` to see color styles + typo's
 2016-06-06 14:33:28 +02:00
Morten Enemark Lund
8b639c8d66 Merge pull request #1131 from mitnk/typo-fix-1106 
typo fix in changelog
 2016-06-06 14:32:33 +02:00
Hugo Wang
626a0b7a88 typo fix 2016-06-06 20:19:58 +08:00
Rahiel Kasim
5f4874e793 environ.py: mention xonfig styles to see color styles + typo's 2016-06-06 12:14:56 +02:00
Morten Enemark Lund
2708ccea73 Merge pull request #1129 from mitnk/fix-which-with-extended-path 
Fix which with extended path
 2016-06-06 10:28:24 +02:00
Hugo Wang
9264c9df3a fix which with extended path 2016-06-06 16:01:10 +08:00
Anthony Scopatz
76ee929676 Merge branch 'mitnk-fix-killpg-crash-on-osx' 2016-06-06 00:43:43 -04:00
Anthony Scopatz
96b798df54 Merge branch 'fix-killpg-crash-on-osx' of https://github.com/mitnk/xonsh into mitnk-fix-killpg-crash-on-osx 2016-06-06 00:43:05 -04:00
Anthony Scopatz
1d8cafec8e Merge branch 'adqm-everything_is_grey' 2016-06-06 00:41:41 -04:00
Anthony Scopatz
45605fd39e Merge branch 'everything_is_grey' of https://github.com/adqm/xonsh into adqm-everything_is_grey 2016-06-06 00:39:03 -04:00
Anthony Scopatz
ac22abc427 Merge pull request #1117 from rahiel/master 
CONTRIBUTING: render as RST on GitHub
 2016-06-05 21:36:41 -07:00
adam j hartz
7dc3fb35df merge from master, replace pygments lexer 2016-06-06 00:31:31 -04:00
adam j hartz
d300fc7d8b Merge branch 'everything_is_grey' of https://github.com/adqm/xonsh into everything_is_grey 2016-06-06 00:29:25 -04:00
Hugo Wang
291441e1b2 typo fix 2016-06-06 12:28:19 +08:00
Hugo Wang
7598eb11a3 Merge branch 'master' of https://github.com/scopatz/xonsh into fix-killpg-crash-on-osx 
Conflicts:
	CHANGELOG.rst
 2016-06-06 12:26:48 +08:00
Hugo Wang
ae1d1293eb updated changelog 2016-06-06 12:25:01 +08:00
Anthony Scopatz
2180ef28ca Merge branch 'adqm-underscore' 2016-06-06 00:18:06 -04:00
Anthony Scopatz
bbc94da88f Merge branch 'underscore' of https://github.com/adqm/xonsh into adqm-underscore 2016-06-06 00:17:04 -04:00
Hugo Wang
0f8968859f removed unused defines on Windows 2016-06-06 12:07:35 +08:00
adam j hartz
d00a6fcf2a hotfix for broken python completer 2016-06-05 20:31:40 -04:00
adam j hartz
1272880ad9 CHANGELOG 2016-06-05 19:05:31 -04:00
adam j hartz
5d5a1d2cee CHANGELOG entry 2016-06-05 19:03:26 -04:00
adam j hartz
c5b99cc93d add flag to enable/disable syntax highlighting in ptk shell 2016-06-05 18:57:02 -04:00
adam j hartz
afacea12de add flags to enable/disable pretty printing and coloring of results 2016-06-05 18:48:03 -04:00
adam j hartz
ae3dd2b946 store result of wrapped subprocess call in _ 2016-06-05 18:35:00 -04:00
Rahiel Kasim
10e31c9d06 CONTRIBUTING: render as RST on GitHub 2016-06-05 23:04:44 +02:00
adam j hartz
e9afa9b551 Merge pull request #1116 from nicolasavru/fix-completion 
return empty set instead of None when no python completions match
 2016-06-05 16:58:07 -04:00
Morten Enemark Lund
c70d813642 Merge pull request #1115 from scopatz/fix_contributing 
make CONTRIBUTING a hard link
 2016-06-05 22:44:49 +02:00
Nicolas Avrutin
eeca87ed1a Return empty set instead of None when no python completions match. 
This avoids this error when (for example) completing "rm":
Traceback (most recent call last):
  File "/usr/lib/python3.5/threading.py", line 914, in _bootstrap_inner
    self.run()
  File "/usr/lib/python3.5/threading.py", line 862, in run
    self._target(*self._args, **self._kwargs)
  File "/usr/lib/python3.5/site-packages/prompt_toolkit/interface.py", line 759, in run
    completions = list(buffer.completer.get_completions(document,complete_event))
  File "/usr/lib/python3.5/site-packages/xonsh/ptk/completer.py", line 36, in get_completions
    self.ctx)
  File "/usr/lib/python3.5/site-packages/xonsh/completer.py", line 41, in complete
    out = func(prefix, line, begidx, endidx, ctx)
  File "/usr/lib/python3.5/site-packages/xonsh/completers/base.py", line 21, in complete_base
    complete_command(prefix, line, start, end, ctx))
TypeError: unsupported operand type(s) for |: 'NoneType' and 'set'
 2016-06-05 16:31:54 -04:00
Gil Forsyth
0cb90f2ecd make CONTRIBUTING a hard link 
GitHub is weird about symlinks and I think this better represents the
desired behavior (if you click CONTRIBUTING, you should see the dev
guide)
 2016-06-05 16:22:05 -04:00
Morten Enemark Lund
33a5208702 Merge pull request #1114 from scopatz/update_osx_docs 
add brew install instructions to docs
 2016-06-05 22:05:00 +02:00
Gil Forsyth
b4633c60b7 add brew install instructions to docs 2016-06-05 15:48:46 -04:00
Gil Forsyth
70eb47b859 Merge pull request #1113 from rahiel/master 
environ.py: fix typo
 2016-06-05 12:08:12 -07:00