Commit graph

1191 commits

Author SHA1 Message Date
Anthony Scopatz
bc18074ab8 some minor changes 2015-08-08 19:46:27 -04:00
Anthony Scopatz
d2cd3388bd more stuff 2015-08-05 19:58:47 -05:00
Anthony Scopatz
ad8a685287 fix for empty containers in lazyjson 2015-08-05 19:43:30 -05:00
Anthony Scopatz
8f62a2ca67 Merge branch 'master' into hist 2015-08-05 18:06:12 -05:00
Anthony Scopatz
ab19fa6ec1 Merge branch 'BYK-fix-empty-line-bug' 2015-08-05 18:05:46 -05:00
Anthony Scopatz
7c136742b3 writing at exit now too 2015-08-05 18:04:01 -05:00
Burak Yigit Kaya
fa656e505e Fix error when checking for indentation 2015-08-06 01:58:22 +03:00
Anthony Scopatz
c6552cb084 works-ish 2015-08-05 17:21:10 -05:00
Anthony Scopatz
39814197ca shell writing 2015-08-05 17:13:35 -05:00
Anthony Scopatz
2194fc06e1 some old stuff 2015-08-05 17:04:31 -05:00
Anthony Scopatz
3163ab0704 some condition locking 2015-08-05 16:51:09 -05:00
Anthony Scopatz
b1ef540b6e history constructor 2015-08-05 15:30:07 -05:00
Anthony Scopatz
4b9c74021f fixes 2015-08-05 15:22:37 -05:00
Anthony Scopatz
aa5198edc3 XDG updates 2015-08-05 15:19:03 -05:00
Anthony Scopatz
810ca4302d moved file system around 2015-08-05 11:18:43 -05:00
Anthony Scopatz
454d636b0f some edits 2015-08-04 22:18:12 -05:00
Anthony Scopatz
c45e84f9af resolved merge conflicts, possibly not working 2015-08-04 21:38:05 -05:00
adam j hartz
642e509b10 Merge branch 'scopatz-ignore-case' 2015-08-04 17:19:12 -04:00
Anthony Scopatz
c6f3e369e2 Merge branch 'adqm-pprint_windows_bugfix' 2015-08-04 16:10:56 -05:00
adam j hartz
abd16beaf2 fix pretty printing bug on windows 2015-08-04 16:47:49 -04:00
adam j hartz
8668efc74a small pep8 changes 2015-08-03 20:46:41 -04:00
adam j hartz
a1736ea728 Merge branch 'ic' of github.com:scopatz/xonsh into scopatz-ignore-case 2015-08-03 20:34:31 -04:00
adam j hartz
5304705829 minor pep8 fixes 2015-08-03 18:35:19 -04:00
adam j hartz
8fb90853ea Merge branch 'prompt-err' of github.com:scopatz/xonsh into scopatz-prompt-err 2015-08-03 18:34:05 -04:00
adam j hartz
6534b8cc35 Merge pull request #340 from scopatz/bad-loop
fixes hanging indent error
2015-08-03 17:32:53 -05:00
adam j hartz
dff8c797f4 small pep8 fixes 2015-08-03 18:25:02 -04:00
Anthony Scopatz
c83a7d44fe added auto dedenting for certain tokens 2015-08-02 21:52:53 -05:00
Anthony Scopatz
8772d5832a automatic indentation for readline shell 2015-08-02 20:52:07 -05:00
Anthony Scopatz
06b892e70a prompt formatting functions may accept None 2015-08-02 18:49:45 -05:00
Anthony Scopatz
2000af2d18 add exception handling to xonsh 2015-08-02 18:14:46 -05:00
Anthony Scopatz
2b208b9592 fixes hanging indent error 2015-08-02 17:34:13 -05:00
Anthony Scopatz
ec2d312dd0 Added $CASE_SENSITIVE_COMPLETIONS 2015-08-02 16:14:56 -05:00
Anthony Scopatz
3d56a6283c added some completions 2015-08-02 15:36:55 -05:00
Anthony Scopatz
7a300bf7d0 more win tests 6 2015-08-02 13:36:44 -05:00
Anthony Scopatz
dbb681ceac more win tests 5 2015-08-02 13:32:44 -05:00
Anthony Scopatz
1def948129 more win tests 4 2015-08-02 13:28:13 -05:00
Anthony Scopatz
37c2c26dd6 more win tests 3 2015-08-02 13:25:49 -05:00
Anthony Scopatz
65440f9339 more win tests 2 2015-08-02 13:22:12 -05:00
Anthony Scopatz
5801230b11 more win tests 2015-08-02 13:19:13 -05:00
Anthony Scopatz
cb0958fc8a win test fix 2015-08-02 13:16:05 -05:00
Anthony Scopatz
8f19f01ded case insensitive fixes for file names 2015-08-02 13:10:04 -05:00
Anthony Scopatz
1a31c82abd ignore case on completion 2015-08-02 11:39:50 -05:00
Anthony Scopatz
b2d1ae95a0 more taglines 2015-08-02 11:38:50 -05:00
Anthony Scopatz
2c5d80599a Merge branch 'kseistrup-master' 2015-08-02 11:31:41 -05:00
Klaus Alexander Seistrup
c20b80dda3 Merge remote-tracking branch 'upstream/master' 2015-07-31 23:06:22 +02:00
Morten Enemark Lund
29b5da5aee Merge pull request #319 from scopatz/login
added login shell to bash
2015-07-31 22:34:03 +02:00
Klaus Alexander Seistrup
1962f40f4a Prevent os.path.normpath() from removing current dir. Take 2.
The previous fix didn't take other current dirs and other path
separators into consideration, and so it fixed the ‘./’ problem
on Linux/Unix but not e.g. ‘.\’ on Windows.

In an attempt to be platform agnostic this patch uses os.curdir
and os.sep.

Fixes upstream #307.
2015-07-31 18:25:28 +02:00
Klaus Alexander Seistrup
b49d6c958d Prevent os.path.normpath from removing initial ‘./’
Closes upstream #307.
2015-07-31 17:23:35 +02:00
Klaus Alexander Seistrup
4092f6a845 Revert "Prevent os.path.normpath from removing initial ‘./’"
This reverts commit 205d0ae551.
2015-07-31 17:18:37 +02:00
Klaus Alexander Seistrup
205d0ae551 Prevent os.path.normpath from removing initial ‘./’
Closes #307.
2015-07-31 17:14:56 +02:00