6575 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Anthony Scopatz	d30908024b	some flake8 cleanup	2017-02-15 01:06:03 -05:00
Anthony Scopatz	0cb619468a	line continuation fixes	2017-02-15 00:58:38 -05:00
Hugo Wang	c28504a152	Merge branch 'master' into tcgrp	2017-02-15 12:04:23 +08:00
Hugo Wang	e63c57acd5	update test cases	2017-02-15 12:01:04 +08:00
Anthony Scopatz	32375dd18d	Merge branch 'master' into linecont	2017-02-14 22:57:23 -05:00
Morten Enemark Lund	79a7fc49fa	Merge pull request #2187 from xonsh/lr ... Xonsh startup loading refactor	2017-02-15 04:54:53 +01:00
Hugo Wang	80d4afdd91	handle xonsh error inside a pipeline	2017-02-15 11:46:15 +08:00
Anthony Scopatz	3ce2089b13	Merge pull request #2193 from xonsh/custom_key_docs ... Tutorial: Custom keybinding in PTK	2017-02-14 22:32:57 -05:00
Hugo Wang	597e95c750	adding tty sanity back	2017-02-15 08:56:49 +08:00
Gil Forsyth	d671bef66e	no builtins import, use event correctly	2017-02-14 16:51:07 -05:00
Gil Forsyth	3173bd1399	finish first pass on ptk keybinding tutorial	2017-02-14 16:00:25 -05:00
Anthony Scopatz	7a44848d4c	Fix for alias resolution in threadable predition	2017-02-14 15:56:55 -05:00
Anthony Scopatz	ed3bcca69b	fixed typo	2017-02-14 15:34:12 -05:00
Morten Enemark Lund	e78b0448a7	Don't import xonsh.built_ins	2017-02-14 21:29:44 +01:00
Anthony Scopatz	c7a61bbf5d	cleanup	2017-02-14 15:27:40 -05:00
Morten Enemark Lund	88abaf6348	Fix skip_if_on_conda decorator	2017-02-14 21:17:43 +01:00
Morten Enemark Lund	8877188cb5	Explicitly instantiate Excer() in test_imphooks.py. ... Using the Excer fixture from conftest.py does not instantiate builtins. And calling load_builtins won't work since it is monkeypatched from the fixture.	2017-02-14 21:14:18 +01:00
Morten Enemark Lund	4f09829fd6	Fix monkeypath load_builins	2017-02-14 21:02:04 +01:00
Gil Forsyth	534b29d578	add intro to ptk custom keybinding	2017-02-14 12:32:02 -05:00
Konstantinos Tsakiltzidis	e84cb086af	Merge pull request #2144 from xonsh/style_hotfix ... add empty split method to fix pygments	2017-02-13 20:04:36 +02:00
Hugo Wang	5eb7be81ca	news item	2017-02-13 22:55:19 +08:00
Hugo Wang	080513cf6e	clean up shell_tty	2017-02-13 22:39:25 +08:00
Hugo Wang	3680cb2213	revert kind is types.CodeType	2017-02-13 20:17:33 +08:00
Hugo Wang	2a65e2cfc1	make fg work	2017-02-13 17:36:56 +08:00
Hugo Wang	64077803ff	Merge branch 'master' into tcgrp	2017-02-13 16:17:22 +08:00
Hugo Wang	91cc19566e	minor fixes	2017-02-13 15:50:47 +08:00
Hugo Wang	eba344f948	build sub processes inside CommandPipeline	2017-02-13 15:36:44 +08:00
Anthony Scopatz	3d20fc04de	no history	2017-02-13 01:04:56 -05:00
Anthony Scopatz	d0d4ad62ef	import reorder	2017-02-13 00:57:42 -05:00
Anthony Scopatz	419984beca	new ctx	2017-02-13 00:50:31 -05:00
Anthony Scopatz	23a06f1b2c	import cleanup	2017-02-13 00:49:05 -05:00
Anthony Scopatz	7c432b7616	doc fix	2017-02-13 00:45:50 -05:00
Anthony Scopatz	773069c4f5	Xonsh startup loading refactor	2017-02-13 00:25:38 -05:00
Konstantinos Tsakiltzidis	672e0c617c	Merge pull request #2181 from xonsh/file ... Added __file__ and __name__ to xonsh scripts	2017-02-13 02:06:18 +02:00
Anthony Scopatz	3740716799	audodoc hooks	2017-02-12 18:36:50 -05:00
Anthony Scopatz	cfc50facab	some flake8 fixes	2017-02-12 18:19:53 -05:00
Anthony Scopatz	498fca5aaa	new xoreutils	2017-02-12 18:07:26 -05:00
Anthony Scopatz	1995f7303a	initial update	2017-02-12 17:37:17 -05:00
Anthony Scopatz	f5eb6f7bc6	Merge branch 'coreutils' of https://github.com/adqm/xonsh into xoreutils	2017-02-12 17:32:43 -05:00
Anthony Scopatz	5e1babbc65	Some fixes	2017-02-12 17:18:57 -05:00
Anthony Scopatz	a695c78e64	is -> in	2017-02-12 17:09:51 -05:00
Anthony Scopatz	7fd1672f7e	Make callabale aliases interruptable	2017-02-12 15:38:26 -05:00
Anthony Scopatz	3e18b3586f	Merge branch 'master' into proxint	2017-02-12 14:02:01 -05:00
Anthony Scopatz	cbc7282707	ws	2017-02-12 13:36:33 -05:00
Anthony Scopatz	8225731142	some comments	2017-02-12 13:24:53 -05:00
Anthony Scopatz	cb2f071d37	ugg	2017-02-12 13:21:13 -05:00
Anthony Scopatz	2e6946d5a7	pytest is thge worst	2017-02-12 13:15:34 -05:00
Anthony Scopatz	9823b465cf	separate tests	2017-02-12 13:11:29 -05:00
Anthony Scopatz	633cce8e95	xfail	2017-02-12 13:01:15 -05:00
Anthony Scopatz	6df10233dc	stupid message	2017-02-12 12:59:40 -05:00