Commit graph

5533 commits

Author SHA1 Message Date
Jamie Bliss
2f60a22f64 Windows is still a thing. 2016-09-13 20:52:19 -04:00
Jamie Bliss
dc8c5b5b53 Finally fix __iter__() so subdirs work correctly.
Also add a test for subdirs
2016-09-13 20:49:34 -04:00
Jamie Bliss
e2c981de78 Add an explicit (and more correct) __contains__() 2016-09-13 20:29:44 -04:00
Jamie Bliss
26c78b1642 Be more complete and helpful about the contents of venv dirs 2016-09-13 20:22:13 -04:00
Anthony Scopatz
de1247a37b Merge pull request #1726 from xonsh/fix_win_git_comp
Restore bash git completions on Windows
2016-09-13 20:13:47 -04:00
Morten Enemark Lund
d7898bcd75 Add changelog 2016-09-13 23:41:08 +02:00
Morten Enemark Lund
7b408d212a Add git completions script from GitForWindows to $BASH_COMPLETIONS_DEFAULT 2016-09-13 23:38:40 +02:00
laerus
752fe1f7f0 fix for no branch in pwd 2016-09-13 21:24:21 +03:00
laerus
724e8e5861 vc_branch use gitstatus 2016-09-13 18:58:02 +03:00
Gil Forsyth
e28e6a773b Merge pull request #1711 from blahgeek/new-xonsh-highlight
New implementation of XonshLexer for pygments
2016-09-13 10:35:18 -04:00
BlahGeek
201364afda use pytest's tmpdir 2016-09-13 21:37:24 +08:00
Konstantinos Tsakiltzidis
d630525415 Merge pull request #1722 from xsteadfastx/master
docs: Fixed git_dirty_working_directory location
2016-09-13 14:25:46 +03:00
Marvin Steadfast
5a1d10b85f docs: Fixed git_dirty_working_directory location
The xonshrc example imported `git_dirty_working_directory` still from
`xonsh.environ`. Now its located in `xonsh.prompt.vc_branch`.
2016-09-13 13:18:01 +02:00
Gil Forsyth
19bda68c21 Merge pull request #1720 from blahgeek/complete-after-pipe
Completes commands after pipe
2016-09-13 06:17:17 -04:00
BlahGeek
1ecacd5a5b fix naming 2016-09-13 13:35:19 +08:00
BlahGeek
5194406dac fix autocd highlight on windows 2016-09-13 12:33:16 +08:00
BlahGeek
8d45f17461 add changelog 2016-09-13 12:30:04 +08:00
BlahGeek
4799d89785 completes commands after pipe 2016-09-13 12:27:28 +08:00
BlahGeek
f9abbc8a05 support autocd path highlight 2016-09-13 11:29:49 +08:00
BlahGeek
acb0bfe3cb more tests 2016-09-13 10:54:20 +08:00
BlahGeek
50aecce6ff fix = in subproc arg 2016-09-13 10:41:39 +08:00
Matthias Bussonnier
3851a77062 Fix test and Ast creation.
Report useful error messages, and creat ast with integers.
2016-09-12 19:02:37 -07:00
Matthias Bussonnier
c42b1fa135 Don't reuse variables names in tests.
Since http://bugs.python.org/issue27999, global after use is a
SyntaxError; reusing variable name in tests/test_contexts.py
lead to failure.

Should close #1718
2016-09-12 10:01:16 -07:00
Matthias Bussonnier
de984f98a4 Fix async comprehension on 3.6
Seem simple enough, and avoid writing a full 3.6 parser for now.
2016-09-12 09:37:07 -07:00
Morten Enemark Lund
c5bd963a8e Merge pull request #1712 from laerus/falias
control overriding of foreign aliases
2016-09-12 14:20:25 +02:00
laerus
715e5ed546 fix if shaliases is None 2016-09-12 11:13:54 +03:00
Raphael Gaschignard
7ca14d4020 Merge branch 'master' of github.com:xonsh/xonsh into autopair 2016-09-12 16:10:10 +09:00
Morten Enemark Lund
7a9a833d5f Merge pull request #1713 from xonsh/win_path_comp_fix
remember windows when checking for abs paths
2016-09-12 08:37:54 +02:00
Morten Enemark Lund
420dc0bbf4 Add changelog 2016-09-12 08:13:25 +02:00
Morten Enemark Lund
ad4ef0054e Handle the cases where foreign_shell_data return fails and return (None,None) 2016-09-12 08:13:11 +02:00
BlahGeek
8078f96869 update changelog 2016-09-12 12:07:46 +08:00
BlahGeek
c1e128d8f0 fix backtick regex syntax 2016-09-12 12:07:36 +08:00
BlahGeek
9ce5a8494d fix alias lookup on windows 2016-09-12 11:52:09 +08:00
BlahGeek
ddf97f0149 support macro syntax 2016-09-12 11:47:18 +08:00
BlahGeek
c7629b1f3c add cd alias for windows while testing, support windows path highlight 2016-09-12 11:23:20 +08:00
BlahGeek
0f2ab88f2e Revert "tests use type instead of cd for windows"
This reverts commit 7c635add93.
2016-09-12 11:20:39 +08:00
BlahGeek
7c635add93 tests use type instead of cd for windows 2016-09-12 11:05:20 +08:00
laerus
c48718982a Merge branch 'master' of https://github.com/xonsh/xonsh into falias 2016-09-11 17:17:09 +03:00
Konstantinos Tsakiltzidis
d05fad3fde Merge pull request #1709 from xonsh/completer_prefix_splitting
Completer prefix splitting
2016-09-11 16:37:44 +03:00
BlahGeek
642b46976a Merge branch 'master' into new-xonsh-highlight 2016-09-11 20:51:46 +08:00
Gil Forsyth
dbae098673 Merge pull request #1703 from xonsh/cmd_cache_lookup_win
Cmd cache lookup on windows
2016-09-11 08:39:39 -04:00
Gil Forsyth
97273f65f4 remember windows when checking for abs paths 2016-09-11 08:37:26 -04:00
BlahGeek
66d6f50662 use Name.Builtin instead of Keyword 2016-09-11 20:17:49 +08:00
BlahGeek
fc080c6b06 add lookahead assertion for COMMAND_TOKEN 2016-09-11 19:58:18 +08:00
Gil Forsyth
afe98ff45b de-dup line 2016-09-11 07:33:04 -04:00
BlahGeek
4d3e9cbed7 fix test fixture 2016-09-11 16:22:42 +08:00
BlahGeek
61c38a3ccd loads command cache while initing xonsh lexer 2016-09-11 16:20:22 +08:00
BlahGeek
30e43401b8 cleanup code 2016-09-11 16:19:00 +08:00
Morten Enemark Lund
4d84a5dbc9 Updates from review 2016-09-11 10:11:41 +02:00
BlahGeek
521ca3b471 add highlight for backtick regex 2016-09-11 16:09:19 +08:00