Anthony Scopatz
9566c9097e
măjˈĭk
2015-11-29 13:34:01 -05:00
Anthony Scopatz
4da6900b1c
Merge branch 'adqm-completer_execution'
2015-11-29 13:13:38 -05:00
Anthony Scopatz
e186786243
minor style fixes
2015-11-29 13:13:08 -05:00
Anthony Scopatz
36a6aa7afc
Merge branch 'completer_execution' of https://github.com/adqm/xonsh into adqm-completer_execution
2015-11-29 13:10:28 -05:00
Anthony Scopatz
f4a80e7158
Merge pull request #538 from stonebig/manifest
...
make pip work again
2015-11-29 12:25:00 -05:00
adam j hartz
1b20b53785
add custom color case to tests
2015-11-29 10:57:30 -05:00
adam j hartz
005aaf98cf
attempt to fix test case
2015-11-29 10:55:19 -05:00
adam j hartz
043dacc5ba
allow use of custom color mappings with prompt_toolkit
2015-11-29 10:38:04 -05:00
adam j hartz
4b11418c07
fix erroneous change attrs->attr
2015-11-29 10:16:28 -05:00
adam j hartz
965cee834a
disallow invalid options for attribute completion
2015-11-29 09:03:51 -05:00
adam j hartz
deb4b7f8a5
use python eval instead of evalx for attribute completion
2015-11-29 08:50:26 -05:00
stonebig
65559cbecf
make pip work again
2015-11-29 10:36:20 +01:00
Travis Shirk
4929c329a2
Updated docs
2015-11-28 16:33:27 -07:00
Travis Shirk
70383217a6
set type and unit test
2015-11-28 16:12:41 -07:00
Anthony Scopatz
e88eb8c98d
Merge branch 'master' of github.com:scopatz/xonsh
2015-11-28 14:36:09 -05:00
Anthony Scopatz
9a5b48640a
Merge branch 'Carreau-prompt_toolkit_highlight'
2015-11-28 14:35:54 -05:00
Anthony Scopatz
08972cd510
Merge branch 'prompt_toolkit_highlight' of https://github.com/Carreau/xonsh into Carreau-prompt_toolkit_highlight
2015-11-28 14:31:22 -05:00
Matthias Bussonnier
fd37067bf6
'use absolute import of pyghooks'
2015-11-28 20:20:00 +01:00
Matthias Bussonnier
13ab4b0a3f
use XonshLexer instead of PythonLexer
2015-11-28 19:41:38 +01:00
Travis Shirk
366af72580
Explicit 'return None'
2015-11-27 13:27:16 -07:00
Travis Shirk
2920d83fc6
Debug cruft
2015-11-27 13:22:12 -07:00
Travis Shirk
bdeb690fb0
Tests for HISTCONTROL
2015-11-27 13:17:57 -07:00
Anthony Scopatz
c4862a4cfa
Merge pull request #532 from nicfit/cmderrors
...
Example of 3-tuple alias retval added to tutorial.
2015-11-27 14:22:35 -05:00
Travis Shirk
08c727efaf
Example of 3-tuple alias retval added to tutorial.
2015-11-27 11:36:18 -07:00
Anthony Scopatz
1320484bf9
Merge branch 'nicfit-cmderrors'
2015-11-27 11:36:45 -05:00
Matthias Bussonnier
94a3826712
Highlight code when using prompt_toolkit
...
rely on Pygments Python Lexer for now,
One need to write a XonshLexer, but lexers based on the current one dont'
work as they don't return whitespace.
2015-11-27 10:01:22 +01:00
Travis Shirk
5855567d77
Add support for $HISTCONTROL ignoredups and ignoreerr options.
2015-11-26 19:17:03 -07:00
Travis Shirk
20520c17d6
Support 3-tuple alias retval to include return code.
2015-11-26 18:57:53 -07:00
Benjamin Pollack
3e960c230a
Enable specifying the static config file via a command-line flag
...
Fixes #511
2015-11-25 17:33:42 -05:00
Anthony Scopatz
9338c6710f
Merge pull request #527 from scopatz/ae
...
modifications to alias expansion
2015-11-24 21:52:07 -05:00
Anthony Scopatz
21ee0b4ce3
modifications to alias expandsion
2015-11-24 15:16:29 -05:00
Anthony Scopatz
d63c5ae7a5
Merge pull request #526 from gforsyth/alias_expansion
...
add alias expansion to completer
2015-11-24 14:36:16 -05:00
Gil Forsyth
cce37cde39
make alias expansion a method of built_ins.Aliases
...
As per suggestions by @scopatz:
* alias expansion function now a method of `built_ins.Aliases`
* flip-flopped function name to fit other methods, now `expand_alias`
* only expand the first token in line
* PEP8 compliant
2015-11-24 12:37:47 -05:00
Gil Forsyth
0332545e8a
add alias expansion to completer
...
Adds a function to expand aliases in the completer to allow completion
for user-defined aliases.
e.g.
aliases['g'] = 'git'
aliases['ck'] = 'checkout'
then 'g ck' TAB will show available branches for checkout.
This is currently restricted to single item aliases.
2015-11-23 17:54:05 -05:00
Anthony Scopatz
9a35c6726e
Merge branch 'nicfit-exitcodes'
2015-11-21 22:06:28 -05:00
Anthony Scopatz
12b4b9f845
Merge branch 'exitcodes' of https://github.com/nicfit/xonsh into nicfit-exitcodes
2015-11-21 22:02:57 -05:00
Travis Shirk
c58ec27e0f
Ugh, merging brought this back.
2015-11-21 18:43:43 -07:00
Travis Shirk
26e9858dd2
Fixed docstring
2015-11-21 17:58:38 -07:00
Anthony Scopatz
181cd743c6
Merge pull request #520 from bpollack/login-option
...
Add support for -i and -l options
2015-11-21 19:54:27 -05:00
Benjamin Pollack
533a7e915f
Add support for -i and -l options
...
Support for the login option is very minimal, but the `XONSH_LOGIN`
variable is set in this case so that scripts may take an appropriate
action.
Fixes #517
2015-11-21 18:26:34 -05:00
Anthony Scopatz
a26a4338fb
Merge pull request #524 from bpollack/maketestfix
...
Fix use-before-define error in "make test"
2015-11-21 16:32:32 -05:00
Travis Shirk
63971cd691
Rebased with upstream/master
2015-11-21 14:14:49 -07:00
Benjamin Pollack
48b6abe8a1
Fix use-before-define error in "make test"
...
In the case that a test was edited, "make test" would erroneously
attempt to add `test_fname` to the list of files to test...which doesn't
exist in that branch. Instead, it should be adding `edited_fname` in
that case.
2015-11-21 16:13:34 -05:00
Travis Shirk
0665e8e1f2
meh, rethink
2015-11-21 13:19:35 -07:00
Travis Shirk
92c91086c7
Signal and exception values reflected in history dicts
2015-11-21 12:36:44 -07:00
Anthony Scopatz
8bd427d7f7
Merge pull request #521 from bpollack/typo_fix
...
Fix several calls to `eunsure_string`
2015-11-21 13:11:16 -05:00
Benjamin Pollack
7d62d92f26
Fix several calls to eunsure_string
2015-11-21 12:55:44 -05:00
Anthony Scopatz
1402108780
Merge branch 'gforsyth-sudo'
2015-11-20 16:41:29 -05:00
Gil Forsyth
58ffaa7788
add set of skippable tokens
...
for executables that act on other executables (`sudo`, `time`, etc..)
short-circuit the completer to allow completion on the second executable.
2015-11-20 16:36:28 -05:00
Gil Forsyth
b7710e292e
remove comments
2015-11-20 15:48:05 -05:00
