Commit graph

3739 commits

Author SHA1 Message Date
Morten Enemark Lund
67fd98b366 Add change log entry 2016-06-14 20:33:09 +02:00
Morten Enemark Lund
c557aeaefc Simplify Env.__repr__. This prevents the whole environment dictionary from being printed when the repr is called. 2016-06-14 20:28:51 +02:00
Morten Enemark Lund
54d3c19e97 Added changelog entry 2016-06-14 19:54:55 +02:00
Morten Enemark Lund
010098f2b2 Reset prompt environement before source *.bat files. The xonsh prompt template string is not useable by cmd.exe and it just makes output where 'Echo ON' is enabled look very strange. 2016-06-14 19:52:22 +02:00
JohnLunzer
9862029d09 Merge branch 'master' of https://github.com/scopatz/xonsh into history-all 2016-06-14 12:25:03 -04:00
JohnLunzer
52e693f1bc Fixed pep8 issues from last commit 2016-06-14 11:35:29 -04:00
JohnLunzer
377a33c101 Fixed a output formatting issue to support multiline history 2016-06-14 11:33:28 -04:00
JohnLunzer
09b4934775 Slew of changes which should address all issues brought up in the PR review. 2016-06-14 10:37:31 -04:00
Anthony Scopatz
6ce8da5908 yeppers 2016-06-14 00:07:55 -04:00
adam j hartz
f6bd27252b Merge branch 'master' into pipe 2016-06-13 23:51:58 -04:00
adam j hartz
a73f614992 changelog 2016-06-13 23:49:48 -04:00
adam j hartz
84a8569e3a fix for pipeline issues 2016-06-13 23:47:55 -04:00
Anthony Scopatz
90dac354ca lazy imports 2016-06-13 22:55:02 -04:00
Anthony Scopatz
6b618c4f9d lazy integration 2016-06-13 22:39:14 -04:00
Anthony Scopatz
075d17056c lazy module 2016-06-13 22:12:41 -04:00
Anthony Scopatz
01661dad6f Merge branch 'master' into amal 2016-06-13 21:09:18 -04:00
VHarisop
ad80777eca
Removed redundant check, EnvPath now accepts Iterables 2016-06-14 03:14:30 +03:00
VHarisop
2ce6bdd88d
Simpler constructor + don't resolve symlinks 2016-06-14 02:18:32 +03:00
VHarisop
46c83d6871
Refactored code, added TypeError for invalid init 2016-06-14 01:19:13 +03:00
jlunz
68faa5cbeb really fixed UnicodeDecoderEffor, hopefully 2016-06-13 15:49:25 -04:00
Anthony Scopatz
a00775bae2 Merge pull request #1219 from xonsh/replace_prompt
Windows: Reset the PROMPT environment variable before starting subprocesses
2016-06-13 15:33:44 -04:00
Anthony Scopatz
d0a46610ee Merge branch 'adqm-completer' 2016-06-13 15:26:05 -04:00
Anthony Scopatz
23612853fd Merge branch 'completer' of https://github.com/adqm/xonsh into adqm-completer 2016-06-13 15:22:07 -04:00
JohnLunzer
7a069c9711 Refixed UnicodeDecodeError 2016-06-13 15:20:59 -04:00
Gil Forsyth
2c7c10e86d Merge pull request #1222 from adqm/hotfix_alias_loading
possible fix for incorrect alias loading
2016-06-13 14:33:30 -04:00
adam j hartz
9e27b1cb9e only do subsequence and fuzzy matching if no normal matches found 2016-06-13 14:27:46 -04:00
adam j hartz
faacb0a155 possible fix for incorrect alias loading 2016-06-13 14:09:04 -04:00
JohnLunzer
10f5ab9584 Fixed some comments in _create_parser 2016-06-13 11:56:37 -04:00
Anthony Scopatz
99f0f1b726 fixed typo bug 2016-06-13 11:52:45 -04:00
JohnLunzer
bcf2cbf671 removed import for JSONDecodeError 2016-06-13 11:21:56 -04:00
JohnLunzer
07da11b926 Used ValueError instead of JSONDecodeError 2016-06-13 11:07:13 -04:00
JohnLunzer
cd07eb1b92 Fixed some bugs, updated tests 2016-06-13 10:41:43 -04:00
Morten Enemark Lund
9ce59a8795 Add changelog entry 2016-06-13 16:32:27 +02:00
Morten Enemark Lund
3d015aaf86 Reset the PROMPT environment variable before starting subprocesses on windows. This avoids that the xonsh prompt template string is shown everywhere batch files runs commands with ECHO ON activated. 2016-06-13 16:13:24 +02:00
VHarisop
c5eb142bbc
Removed unnecessary check, refactored __eq__ method 2016-06-13 13:57:19 +03:00
Anthony Scopatz
cbb59bffa3 nobel effort 2016-06-13 03:23:23 -04:00
Anthony Scopatz
38c07b1772 some changes 2016-06-13 03:02:24 -04:00
Anthony Scopatz
357a60fbff new init 2016-06-13 02:43:21 -04:00
Anthony Scopatz
5f416ff390 new msg 2016-06-13 02:40:40 -04:00
Anthony Scopatz
3c8745a167 new amalgam 2016-06-13 02:39:21 -04:00
Anthony Scopatz
db8d0d2f53 another test 2016-06-13 02:37:54 -04:00
Anthony Scopatz
4b62328fd8 amalgamate runs 2016-06-13 02:01:50 -04:00
Anthony Scopatz
2f55e29035 lazyjson 2016-06-13 01:47:43 -04:00
Anthony Scopatz
62e6cdd679 more updates 2016-06-13 01:43:41 -04:00
Anthony Scopatz
73aa30263b amalgam 2016-06-13 01:28:27 -04:00
Anthony Scopatz
556522621d first try 2016-06-13 01:23:11 -04:00
Anthony Scopatz
cc1092cdd3 more work 2016-06-13 00:46:35 -04:00
Anthony Scopatz
6fbe7b9ffd Merge branch 'master' into amal 2016-06-12 23:33:24 -04:00
adam j hartz
64ca8f1af6 hotfix for trace quitting after displaying help 2016-06-12 22:59:52 -04:00
VHarisop
74b85d836a
EnvPath now handles bytes + pathlib.Path(s) 2016-06-13 04:23:05 +03:00