Commit graph

3163 commits

Author SHA1 Message Date
Anthony Scopatz
41a8befd9e some cleanup 2016-05-28 18:01:26 -04:00
Anthony Scopatz
f4e599d190 fixed conflicts 2016-05-28 17:47:00 -04:00
Anthony Scopatz
3984b83d29 win ext 2016-05-28 17:40:54 -04:00
Anthony Scopatz
d45e637b9a more updates 2016-05-28 17:35:56 -04:00
Anthony Scopatz
e7c869bb73 fixed conflicts 2016-05-28 17:08:17 -04:00
Anthony Scopatz
2b48c2fde3 try again 2016-05-28 17:04:55 -04:00
Anthony Scopatz
5bd72089e8 deterministic tests 2016-05-28 16:38:33 -04:00
Anthony Scopatz
addd8e244f updated changelog 2016-05-28 16:08:48 -04:00
Anthony Scopatz
a984c14497 added some tests 2016-05-28 16:07:27 -04:00
Anthony Scopatz
45265f0597 pairity 2016-05-28 15:59:29 -04:00
Anthony Scopatz
05b59140a9 added debugging envvar 2016-05-28 15:14:03 -04:00
adam j hartz
3798ddb4dc fixes for completing quoted strings 2016-05-28 14:34:16 -04:00
adam j hartz
d28cd5350c modify completer to use new module 2016-05-28 13:57:13 -04:00
adam j hartz
6b25c35f27 add completers module 2016-05-28 13:56:56 -04:00
adam j hartz
67ac9cd5e1 merge from master 2016-05-27 10:15:11 -04:00
adam j hartz
5d32a74a54 Merge pull request #1020 from scopatz/mlcolor
Multine prompt colors
2016-05-27 10:13:23 -04:00
Anthony Scopatz
2b160ad39f added gitter link 2016-05-26 20:01:30 -04:00
Anthony Scopatz
8de1ec12f6 rm extra comment 2016-05-26 17:25:08 -04:00
Anthony Scopatz
2f9b6595db ml cl 2016-05-26 17:24:11 -04:00
Anthony Scopatz
d3dec54378 ml rl color 2016-05-26 17:21:00 -04:00
Anthony Scopatz
6b043b34eb Merge branch 'OllieTerrance-forks-cygwin' 2016-05-26 16:11:26 -04:00
Anthony Scopatz
e3a683df9d colorizing ptk seems to work 2016-05-26 16:09:04 -04:00
Anthony Scopatz
ab28fe6bb2 try multicolor 2016-05-26 16:06:03 -04:00
Ollie Terrance
cea14abba0 Cygwin check in xonsh.platform, add to changelog 2016-05-26 20:39:47 +01:00
Ollie Terrance
086b31b23e Minor changes to get shell working in Cygwin
As discussed in #514, this seems to be the minimum required to get a working prompt.
2016-05-26 18:52:08 +01:00
Anthony Scopatz
0c717a2a22 Merge branch 'JohnLunzer-master' 2016-05-26 10:45:15 -04:00
jlunz
332aee61d5 Merge branch 'master' of https://github.com/scopatz/xonsh 2016-05-26 08:29:19 -04:00
JohnLunzer
a29a1098a6 fixed sort issue 2016-05-26 07:28:31 -04:00
Morten Enemark Lund
7a707c5c54 Merge pull request #1017 from adqm/dontbreakonquit
fix bug with killing jobs on windows
2016-05-26 11:46:20 +02:00
adam j hartz
04ca96def5 fix bug with killing jobs on windows 2016-05-26 05:30:31 -04:00
Anthony Scopatz
503b277992 added showcmd alias 2016-05-25 21:38:58 -04:00
Anthony Scopatz
6f443cb266 Merge branch 'tiny_speedup' 2016-05-25 18:39:01 -04:00
Morten Enemark Lund
fe37e78260 Speed up attr completions a tiny bit by only calling __xonsh_execer__.eval on the final candidates. 2016-05-26 00:22:30 +02:00
Anthony Scopatz
31ca63e172 Merge branch 'gforsyth-add_env_completion' 2016-05-25 17:50:31 -04:00
Anthony Scopatz
97d00d1953 Merge branch 'add_env_completion' of https://github.com/gforsyth/xonsh into gforsyth-add_env_completion 2016-05-25 17:41:44 -04:00
Gil Forsyth
bead5eecfe one more shot at regex completion stuff
I should know better than to argue with @melund
2016-05-25 17:06:39 -04:00
adam j hartz
e5217a8816 Merge pull request #1009 from scopatz/libschmedit
Fixed libedit init file problem
2016-05-25 16:38:40 -04:00
Gil Forsyth
5ebeb6c864 make happy regex funtimes for all
This may, or may not, be the thing that finally stops arbitrary function
execution in the completer.
2016-05-25 16:23:08 -04:00
Morten Enemark Lund
2592019ab1 Merge pull request #1010 from scopatz/exec
py3.4 executables_in() performance
2016-05-25 21:58:56 +02:00
JohnLunzer
f8a190dd95 xonsh will read history from locked files at startup to be included in
up-arrow history
2016-05-25 15:01:30 -04:00
Gil Forsyth
8ccaf558bd make sure completer doesn't evaluate functions 2016-05-25 14:38:35 -04:00
Gil Forsyth
755d2cecba prevent called function attribute completion 2016-05-25 14:35:33 -04:00
Anthony Scopatz
b4d190d40b try again 2016-05-25 13:39:31 -04:00
Gil Forsyth
65e1b8d6fe extend python mode completions to a good(?) place 2016-05-25 13:30:12 -04:00
Gil Forsyth
6a3111f334 add completions to ${...} 2016-05-25 13:30:12 -04:00
Anthony Scopatz
f1d1bc3e8f py3.4 executables_in() performance 2016-05-25 11:54:56 -04:00
Anthony Scopatz
97f9766e62 Merge branch 'funkyfuture-platform' 2016-05-25 11:39:25 -04:00
Anthony Scopatz
5d1bdb2c73 Merge branch 'platform' of https://github.com/funkyfuture/xonsh into funkyfuture-platform 2016-05-25 11:37:43 -04:00
Morten Enemark Lund
57a7d1bcd9 Merge pull request #1008 from scopatz/oxford
Added comma literals to subproc mode
2016-05-25 08:03:29 +02:00
Anthony Scopatz
e0ed02cdd6 Fixed libedit init file problem 2016-05-25 00:17:41 -04:00