Commit graph

3101 commits

Author SHA1 Message Date
Morten Enemark Lund
e92e293f9f Merge pull request #910 from scopatz/terr
fix test error when STORE_STDOUT = True
2016-05-16 08:39:32 +02:00
Anthony Scopatz
577a47dc17 Merge branch 'terr' into configload 2016-05-16 02:22:51 -04:00
Anthony Scopatz
0298a8109f empty path 2016-05-16 02:22:23 -04:00
Anthony Scopatz
a3253084e3 JSON decode issue for Py 3.5 2016-05-16 02:10:58 -04:00
Anthony Scopatz
fcdef43891 test updates 2016-05-16 02:02:24 -04:00
Anthony Scopatz
9d290d1578 Merge branch 'terr' into configload 2016-05-16 01:22:31 -04:00
Anthony Scopatz
bc57d4caf1 master 2016-05-16 01:22:02 -04:00
Anthony Scopatz
919ba221b3 crlf issue 2016-05-16 01:21:10 -04:00
Anthony Scopatz
f873819237 fix test error when STOR_STDOUT = True 2016-05-16 01:07:14 -04:00
Anthony Scopatz
2118cc7a16 Merge pull request #906 from scopatz/remove_crlf
Remove crlf line endings in xonsh.bat
2016-05-16 00:45:51 -04:00
Anthony Scopatz
742d2a3b2d don't die on JSON config fail 2016-05-16 00:43:27 -04:00
Anthony Scopatz
1fdac8ed67 Merge pull request #876 from scopatz/6moths
reprompt in wizard for invalid input for envvars
2016-05-15 23:36:21 -04:00
Morten Enemark Lund
84ae4a682b Remvoed crlf line endings in xonsh.bat 2016-05-15 23:02:39 +02:00
Morten Enemark Lund
c64ed9a5bb Merge pull request #875 from adqm/deadlock
Fix For Deadlock On Captured stdout/stderr
2016-05-15 21:40:43 +02:00
Guillaume Leclerc
438ae75203 make default width to inf, add 'short-circuit', and map it to {cwd} 2016-05-15 18:27:40 +02:00
Guillaume Leclerc
e465f94a8c fix leading separator 2016-05-15 17:53:56 +02:00
Guillaume Leclerc
b2c50733d9 remove another debug print 2016-05-15 14:58:33 +02:00
Guillaume Leclerc
0867dd6dfc remove debug print, add --rm option and use -e docker param 2016-05-15 14:57:00 +02:00
Guillaume Leclerc
5af47b2baf use argparse, multiline string and other fixes 2016-05-15 11:10:46 +02:00
Gil Forsyth
68859f68f4 Merge pull request #898 from donnemartin/patch-2
Add 'Projects that use xonsh' section to README
2016-05-14 19:38:50 -04:00
Guillaume Leclerc
828e8ffde6 Implement a dynamic width CWD 2016-05-15 01:06:39 +02:00
Donne Martin
bc25328b51 Add 'Projects that use xonsh' section to README 2016-05-14 18:59:14 -04:00
Guillaume Leclerc
2ecc206fe8 update doc about docker 2016-05-14 23:34:45 +02:00
Guillaume Leclerc
36da7fac39 make docker a python (2+3) script 2016-05-14 23:30:19 +02:00
Gil Forsyth
6d193f11a0 Merge pull request #892 from scopatz/which
To join the `which` hunting mob...
2016-05-14 16:38:51 -04:00
Gil Forsyth
c60c76f076 Merge pull request #891 from scopatz/sc
Report only Syntax error for semi-colon.
2016-05-14 16:13:32 -04:00
Guillaume Leclerc
1b3a59e106 Merge remote-tracking branch 'origin/master' into dockerfile 2016-05-14 11:52:43 +02:00
Anthony Scopatz
c63410fba6 rm xonsherror 2016-05-14 01:51:47 -04:00
Anthony Scopatz
3cb7d39b06 Merge pull request #890 from Will-W/launcherfail
Fix launcher for Windows install dirs with a space
2016-05-13 19:56:34 -04:00
Anthony Scopatz
71fa298b8f denv'd which 2016-05-13 18:32:36 -04:00
Anthony Scopatz
8432f1279b report single syntax error for semicolon 2016-05-13 18:12:20 -04:00
Will Wykeham
83ff992d5b Fix launcher for Windows install dirs with a space
When python installed to 'Program Files' or other dir with a space,
this fixes the xonsh.exe to not just 'fail to launch process'.

Fixes #879
2016-05-13 22:13:09 +01:00
Morten Enemark Lund
4efd129814 Merge pull request #884 from Will-W/absentwhich
Improve handling of which being absent
2016-05-13 22:31:40 +02:00
Will Wykeham
9c02b1a9c3 Update CHANGELOG for 'which' changes 2016-05-13 21:25:51 +01:00
Morten Enemark Lund
ce6b643c17 Merge pull request #886 from TobalJackson/patch-1
Fix 'git status' option for include_untracked=True
2016-05-13 21:01:55 +02:00
TobalJackson
49883ca1ab Update CHANGELOG.rst 2016-05-13 14:31:00 -04:00
yuqing
ea9dca4af8 avoid duplicated codes while getting prompt_toolkit version 2016-05-14 00:21:36 +08:00
Guillaume Leclerc
adb42428f7 add docs 2016-05-13 17:28:56 +02:00
Guillaume Leclerc
7ff084f157 add a docker file to develop in an isolated and fresh environment 2016-05-13 17:26:13 +02:00
TobalJackson
6dabec2d73 Fix 'git status' option for include_untracked=True
the '--untracked-files=yes' option for 'git status' returns an error, which causes this function to return False even when there are untracked files present. I referred to this post for the correct argument of 'normal' instead of 'yes' ('no' still seems to work):
https://stackoverflow.com/questions/31708427/cant-see-untracked-files
2016-05-13 11:14:49 -04:00
Will Wykeham
a6e506ec9c Fix copy-pasta error 2016-05-13 14:53:13 +01:00
Will Wykeham
6b49340740 Improve handling of which being absent 2016-05-13 14:45:51 +01:00
Morten Enemark Lund
8f2c700bf5 Merge pull request #881 from moigagoo/master
Docs: Python Virtual Environments Guide Added.
2016-05-13 15:06:19 +02:00
Morten Enemark Lund
7675468c47 Merge pull request #877 from scopatz/keptk
fix for key error when completing __xonsh_shell__.shell.<TAB>
2016-05-13 13:52:09 +02:00
Morten Enemark Lund
281b29f8d7 Merge pull request #859 from Will-W/master
Fix overriding of user environment with windows fixes
2016-05-13 13:48:57 +02:00
adam j hartz
28153eb57e negation 2016-05-13 07:09:32 -04:00
adam j hartz
d66597a4ed use pipes when we're supposed to 2016-05-13 07:08:18 -04:00
Konstantin Molchanov
b8dd7b08ab Docs: Python Virtual Environments Guide Added. 2016-05-13 14:19:43 +04:00
yuqing
dadb7f12fc use proper way to set vi_mode according to prompt_toolkit's version 2016-05-13 17:43:26 +08:00
Will Wykeham
82657ad120 Handle PROMPT not present under Windows
This doesn't happen normally, but can depending how the prompt is launched
2016-05-13 10:40:43 +01:00