2235 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Anthony Scopatz	ac3380db70	Merge branch 'master' into xonfig	2016-01-12 20:27:21 -05:00
Anthony Scopatz	ab1cbc05c3	Merge branch 'gforsyth-multiline_tests'	2016-01-12 20:25:00 -05:00
Gil Forsyth	c1184382e7	add setup and teardown functions to multiline tests	2016-01-12 09:46:50 -05:00
Gil Forsyth	8638d9e3fb	remove unneeded imports	2016-01-11 17:51:33 -05:00
Gil Forsyth	88c753c2f0	update test description	2016-01-11 17:50:37 -05:00
Gil Forsyth	4a00e47df4	rearrange docstrings and minor pep8 tweaks	2016-01-11 17:46:23 -05:00
Gil Forsyth	36b2bba5f1	add more tests and demangle key_bindings	2016-01-11 17:40:49 -05:00
Gil Forsyth	6bf3320ff1	add tests for most multiline prompt behavior	2016-01-11 17:09:20 -05:00
Gil Forsyth	3280bc6b1b	first attempt at testing multiline input behavior	2016-01-11 16:38:25 -05:00
Anthony Scopatz	b9d79b4fe1	fixed merge conflict	2016-01-10 23:22:15 -05:00
Anthony Scopatz	e7d6772cc6	cl updates	2016-01-10 23:21:31 -05:00
Anthony Scopatz	cae7f00345	test if template string	2016-01-10 22:49:17 -05:00
Anthony Scopatz	1fee72f013	added store_in_history flag to singleline()	2016-01-10 22:09:59 -05:00
Anthony Scopatz	3e2c976577	Merge branch 'master' into xonfig	2016-01-10 21:26:59 -05:00
Anthony Scopatz	2e24e8ea77	Merge pull request #619 from adqm/infinite_loop_fix ... don't double-wrap things in $[...]	2016-01-10 21:26:24 -05:00
Anthony Scopatz	eb7634cde0	Merge pull request #611 from adqm/env_contains ... change behavior of environment get and __getitem__	2016-01-10 21:23:37 -05:00
adam j hartz	0cc8951aa6	small docs note	2016-01-10 19:56:07 -05:00
adam j hartz	1988b86719	reproduce behavior from normal lookups for ${} syntax	2016-01-10 19:54:20 -05:00
adam j hartz	da0e76af2f	update changelog	2016-01-10 19:43:57 -05:00
adam j hartz	1461b0781f	don't yield environment keys more than once	2016-01-10 18:28:30 -05:00
adam j hartz	4ae753f302	Merge branch 'sf' of https://github.com/scopatz/xonsh into scopatz-fixes	2016-01-10 18:23:24 -05:00
adam j hartz	73bc358dcd	Merge branch 'which' of https://github.com/scopatz/xonsh into scopatz-fixes	2016-01-10 18:22:52 -05:00
adam j hartz	97d8d4c69e	don't double-wrap things in $[...]	2016-01-10 18:20:05 -05:00
Anthony Scopatz	fbd8aa2072	fixed merge conflict	2016-01-10 17:46:44 -05:00
Anthony Scopatz	90f496a429	Merge pull request #614 from adqm/less_aggressive_newline ... be less aggressive about adding newlines in multiline mode	2016-01-10 17:43:50 -05:00
Anthony Scopatz	b8055c79d1	get ptk version	2016-01-10 17:27:10 -05:00
Anthony Scopatz	5a6e2095c1	added which to skiptokens	2016-01-10 16:28:43 -05:00
Anthony Scopatz	87e5cf25f4	check correct env (denv may not persist some Python objects)	2016-01-10 16:15:23 -05:00
Anthony Scopatz	c18b10fabe	Merge branch 'adqm-completer_quote_fix'	2016-01-10 15:12:32 -05:00
Anthony Scopatz	d179aa2cc2	handle ^C and ^D in wizard	2016-01-10 14:46:46 -05:00
Anthony Scopatz	12e386b985	added conversion display to input	2016-01-10 14:40:46 -05:00
Anthony Scopatz	2af7ed3371	word	2016-01-10 13:58:15 -05:00
adam j hartz	cb473643f9	add newline back in	2016-01-10 08:32:22 -05:00
adam j hartz	d778998c63	don't add newline to end of input	2016-01-09 22:43:30 -05:00
adam j hartz	114c9617cf	better check for line ending with colon	2016-01-09 22:27:48 -05:00
adam j hartz	10689e74f3	don't fall-back to old push behavior if in prompt toolkit	2016-01-09 22:15:42 -05:00
adam j hartz	95e7bb6174	only newline in middle of line if there is a non-blank line afterwards	2016-01-09 22:06:36 -05:00
adam j hartz	718a4e13dc	never line break after empty line	2016-01-09 21:59:24 -05:00
adam j hartz	a87d7112bb	only break after comma if on end of line	2016-01-09 21:57:12 -05:00
adam j hartz	1e7335c82a	put back in check for middle of line, temporarily	2016-01-09 21:55:26 -05:00
adam j hartz	92cf7f0840	give an actual error message for environ KeyError	2016-01-09 21:41:46 -05:00
adam j hartz	717e503088	in subproc mode, replace undefined env variable with ''	2016-01-09 21:40:02 -05:00
adam j hartz	cb09e1482d	update iter to make 'contains' work more properly	2016-01-09 20:01:37 -05:00
adam j hartz	0805527c40	fix for quotes in filenames when completing	2016-01-09 19:48:39 -05:00
adam j hartz	bef6e2beb8	be less aggressive about adding newlines	2016-01-09 19:34:29 -05:00
Anthony Scopatz	65e7389ab3	finally have initial conditions set	2016-01-09 18:24:14 -05:00
Anthony Scopatz	b814c1c4f9	fixed no rc issue	2016-01-09 13:41:43 -08:00
Anthony Scopatz	028217e1e2	check rc files at startup too	2016-01-08 19:19:11 -08:00
Anthony Scopatz	438fa3261d	some text clarity	2016-01-08 18:29:44 -08:00
Anthony Scopatz	273d8d1066	turned off multiline input for xonfig	2016-01-08 18:03:47 -08:00