Commit graph

6926 commits

Author SHA1 Message Date
Anthony Scopatz
350f90cc63 yet another fix 2017-01-31 18:26:29 -05:00
Anthony Scopatz
3437234000 Ensure unix line ending when using ptys 2017-01-31 18:23:34 -05:00
Gil Forsyth
a46bac72eb Merge pull request #2132 from xonsh/ccover
adding code coverage back
2017-01-31 18:22:26 -05:00
laerus
65d36b8e72 environ one sentinel value per Env instance 2017-02-01 01:16:17 +02:00
Gil Forsyth
eaa12f9bff ignore vc aliases in command_cache
I don't *think* this will have any side effects.

When we build the ``$PROMPT``, we lazily check for ``git`` and ``hg``
binaries to see if we should generate a ``<branch>`` field.

At the same time ``lazy_locate_binary`` doesn't return the path to a
command if it detects that that command is an alias (since aliases won't
have a path).

In the case that ``git`` or ``hg`` is aliased (the specific case here
was replacing ``git`` with ``hub``), ``lazy_locate_binary`` will return
``None`` because the command is an alias.

This breaks the logic in the branch detection. We don't want to change
the logic in the branch detection since there are many potential impacts
on prompt generation speed, which makes for a bad user experience.

So, this is a mildly ugly hack, but it's the best option I could come up
with in order to preserve prompt speed and still keep the branch
information available for this slightly weird edge case.

I'm all ears to alternative solutions.
2017-01-31 18:11:19 -05:00
laerus
0a9c5381bd event envvar docs 2017-01-31 22:43:24 +02:00
laerus
8173a24fcc coveragerc cleanup 2017-01-31 17:10:40 +02:00
laerus
50e3367f1e environ.py pep8 2017-01-31 14:23:27 +02:00
laerus
bbeafbab56 event on_envvar moar testing 2017-01-31 12:51:26 +02:00
laerus
2e492eed27 event on_envvar_change no fire for same value 2017-01-31 12:26:50 +02:00
laerus
cd21c83e09 split on_envvar to on_envvar_new & on_envvar_change 2017-01-31 12:13:50 +02:00
laerus
ba18fe8958 HistoryEntry back to SimpleNamespace 2017-01-31 11:07:28 +02:00
Andre Weltsch
383596dc57 Merge remote-tracking branch 'origin/master' into traceback_logfile_expand_path. 2017-01-31 09:12:38 +01:00
Sardorbek Imomaliev
eebb5ba55d +news 2017-01-31 13:54:16 +07:00
Sardorbek Imomaliev
19341504ed + bash_completion.py 2017-01-31 13:17:13 +07:00
Andre Weltsch
95bd061163 Add test cases for tools.expand_path.
* Test different parameters for expand_user.
* Test different parameters for EXPAND_ENV_VARS.
2017-01-30 18:49:41 +01:00
Morten Enemark Lund
150d12673e Merge pull request #2113 from xonsh/jk
potential fix for jupyter
2017-01-30 18:46:50 +01:00
laerus
c6b9839690 environ event test for new envvar 2017-01-30 15:41:48 +02:00
laerus
b8e85f0a64 Merge branch 'cover' into ccover 2017-01-30 15:32:41 +02:00
laerus
f4b3ffbd7b environ.py pep8 2017-01-30 15:04:29 +02:00
laerus
d3227a3f14 event on_envvar 2017-01-30 14:45:35 +02:00
Sardorbek Imomaliev
ce14bea357 #2108 decouple bash-completion from xonsh 2017-01-30 11:40:33 +07:00
Morten Enemark Lund
86f30316f2 Merge pull request #2118 from xonsh/endrtn
Endrtn
2017-01-29 22:10:37 +01:00
laerus
bba90da4c4 removed codecov.yml 2017-01-29 20:53:31 +02:00
Konstantinos Tsakiltzidis
85f7a88def Merge pull request #2123 from xonsh/pybg
Sanity Restoration on Background
2017-01-29 20:15:13 +02:00
laerus
c306e85e60 HistoryEntry +slots/-SimpleNamespace 2017-01-29 19:54:21 +02:00
Anthony Scopatz
ebb9c2ae8b flak8 fixes 2017-01-29 12:49:47 -05:00
Anthony Scopatz
a733da60a3 fixed comment 2017-01-29 12:34:13 -05:00
Anthony Scopatz
f37fd751d7 fixed typo 2017-01-29 12:27:21 -05:00
Anthony Scopatz
f0de947730 more bg fixes 2017-01-29 12:25:34 -05:00
laerus
ee1ad69e20 HistoryEntry remove slots/added repr 2017-01-29 19:20:10 +02:00
laerus
972106ef1d HistoryEntry slots 2017-01-29 19:03:18 +02:00
Jamie Bliss
4c04601c10 Ooops, that's 3.4 syntax. 2017-01-29 11:49:28 -05:00
Anthony Scopatz
4eb865ca00 Merge branch 'master' into pybg 2017-01-29 10:52:14 -05:00
laerus
0a2ca5ac32 codecov badge in README 2017-01-29 17:01:23 +02:00
laerus
3f7301c55d circleci add pytest --cov option 2017-01-29 16:48:14 +02:00
laerus
d0b8e40100 coveragerc ommit ply 2017-01-29 16:05:55 +02:00
laerus
487366592d history indexing replaced namedtuple with SimpleNamespace 2017-01-29 15:22:46 +02:00
laerus
e88735807b Merge branch 'master' into hist 2017-01-29 14:12:30 +02:00
Anthony Scopatz
1ae53aa063 Merge pull request #2116 from xonsh/strip_pygments
Remove strict pygments dependency
2017-01-28 22:05:22 -05:00
Anthony Scopatz
a6046f7f03 why did this just work! 2017-01-28 22:00:31 -05:00
Gil Forsyth
ba877aa040 Merge pull request #2121 from xonsh/gvim
added gvim to unthreadable predictors
2017-01-28 21:05:04 -05:00
Gil Forsyth
3ed598b8c2 Merge pull request #2087 from xonsh/intrpt
PopenThread SIGINT fix
2017-01-28 21:04:44 -05:00
Gil Forsyth
1397253ac2 Merge pull request #2120 from xonsh/telnet
added telnet to unthreadable predictors
2017-01-28 21:02:31 -05:00
Jamie Bliss
4b75d55224 Don't ever emit 'sudo' on Windows. (It might need something else.) 2017-01-28 18:32:03 -05:00
Anthony Scopatz
d5c449df7b added gvim 2017-01-28 15:28:36 -05:00
Anthony Scopatz
f77872bae6 added telnet to unthreadable predictors 2017-01-28 14:46:31 -05:00
Anthony Scopatz
9e6c4f5420 Merge pull request #2101 from tgoodlet/master
Add a vox custom prompt section
2017-01-28 14:15:15 -05:00
Anthony Scopatz
e45677489c news 2017-01-28 14:01:01 -05:00
Anthony Scopatz
287576716d fix for boolean evaluation of CommandPipelines not ending processes 2017-01-28 13:58:52 -05:00