Commit graph

3679 commits

Author SHA1 Message Date
Anthony Scopatz
d14292cb9c some doc fixes 2016-06-18 17:32:37 -04:00
Anthony Scopatz
43d487c243 Merge pull request #1273 from youtux/fix-main-config-file
fix bug in main: args.config_path not being used
2016-06-18 14:33:23 -04:00
Anthony Scopatz
96d965652d Merge pull request #1271 from xonsh/fix_alias
Fix aliases that reference them self
2016-06-18 14:31:59 -04:00
Anthony Scopatz
c14484435d Merge pull request #1276 from xonsh/fix_missing_PWD
fix undefined PWD in default environment
2016-06-18 12:43:02 -04:00
Gil Forsyth
342e5ac0cb add empty string to cover cwd None 2016-06-18 11:24:48 -04:00
Gil Forsyth
ead6bb9a32 Merge pull request #1274 from youtux/wizard-foreign-shell-prompt
Be more explicit in foreign shell wizard
2016-06-18 10:22:36 -04:00
Alessio Bogon
71e3c007f1 Add the news. 2016-06-18 16:12:41 +02:00
Gil Forsyth
14c90fd963 Merge pull request #1272 from youtux/fix-xonfig
Fix xonfig_main bugs
2016-06-18 10:07:11 -04:00
Gil Forsyth
35c8e28d90 fix undefined PWD in default environment 2016-06-18 09:33:20 -04:00
Morten Enemark Lund
db0179bb6b Merge pull request #1270 from youtux/patch-1
Fix `xonsh` not being include in setup.py scripts
2016-06-18 14:06:43 +02:00
Alessio Bogon
a179c9aadb Be more explicit in foreign shell wizard
Fix #1267
2016-06-18 00:49:31 +02:00
Alessio Bogon
5b42064950 fix bug in main: args.config_path not being used 2016-06-18 00:46:06 +02:00
Alessio Bogon
1a23ae1a0c Add the news. 2016-06-18 00:27:37 +02:00
Alessio Bogon
6507109cb1 also fix bug in xonfig.make_xonfig_wizard() 2016-06-17 23:47:20 +02:00
Morten Enemark Lund
45a92a0576 Merge pull request #1269 from xonsh/ua
more unicode amalgamate fixes
2016-06-17 23:24:52 +02:00
Alessio Bogon
60ac1967b2 fix xonfig_main bugs
* main.py called the old `xonfig.main` function, which doesn't exists anymore
* the `wiz` variable in xonfig.py was conflicting with the global `wiz`
* `_MAIN_ACTIONS` was renamed to `_XONFIG_MAIN_ACTIONS`
2016-06-17 23:02:54 +02:00
Morten Enemark Lund
efb44b9f83 add changelog 2016-06-17 22:58:36 +02:00
Morten Enemark Lund
8e81f89956 Fix problem where binary_loc was not substituted into the aliased command. 2016-06-17 22:49:47 +02:00
Alessio Bogon
ebfcaa8b8b Fix xonsh not being include in setup.py scripts
If you use macOS, the expression `'win' in sys.platform` is `True`, since `sys.platform == 'darwin'`. This would prevent `xonsh` to be added in the scripts.
2016-06-17 22:16:16 +02:00
Anthony Scopatz
1fad151450 more unicode amalgamate fixes 2016-06-17 16:05:46 -04:00
Morten Enemark Lund
4a85511ae8 Merge pull request #1264 from xonsh/xonfig
xonfig updates
2016-06-17 20:55:05 +02:00
Anthony Scopatz
72bb179155 Merge branch 'JohnLunzer-history-all' 2016-06-17 13:52:15 -04:00
Anthony Scopatz
3dc6703e45 some hist doc changes 2016-06-17 13:52:05 -04:00
Anthony Scopatz
292a922af7 Merge branch 'history-all' of https://github.com/JohnLunzer/xonsh into JohnLunzer-history-all 2016-06-17 13:44:57 -04:00
JohnLunzer
426b1ffec4 Merged with master. Alphabetized xonsh.tools import in test_tools.py 2016-06-17 13:25:36 -04:00
adam j hartz
5ff89d4f60 Merge pull request #1266 from xonsh/exit
fix for xonsh exit
2016-06-17 13:10:25 -04:00
JohnLunzer
1ba3b50090 Updated documenation and changed to direct imports 2016-06-17 12:55:42 -04:00
Anthony Scopatz
fb4ea40816 fixed name 2016-06-17 12:47:25 -04:00
Anthony Scopatz
1aff84a86b fix for xonsh exit 2016-06-17 12:37:55 -04:00
Gil Forsyth
ffd69861ca Merge pull request #1265 from xonsh/nu
removed unicode from platform
2016-06-17 12:18:34 -04:00
Anthony Scopatz
25382df2b8 removed unicode from platform 2016-06-17 12:00:30 -04:00
Gil Forsyth
08db3e7b70 Merge pull request #1255 from laerus/moar-docs-i1118
more information about library dependencies
2016-06-17 11:39:36 -04:00
Anthony Scopatz
a4359e1377 Merge branch 'master' of github.com:scopatz/xonsh 2016-06-17 11:37:30 -04:00
Anthony Scopatz
7a1f931745 Merge branch 'VHarisop-path_expand' 2016-06-17 11:37:21 -04:00
Anthony Scopatz
f3095f698f Merge branch 'path_expand' of https://github.com/VHarisop/xonsh into VHarisop-path_expand 2016-06-17 11:35:57 -04:00
Anthony Scopatz
ee033b6216 Merge pull request #1258 from DangerOnTheRanger/patch-1
add xonsh-apt-tabcomplete to xontribs.json
2016-06-17 11:18:40 -04:00
Konstantinos Tsakiltzidis
0332a22d13 prompt_toolkit requires pygments 2016-06-17 18:17:17 +03:00
Anthony Scopatz
da136fd549 xonfig updates 2016-06-17 11:15:08 -04:00
JohnLunzer
2d7274e01b Fixed silly whitespace issue 2016-06-17 10:15:52 -04:00
JohnLunzer
36f3ec6955 Merge xonsh master. Make hopefully final changes. 2016-06-17 10:11:59 -04:00
laerus
a0fe8cac86 'more info' 2016-06-17 16:57:43 +03:00
Kermit Alexander II
58832bbaab add xonsh-apt-tabcomplete to xontribs.json 2016-06-17 08:47:18 -05:00
Gil Forsyth
4c51daf04e Merge pull request #1249 from xonsh/sort_comp
Better sorting of completions.
2016-06-17 09:44:44 -04:00
Gil Forsyth
81530ef57c Merge pull request #1244 from xonsh/quoted_path_completions
Fix missing completions
2016-06-17 09:13:30 -04:00
Morten Enemark Lund
8034cf4cba Merge pull request #1254 from laerus/bash-to-xhs-doc
'updates instructions in bash_to_xsh.rst'
2016-06-17 15:07:55 +02:00
laerus
c38e35978c 'more information about library dependencies' 2016-06-17 15:53:41 +03:00
Morten Enemark Lund
b7d1c57add Final updates 2016-06-17 14:24:05 +02:00
Morten Enemark Lund
d458eb1a9a Also apply filtfunc to stuff we add after the quoting 2016-06-17 14:03:21 +02:00
laerus
840815c806 Merge branch 'master' into bash-to-xhs-doc 2016-06-17 14:30:11 +03:00
laerus
4336b01d10 'updates instruction about the retrieval of the return code of last command' 2016-06-17 14:08:58 +03:00