Commit graph

2716 commits

Author SHA1 Message Date
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
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
Guillaume Leclerc
1b3a59e106 Merge remote-tracking branch 'origin/master' into dockerfile 2016-05-14 11:52:43 +02: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
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
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
Konstantin Molchanov
b8dd7b08ab Docs: Python Virtual Environments Guide Added. 2016-05-13 14:19:43 +04: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
Will Wykeham
3faea65153 Update CHANGLOG for Windows env fixups 2016-05-13 09:40:52 +01:00
Will Wykeham
9a5b828f86 Delete PROMPT var rather than override it, on Windows 2016-05-13 09:40:09 +01:00
Anthony Scopatz
2121210d26 fix for key error when completing __xonsh_shell__.shell.<TAB> 2016-05-13 02:05:06 -04:00
Anthony Scopatz
4efd49b109 reprompt in wizard for invalid input for envvars 2016-05-13 01:14:55 -04:00
Anthony Scopatz
f8aff83f4d Merge pull request #874 from adqm/errors
Add different error message for PermissionError on redirect
2016-05-12 23:46:48 -04:00
Gil Forsyth
520140f2e3 Merge pull request #873 from scopatz/cachever
cache which_version() to prevent excessive subproc calls
2016-05-12 21:16:13 -04:00
adam j hartz
4ccc5646aa better error reporting on redirect 2016-05-12 20:55:56 -04:00
adam j hartz
88d4852bf5 add different error message for PermissionError on redirect 2016-05-12 20:50:57 -04:00
Anthony Scopatz
dd3613f44c cache which_version() to prevent excessive subproc calls 2016-05-12 20:38:16 -04:00
Anthony Scopatz
c0931fe5fd Merge branch 'gforsyth-fixwhich' 2016-05-12 20:31:25 -04:00
Anthony Scopatz
0801fd0453 Merge branch 'fixwhich' of https://github.com/gforsyth/xonsh into gforsyth-fixwhich 2016-05-12 20:29:38 -04:00
Gil Forsyth
8dc7e7bbb6 add potential fix for which ails 2016-05-12 19:36:57 -04:00
Anthony Scopatz
520fb2dcab Merge branch 'adqm-cache' 2016-05-12 19:18:43 -04:00
Anthony Scopatz
7ab23504bd Merge branch 'cache' of https://github.com/adqm/xonsh into adqm-cache 2016-05-12 18:58:52 -04:00
adam j hartz
402a8f3f8c re-introduce, refactor xontribs logic 2016-05-12 18:25:00 -04:00
Anthony Scopatz
ae6bd3344a Merge pull request #869 from gforsyth/fixwhich
update which to be compatible with python3.4
2016-05-12 18:08:31 -04:00
Gil Forsyth
68bb911864 remove redundant subprocess calls 2016-05-12 17:58:50 -04:00
Gil Forsyth
601c641bdf update which to be compatible with python3.4
and one other, small change
2016-05-12 17:48:27 -04:00
Anthony Scopatz
83bf607862 Merge pull request #861 from GuillaumeLeclerc/fix-846
fix #846 (compatibility with ptk 1.0)
2016-05-12 15:33:46 -04:00
Guillaume Leclerc
f0bb43f656 finer grain import 2016-05-12 21:25:14 +02:00
Anthony Scopatz
f1e03be011 Merge pull request #863 from Carreau/a-which
SCOPATZ: What makes you think it is a which?
GFORSYTH: Oh, it turned me into a GNUwt!
SCOPATZ: A GNUwt?
[Silence]
GFORSYTH: Well, I got better.
CROWD: Burn it anyway!
2016-05-12 13:53:43 -04:00
Matthias Bussonnier
f49b40042f An commit which fixes #833
CROWD:  A `which`!  A `which`!  A `which`!  We've got a `which`!  A `which`!
GFORSYTH:  We have found a `which`, might we burn it?
CROWD:  Burn it!  Burn!
SCOPATZ:  How do you know it is a `which`?
CARREAU:  It looks like one.
SCOPATZ:  Bring it forward.
WITCH:  I'm not a `gnu-which`.  I'm not a `gnu-which`.
SCOPATZ:  But you have a `-v` flag.
WITCH:  They monkey patched me.
CROWD:  No, we didn't... no.
WITCH:  And this isn't my source code, it's a false one.
SCOPATZ:  Well?
GFORSYTH:  Well, we did do the `-v` flag.
SCOPATZ:  The source code?
GFORSYTH:  And the function signature -- but it is a `which`!
CROWD:  Burn it!  `which`!  `which`!  Burn it!
SCOPATZ:  Did you dress it up like this?
CROWD:  No, no... no ... yes.  Yes, yes, a bit, a bit.
2016-05-12 10:34:21 -07:00
Guillaume Leclerc
e0866df6bb cleaner if and avoid exception 2016-05-12 19:12:05 +02:00
Guillaume Leclerc
89bb5c4e39 use if instead of exception 2016-05-12 18:47:59 +02:00
Anthony Scopatz
6395a783a0 Merge pull request #860 from ngoldbaum/history-parsing
lower-case xonsh history string specs before parsing
2016-05-12 12:40:16 -04:00
Guillaume Leclerc
d0ed660640 fix #846 (compatibility with ptk 1.0) 2016-05-12 18:16:15 +02:00
Nathan Goldbaum
d756fa686b lower-case xonsh history string specs before parsing 2016-05-12 11:14:54 -05:00
adam j hartz
933d2e09e9 rebase mistakes 2016-05-12 12:00:16 -04:00
Will Wykeham
1c7c1ca96f Fix overriding of user environment with windows fixes
Fixes #857
2016-05-12 16:57:54 +01:00