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
Anthony Scopatz
b72308e8d4
changelog
2016-06-05 22:51:06 -04:00
Anthony Scopatz
68ae5cadf1
Merge branch 'master' into dist
2016-06-05 22:42:32 -04:00
Anthony Scopatz
456167f70e
even more docs
2016-06-05 22:41:56 -04:00
Anthony Scopatz
718576398a
more docs
2016-06-05 22:39:28 -04:00
Anthony Scopatz
4faffc9d56
seems to work
2016-06-05 22:29:17 -04:00
Anthony Scopatz
c85856ff4c
initial dsubmit
2016-06-05 22:12:19 -04:00
Anthony Scopatz
037b9e002b
have functor
2016-06-05 21:44:03 -04:00
adam j hartz
d00a6fcf2a
hotfix for broken python completer
2016-06-05 20:31:40 -04:00
Anthony Scopatz
67b6d2abe9
suppress syntax warnings thrown by compile
2016-06-05 20:01:26 -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
Anthony Scopatz
bb5c420446
more context function tests
2016-06-05 18:34:37 -04:00
Anthony Scopatz
6e387e521b
functional tests
2016-06-05 18:25:52 -04:00
Anthony Scopatz
a1d3b73a71
many closing test
2016-06-05 17:49:12 -04:00
Anthony Scopatz
9fab87a743
ending close paren
2016-06-05 17:44:21 -04:00
Rahiel Kasim
10e31c9d06
CONTRIBUTING: render as RST on GitHub
2016-06-05 23:04:44 +02:00
Anthony Scopatz
b5d90b5a88
block test refactor
2016-06-05 17:02:10 -04: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
Anthony Scopatz
1643e1692e
oh, yeah, blocks
2016-06-05 16:25:43 -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
