adam j hartz
4b3f1391c0
adam's updates to defaults_on_win branch
2016-06-07 22:52:07 -04:00
adam j hartz
61a9b47252
Merge branch 'defaults_on_win' of https://github.com/scopatz/xonsh into melund-defaults_on_win
2016-06-07 22:47:45 -04:00
Anthony Scopatz
101f41511c
added some laziness to commands cache
2016-06-07 22:12:02 -04:00
Anthony Scopatz
92ef5ba6e1
Merge branch 'master' into vc
2016-06-07 21:28:18 -04:00
Anthony Scopatz
08f50db1e6
Merge branch 'adqm-crash'
2016-06-07 21:27:31 -04:00
adam j hartz
3a72da39d2
use what's already there
2016-06-07 21:05:05 -04:00
adam j hartz
e383043803
changelog
2016-06-07 20:50:13 -04:00
adam j hartz
378f8635ab
fix crash, modify wizard behavior
2016-06-07 20:50:08 -04:00
Anthony Scopatz
12e2c45443
Merge branch 'adqm-no_zsh_prompt'
2016-06-07 20:14:54 -04:00
Anthony Scopatz
09ce9e7c2f
Merge branch 'no_zsh_prompt' of https://github.com/adqm/xonsh into adqm-no_zsh_prompt
2016-06-07 20:14:03 -04:00
adam j hartz
87f311e23d
fix nameerror
2016-06-07 20:08:42 -04:00
Anthony Scopatz
fc363a90c7
Merge pull request #1147 from Carreau/coverage
...
Enable (some) coverage.
2016-06-07 19:27:35 -04:00
adam j hartz
0498ad964c
remove extra paren
2016-06-07 18:06:54 -04:00
adam j hartz
411ccade7d
docs
2016-06-07 17:50:40 -04:00
adam j hartz
0a3f29f016
refactor, per suggestions
2016-06-07 17:43:21 -04:00
adam j hartz
27e8409760
merge from master
2016-06-07 17:28:50 -04:00
adam j hartz
ec7874e537
merge from master
2016-06-07 16:56:42 -04:00
adam j hartz
bf5948af3f
add brief documentation about cygwin
2016-06-07 16:43:56 -04:00
adam j hartz
2191abd382
Merge branch 'cygwin' of https://github.com/OllieTerrance-forks/xonsh into OllieTerrance-cygwin
2016-06-07 16:08:15 -04:00
Gil Forsyth
0cc436868e
Merge pull request #1159 from xonsh/conda_install_doc
...
Suggest to add conda-forge as a default channel
2016-06-07 15:46:23 -04:00
Ollie Terrance
2dd2abcf36
Add Cygwin pthread_sigmask note to changelog
2016-06-07 19:22:20 +01:00
Ollie Terrance
b2eb139a38
Add Cygwin to xonfig output
2016-06-07 19:17:52 +01:00
Ollie Terrance
891a9faffc
Cygwin: don't use pthread_sigmask
...
The signal library doesn't provide this on Windows or Cygwin.
2016-06-07 19:17:52 +01:00
Morten Enemark Lund
02f22ff185
Merge pull request #1157 from xonsh/fix_fix_contributing
...
fix contributing linking
2016-06-07 18:44:23 +02:00
Gil Forsyth
8beaacd8d4
fix contributing linking
...
GitHub doesn't play nice re: displaying files that are symlinked. Hard
links don't work at all. This makes the "main" devguide RST file
CONTRIBUTING.rst and then creates devguide.rst as a symlink.
I've tested this with Sphinx and it works fine for generating
documentation.
2016-06-07 09:09:54 -04:00
Morten Enemark Lund
13e235e8e9
Suggest to add conda-forge as a default channel
2016-06-07 10:41:08 +02:00
Morten Enemark Lund
11adbef4c3
Combine two if ON_WINDOWS blocks
2016-06-07 08:28:50 +02:00
Morten Enemark Lund
423fe1a056
PEP 8
2016-06-07 08:24:42 +02:00
Morten Enemark Lund
3a9092fb2e
Forgot to remove pdb trace
2016-06-07 08:24:42 +02:00
Morten Enemark Lund
aebaa1209f
Add entries to CHANGELOG.rst
2016-06-07 08:24:42 +02:00
Morten Enemark Lund
3f8f8f9981
Fix crash when bash is not found on Windows. Also, look up GitForWindows (e.g. MSYS bash) if bash is not on PATH.
2016-06-07 08:24:41 +02:00
adam j hartz
dd7729d5f0
fix typo
2016-06-07 00:47:37 -04:00
adam j hartz
b9e5b84067
ignore PROMPT from other shells at init time
2016-06-07 00:24:37 -04:00
adam j hartz
06c3c3f10b
once more
2016-06-07 00:21:03 -04:00
adam j hartz
e72ee3c11e
changelog
2016-06-07 00:00:56 -04:00
adam j hartz
4482341e4b
don't fail quite so horribly on malformed prompt
2016-06-06 23:59:08 -04:00
adam j hartz
adb10cb1c1
never let foreign shell set {BOLD_GREEN}{user}@{hostname}{BOLD_BLUE} {short_cwd} {BOLD_BLUE}{prompt_end}{NO_COLOR}
2016-06-06 23:55:26 -04:00
Matthias Bussonnier
c28eafde53
Enable (some) coverage.
...
Not sure exactly how xonsh is tested completely, so I expect most of the
coverage process to be wrong (for now)
Codecov have [browser
extensions](https://github.com/codecov/browser-extension ) that allow you
to see the coverage directly in the pull requests in GitHub.
We might have to give codecov some limited access to the repo (webhook),
and tell the codecov bot to shut its mouth once it's enabled. But it's
super non intrusive, and kind-of useful when you refactor to see that
your code is tested.
Also set some sensible where coverage would fail only if it drops by 10%
in 1 PR.
2016-06-06 20:02:13 -07:00
Anthony Scopatz
6f8f82646e
Merge pull request #1144 from adqm/pwd
...
Attempted fix for #1107
2016-06-06 22:58:14 -04:00
Anthony Scopatz
1b28213446
Merge branch 'nicolasavru-support-right-prompt-function2'
2016-06-06 22:57:38 -04:00
Nicolas Avrutin
944de11078
support functions in $RIGHT_PROMPT
...
Along the way, implement is_callable and is_callable_or_string
validators, and apply them to $PROMT and $MULTILINE_PROMPT.
2016-06-06 22:53:13 -04:00
adam j hartz
f9d09b7fc6
remove unused function
2016-06-06 22:30:22 -04:00
VHarisop
cba9660e90
Added file option to XONSH_SHOW_TRACEBACK
2016-06-07 05:11:06 +03:00
adam j hartz
d474f10818
update tests appropriately
2016-06-06 22:08:17 -04:00
adam j hartz
2076aac5de
add changelog entry
2016-06-06 21:57:48 -04:00
adam j hartz
6d08ee742e
Merge branch 'master' into pwd
2016-06-06 21:56:56 -04:00
adam j hartz
eea41431eb
attempted fix for #1107
2016-06-06 21:56:32 -04:00
Morten Enemark Lund
f35afddaa2
Merge pull request #1142 from asmeurer/alias-docs
...
Add note to docs that alias functions should start with underscores
2016-06-06 21:03:33 +02:00
Aaron Meurer
8f56f02288
Add note to docs that alias functions should start with underscores
...
See #1083 .
2016-06-06 14:58:17 -04:00
Gil Forsyth
41ac538d54
Merge pull request #1139 from adqm/del_literal
...
fix issue with trying to delete a literal value
2016-06-06 11:40:22 -07:00
