Commit graph

2367 commits

Author SHA1 Message Date
Morten Enemark Lund
8c66dfc725 Merge pull request #713 from scopatz/ansicon
makes ANSICON non-configurable
2016-03-01 23:25:24 +01:00
Morten Enemark Lund
dfa2a1178b Add optional dependency on the win_unicode_console library which enables utf-8 support in windows terminals. ( https://pypi.python.org/pypi/win_unicode_console ) 2016-03-01 23:19:04 +01:00
Anthony Scopatz
17a4545323 makes ANSICON non-configurable 2016-03-01 13:10:07 -05:00
Anthony Scopatz
241d7910ab Merge branch 'wiz' 2016-03-01 13:08:54 -05:00
Anthony Scopatz
a4c6e6d5ce fixed conflict 2016-03-01 12:59:28 -05:00
Morten Enemark Lund
57be553d41 Merge pull request #695 from scopatz/c
More colors: fixes and features
2016-03-01 07:21:46 +01:00
Anthony Scopatz
6d68766bd8 Merge pull request #706 from scopatz/git_dirty_work_dir
Ignore untracked files when considering if git workdir is dirty
2016-02-29 12:31:19 -05:00
Morten Enemark Lund
3ca0e00677 Update xonshrc.rst
Add snippets/tricks section to the xonshrc documentation
2016-02-28 23:24:02 +01:00
Anthony Scopatz
9dc1ba2222 env var fix 2016-02-27 17:46:35 -05:00
Anthony Scopatz
b7f85873ea updated monokai and made updating colors easier 2016-02-27 17:31:57 -05:00
Anthony Scopatz
6469579cd3 more default ANSI colors 2016-02-27 14:07:28 -05:00
Anthony Scopatz
eb05112714 new default colors in ptk 2016-02-27 13:58:15 -05:00
Anthony Scopatz
f3ce69e936 Merge branch 'master' into c 2016-02-27 12:49:19 -05:00
Anthony Scopatz
445454dc61 fix linefeeds in xonfig wizard on windows 2016-02-27 12:45:52 -05:00
Morten Enemark Lund
b0b2252420 Add option to include untracked files in git_dirty_working_directory 2016-02-27 09:57:12 +01:00
Anthony Scopatz
462184fce9 Merge pull request #705 from gforsyth/xonshi
Small addition to index.rst
2016-02-26 22:55:21 -05:00
Morten Enemark Lund
cff2893773 Update CHANGELOG.rst 2016-02-26 19:52:12 +01:00
Anthony Scopatz
fc5a481bf6 Merge pull request #704 from gforsyth/rip_legacy_python
add `tempfile` import to try statement to fail py27 gracefully
2016-02-26 11:03:22 -05:00
Morten Enemark Lund
cb2388254b Ignore untracked files when considering if git workdir is dirty 2016-02-26 13:41:45 +01:00
Gil Forsyth
c06d667f44 why not 2016-02-25 18:31:50 -05:00
Gil Forsyth
1e1c01caae put tempfile import in separate try statement
because install shouldn't fail just because someone doesn't have
setuptools...
2016-02-25 17:57:29 -05:00
Gil Forsyth
357d862132 add tempfile import to try statement to fail py27 gracefully
one line change to move `from tempfile import TemporaryDirectory` inside
the try statement so that the install will reach the `sys.version_info`
check and let a user know that Legacy Python is not supported in xonsh.
2016-02-25 17:53:59 -05:00
Anthony Scopatz
576a609273 fg the mpl alias 2016-02-25 11:32:34 -05:00
Anthony Scopatz
bc417b156d Merge branch 'c' of github.com:scopatz/xonsh into c 2016-02-25 11:11:25 -05:00
Anthony Scopatz
dc34c7fbf9 win terminal width fix 2016-02-25 11:11:19 -05:00
Anthony Scopatz
a45d938e2d added color palette printing 2016-02-25 02:00:40 -05:00
Anthony Scopatz
1709611c38 basic style printing in xonfig 2016-02-25 00:47:53 -05:00
adam j hartz
bf053cfcdc another place to reset the forced_subproc flag 2016-02-24 20:38:21 -05:00
adam j hartz
0ed8c0ec17 update tests for new subproc function 2016-02-24 20:29:59 -05:00
adam j hartz
71aa9117e3 handle case when Expression body is not a list 2016-02-24 20:29:50 -05:00
adam j hartz
b1437f7b8c don't forget to re-set forced_subproc flag 2016-02-24 20:14:50 -05:00
adam j hartz
fca82fc344 don't print return value when subproc mode wasn't explicitly invoked 2016-02-24 19:50:43 -05:00
adam j hartz
04869024a0 modify run_subproc to return the return code of the last process 2016-02-24 19:47:06 -05:00
Anthony Scopatz
0a3a1868aa Merge branch 'master' into c 2016-02-24 15:10:17 -05:00
Anthony Scopatz
9f9cd1894e Merge branch 'gforsyth-ptk_dots' 2016-02-24 15:09:28 -05:00
Anthony Scopatz
c8042e7044 revert recipie manipulation 2016-02-24 15:09:16 -05:00
Gil Forsyth
1b0f67be4b rearrange functions 2016-02-24 13:16:58 -05:00
Gil Forsyth
33cce53ba8 ignore continuation tokens if ptk <= 0.57 2016-02-24 13:12:40 -05:00
Anthony Scopatz
391c0162ca ci fixes 2016-02-24 13:08:22 -05:00
Gil Forsyth
d9275b6ffd Merge branch 'master' of https://github.com/scopatz/xonsh into ptk_dots 2016-02-24 13:08:14 -05:00
Anthony Scopatz
0f0a49b366 Merge pull request #700 from scopatz/another_cmder_workaround
Workaround bug in ConEmu/cmder (windows terminal emulators)
2016-02-24 12:36:58 -05:00
Morten Enemark Lund
09ef87846e Removed tab from code 2016-02-24 14:14:14 +01:00
Morten Enemark Lund
46aadd2f0b Workaround bug in ConEmu/cmder (windows terminal emulators) which prevented git_dirty_working_directory() from working.
Redirection in subprocess caused stdout to be lost. If it happens then retry without redirection.
2016-02-24 09:49:56 +01:00
Anthony Scopatz
d588c467fd rolled back some conda recipe changes 2016-02-24 02:21:06 -05:00
Anthony Scopatz
4ed7cc84ef fix for color loss 2016-02-24 01:53:41 -05:00
Anthony Scopatz
46496c243d ci fixes 2016-02-24 01:17:44 -05:00
Anthony Scopatz
eb1f9bccc1 Merge branch 'master' into c 2016-02-24 00:23:03 -05:00
Gil Forsyth
00599f9f66 ignore continuation tokens if ptk <= 0.57 2016-02-23 19:33:38 -05:00
Gil Forsyth
1b3a2cb337 Merge branch 'master' of https://github.com/scopatz/xonsh into ptk_dots 2016-02-23 19:32:37 -05:00
Gil Forsyth
76fcd989ee Merge pull request #696 from scopatz/rprompt
right prompt implementation
2016-02-23 19:29:40 -05:00