Commit graph

6658 commits

Author SHA1 Message Date
Morten Enemark Lund
b83bf48a93 Merge remote-tracking branch 'remotes/origin/master' into startuptime 2017-02-07 08:11:26 +01:00
Anthony Scopatz
51c761972b flake8 fixes 2017-02-07 00:59:22 -05:00
Anthony Scopatz
ae04c6f8c9 bash_completions is now manually lazy and does not override other parts of the completions subpackage on amalgamation. 2017-02-07 00:38:12 -05:00
Anthony Scopatz
79db4104a1 Merge branch 'imomaliev-decoupled-bash-completion' 2017-02-06 23:24:54 -05:00
Anthony Scopatz
80ea09fc1f Merge branch 'decoupled-bash-completion' of https://github.com/imomaliev/xonsh into imomaliev-decoupled-bash-completion 2017-02-06 23:21:33 -05:00
Anthony Scopatz
e5bc015371 Merge branch 'master' into parencomp 2017-02-06 16:30:03 -05:00
Gil Forsyth
6ddfbe7691 remove unused Token and add parent attribute
Adding a parent attribute helped but wasn't working with amalgamated
xonsh -- turns out there's a separate Token definition in tokenize that
is never used but does redefine Token once it's hit -- this was causing
crashes on my end.
2017-02-06 15:43:21 -05:00
Morten Enemark Lund
4b1ac74de1 Merge pull request #2153 from xonsh/argcomp
Argument completion
2017-02-06 20:59:00 +01:00
Morten Enemark Lund
b28a5530de Move to timings file 2017-02-06 19:52:24 +01:00
Sardorbek Imomaliev
0f224338fa fix amalgamate 2017-02-06 15:53:13 +07:00
Morten Enemark Lund
a39af269c8 Add startup timing 2017-02-06 09:22:36 +01:00
Hugo Wang
17fef9c258 simplify xonshrc code 2017-02-06 08:20:08 +08:00
Hugo Wang
dc2f7d3913 Merge branch 'master' into doc-hist-tutor 2017-02-06 08:18:41 +08:00
Anthony Scopatz
21530840d1 Merge branch 'master' into proxint 2017-02-05 16:13:32 -05:00
Jamie Bliss
1a3d7ce744 Merge pull request #2158 from xonsh/insane
Allow the TTY to be insane if there is no shell
2017-02-05 15:53:19 -05:00
Anthony Scopatz
74f40e24c5 Allow the TTY to be insane if there is no shell 2017-02-05 14:08:42 -05:00
Anthony Scopatz
31bb3eb89e initial implementation 2017-02-05 14:02:17 -05:00
Anthony Scopatz
fe3f88d53f Merge pull request #2146 from mitnk/hist-be
Make XONSH_HISTORY_BACKEND accept class type
2017-02-05 11:01:29 -05:00
Anthony Scopatz
2229489695 Merge branch 'argcomp' into parencomp 2017-02-05 10:54:30 -05:00
Anthony Scopatz
711ba56c38 Merge branch 'master' into argcomp 2017-02-05 10:53:33 -05:00
Anthony Scopatz
5ddc4d1dab Merge pull request #2157 from mitnk/add-hist-tests
Adding some tests back
2017-02-05 10:51:28 -05:00
Hugo Wang
69bea350d1 revert setup.cfg 2017-02-05 23:05:40 +08:00
Hugo Wang
f216aa8bed adding tests back 2017-02-05 22:55:04 +08:00
Hugo Wang
7c89ac6a73 update docstr 2017-02-05 22:18:44 +08:00
Hugo Wang
4cce6bbce2 no need to use inspect lib 2017-02-05 22:14:20 +08:00
Hugo Wang
4a5b561014 Merge branch 'master' of github.com:mitnk/xonsh into hist-be 2017-02-05 22:07:16 +08:00
Hugo Wang
4746d6d4a4 adding tests 2017-02-05 22:02:27 +08:00
Hugo Wang
5b114d70a3 make XONSH_HISTORY_BACKEND support instance too 2017-02-05 21:48:52 +08:00
Hugo Wang
c3a0dab6c7 Merge pull request #2155 from xonsh/sigintrec
fixes a sigint recursion issue
2017-02-05 19:59:48 +08:00
Morten Enemark Lund
c8c8f5df5c Merge pull request #2152 from xonsh/uptime
Uptime
2017-02-05 08:36:57 +01:00
Anthony Scopatz
04a4e6b69e fixes a sigint recursion issue 2017-02-05 00:10:44 -05:00
Anthony Scopatz
220e2782f6 completions updating implementation 2017-02-04 22:58:23 -05:00
Anthony Scopatz
83dfb07925 fixed readline completion' 2017-02-04 21:25:40 -05:00
Anthony Scopatz
57330a661d better token selection 2017-02-04 20:12:52 -05:00
Anthony Scopatz
f11448b4bf Added Python function argument completer 2017-02-04 19:35:16 -05:00
Anthony Scopatz
79777ac888 added subexpr_before_unbalanced 2017-02-04 17:35:32 -05:00
Anthony Scopatz
41191d1b30 added is_balanced() 2017-02-04 17:04:12 -05:00
Anthony Scopatz
4ca41e7aa1 ON_BSD fix 2017-02-04 16:07:25 -05:00
Anthony Scopatz
68899b11d3 qq 2017-02-04 15:46:32 -05:00
Anthony Scopatz
85215ea0b2 try again 2017-02-04 15:39:18 -05:00
Anthony Scopatz
c94ea2a88b cool! 2017-02-04 15:32:58 -05:00
Anthony Scopatz
c258a07015 unpack from 2017-02-04 15:20:35 -05:00
Anthony Scopatz
23f606666d ugg 2017-02-04 15:14:45 -05:00
Anthony Scopatz
cc7dd91553 more fixes 2017-02-04 14:57:33 -05:00
Anthony Scopatz
e364bbb966 added news 2017-02-04 14:39:32 -05:00
Anthony Scopatz
8a08e34cf0 unlock obvious files 2017-02-04 14:35:27 -05:00
Anthony Scopatz
ac40750c04 added uptime 2017-02-04 14:12:28 -05:00
Anthony Scopatz
e2bdc263d0 Merge pull request #2117 from xonsh/xip
Add `xip` alias
2017-02-04 10:28:05 -05:00
Anthony Scopatz
c76310762c Merge pull request #2149 from xonsh/store_std_win
Update info on stdout storage on windows
2017-02-04 09:56:20 -05:00
Hugo Wang
bc2d32096e news typo 2017-02-04 22:01:03 +08:00