Commit graph

5165 commits

Author SHA1 Message Date
Anthony Scopatz
75eada8412 Merge pull request #1724 from laerus/gitstatus
vc_branch prompt
2016-09-24 17:42:16 -04:00
Konstantinos Tsakiltzidis
12f9a928dc Merge pull request #1755 from t184256/gitstatus-allow-empty
Allow empty XONSH_GITSTATUS_ defs
2016-09-25 00:27:47 +03:00
Alexander Sosedkin
d146da661d Allow empty XONSH_GITSTATUS_ defs
builtins.__xonsh_env__.get('XONSH_GITSTATUS_' + key) or _DEFS[key]
swallowed not only None, but also empty strings, and was replaced
with an explicit check for None.
2016-09-24 13:35:09 +07:00
Konstantinos Tsakiltzidis
e1757b1cf1 Merge pull request #1752 from blahgeek/fix-quote-andor
do not quote unnessasery and/or
2016-09-22 16:39:14 +03:00
BlahGeek
39d36d2b44 do not quote unnessasery and/or 2016-09-22 16:24:57 +08:00
Gil Forsyth
09e66f631f Merge pull request #1748 from laerus/andorcomplet
auto quote completion paths that contain 'and', 'or'
2016-09-21 10:51:17 -04:00
laerus
68ae62756c auto quote completion paths that contain 'and', 'or' 2016-09-21 17:31:11 +03:00
Gil Forsyth
337ec2404b Merge pull request #1719 from Carreau/no-multi-global
Fix context-manager tests on 3.6
2016-09-21 10:26:00 -04:00
Gil Forsyth
2db0763f52 Merge pull request #1717 from Carreau/async-comp
Fix async comprehension on 3.6
2016-09-21 10:25:11 -04:00
Gil Forsyth
8d7ed72802 Merge pull request #1746 from laerus/envhelp
help method on Env
2016-09-21 10:24:38 -04:00
Gil Forsyth
bd505b1271 Merge pull request #1747 from laerus/teststraydir
test_cdpath_expansion leaving stray dirs
2016-09-21 08:19:58 -04:00
laerus
e2174dc34d test_dirstack::test_cdpath_expansion leaving stray dirs 2016-09-21 14:45:58 +03:00
laerus
af811fc7ad Env.help cleanup 2016-09-21 14:34:49 +03:00
laerus
49c2dc87b5 Env.help docs/tutorial 2016-09-21 13:27:34 +03:00
laerus
ada1a51908 Env.help color/textwrap 2016-09-21 12:54:42 +03:00
laerus
d0a5666899 missed parens 2016-09-21 11:55:53 +03:00
laerus
44363ae19c catch OSError 2016-09-21 11:53:38 +03:00
laerus
4f178aaa54 Merge branch 'master' into gitstatus 2016-09-21 11:45:39 +03:00
Anthony Scopatz
2e5234da02 Merge pull request #1745 from laerus/cwd
fix base_shell._fix_cwd
2016-09-20 20:35:50 -04:00
laerus
000b7bcee1 Env.help method 2016-09-20 13:02:41 +03:00
laerus
d613189787 fix base_shell._fix_cwd 2016-09-20 11:07:10 +03:00
Gil Forsyth
51e4bfbd38 Merge pull request #1735 from laerus/promptfmt
prompt formatting error handling + refactor
2016-09-19 11:44:08 -04:00
Matthias Bussonnier
f83ff5b2c6 Start a Python 3.6 parser.
Write now not many changes, mostly async comprehension ast node takes a
mandatory 4th keyword.
2016-09-18 10:48:30 -07:00
laerus
b04096b005 imports cleanup 2016-09-18 19:05:54 +03:00
Gil Forsyth
5a2c077ec1 Merge pull request #1738 from laerus/ckxontrib
info about the cookiecutter xontrib template
2016-09-18 08:44:48 -04:00
Konstantinos Tsakiltzidis
a1f6fb7aa5 Merge pull request #1740 from Carreau/docs-3.5
Build docs on 3.5 otherwise we'll never caught failures.
2016-09-18 04:15:00 +03:00
Matthias Bussonnier
e67c448290 Build docs on 3.5 otherwise we'll never caught failures. 2016-09-17 13:20:17 -07:00
Konstantinos Tsakiltzidis
006fe24cd9 Merge pull request #1610 from rtpg/autopair
Add experimental parentheses and bracket completion
2016-09-15 22:29:00 +03:00
laerus
82a5e4f44a info about the cookiecutter xontrib template 2016-09-15 22:14:16 +03:00
laerus
7aae605ea0 more isolation 2016-09-15 18:51:13 +03:00
laerus
63cac1baf1 better error with print_exception 2016-09-15 18:28:37 +03:00
laerus
e1a118f22f new test/print to stderr 2016-09-15 17:31:41 +03:00
laerus
58c4a3e209 test_format_prompt_with_invalid_func needs the actual Env 2016-09-15 17:19:39 +03:00
laerus
0ad2d290c7 news entry prompt-formatter 2016-09-15 17:16:04 +03:00
laerus
d5fb1c75d4 must do _failover 2016-09-15 17:12:53 +03:00
laerus
b87f6e9922 migrate prompt tests p1 2016-09-15 17:06:35 +03:00
Konstantinos Tsakiltzidis
c17c1192e2 Merge pull request #1734 from santagada/add-xontrib-powerline
Add xontrib powerline
2016-09-15 16:47:31 +03:00
laerus
b6e14daff3 handle errors on prompt formatting 2016-09-15 16:35:22 +03:00
laerus
eb6c9e35af migration p2 2016-09-15 14:45:47 +03:00
laerus
13f36179da migration p1 2016-09-15 13:23:19 +03:00
Leonardo Santagada
bebc455442 fix typo 2016-09-15 11:34:33 +02:00
Leonardo Santagada
47647ee556 add xontrib powerline 2016-09-15 11:34:20 +02:00
laerus
0a949ac912 cleanup 2016-09-15 11:48:59 +03:00
Raphael Gaschignard
d3249f0eff fix rst doc 2016-09-15 08:44:48 +09:00
laerus
794ac18b0e more threading 2016-09-14 15:54:50 +03:00
laerus
046d46cfab in thread 2016-09-14 15:43:46 +03:00
laerus
86522e18a7 handle detached HEAD 2016-09-14 13:26:23 +03:00
laerus
745eb19c39 typo 2016-09-14 12:22:06 +03:00
laerus
9faad61b12 cleanup 2016-09-14 11:13:15 +03:00
laerus
548161a51c faster git_dirty_working_directory 2016-09-14 10:50:24 +03:00