Commit graph

3369 commits

Author SHA1 Message Date
Anthony Scopatz
2d7533af22 updates fom comunicating to users 2016-06-09 22:52:41 -04:00
Anthony Scopatz
d4c6a8054d branchg mods 2016-06-09 21:35:51 -04:00
adam j hartz
d038b4ba1d merge from eode:master into master 2016-06-09 21:33:09 -04:00
adam j hartz
aeb67a3ac0 small updates to tutorial 2016-06-09 21:32:34 -04:00
adam j hartz
966ec8e9e3 merge from master 2016-06-09 21:29:41 -04:00
Anthony Scopatz
3f03cfb729 Merge pull request #1192 from adqm/sigmask
Cygwin Fix
2016-06-09 21:11:37 -04:00
adam j hartz
8f6497fcb1 move comments around 2016-06-09 19:05:08 -04:00
adam j hartz
4467e94758 merge from master 2016-06-09 18:19:26 -04:00
Brian Visel
0e8ebc190c Move raising of XonshCalledProcessError into a separate method 2016-06-09 18:08:11 -04:00
adam j hartz
3984a0840e docs 2016-06-09 22:53:37 +01:00
adam j hartz
68afce0ff4 possible fix for xonsh backgrounding itself on cygwin 2016-06-09 22:52:17 +01:00
Jeremy Donahue
e5af234ee7 Updated changelog to reflect new fg() args 2016-06-09 09:23:23 -07:00
Brian Visel
c604613c44 Remove extraneous print call in tutorial example 2016-06-09 07:46:37 -04:00
Brian Visel
5fb5b0151c Update proc per better code from @scopatz, fix bad merge in tools.py 2016-06-09 07:38:02 -04:00
Brian Visel
008780544a Restore builtins lost during merge 2016-06-09 07:26:43 -04:00
Brian Visel
578abc4d02 Merged upstream code to sync pull request #1183 2016-06-09 06:15:50 -04:00
Brian Visel
d41f5f442a Remove XonshError as superclass for XonshCalledProcessError (bugfix) 2016-06-09 05:56:55 -04:00
Brian Visel
68914e021c Add captive command iteration to tutorial. 2016-06-09 05:12:21 -04:00
adam j hartz
e734fd84d8 merge from master 2016-06-09 03:19:24 -04:00
adam j hartz
04ab2bbef8 merge from master 2016-06-09 03:17:23 -04:00
Morten Enemark Lund
a7d45f6ea5 Merge pull request #1187 from adqm/nocompinscrpt
No completer in script
2016-06-09 09:02:33 +02:00
Anthony Scopatz
18c456e865 bumped vc branch timeout 2016-06-09 03:01:47 -04:00
Brian Visel
051e8e9a29 Updated changelog 2016-06-09 03:01:28 -04:00
Anthony Scopatz
e2c6a82ad9 fixed conflict 2016-06-09 02:58:44 -04:00
Brian Visel
397e6cb40c Use XonshCalledProcessError in CompletedCommand.__iter__ 2016-06-09 02:56:48 -04:00
Brian Visel
897afff4eb Added XonshCalledProcessError, that and XonshError now builtins 2016-06-09 02:54:20 -04:00
adam j hartz
e92f82098e merge from master 2016-06-09 02:52:31 -04:00
adam j hartz
85bc3588eb update changelog 2016-06-09 02:51:32 -04:00
adam j hartz
4953aca299 Merge branch 'nocompinscrpt' of https://github.com/adqm/xonsh into nocompinscrpt 2016-06-09 02:48:48 -04:00
Anthony Scopatz
cc0f7f3033 Merge pull request #1185 from mitnk/fix-prompt-and-title
Fix crash caused by malformed prompt or title
2016-06-09 02:45:42 -04:00
adam j hartz
722f34dc37 Merge pull request #1125 from xonsh/dist
Blocks Anonymous
2016-06-09 02:42:51 -04:00
Hugo Wang
9cb616d48f updated except 2016-06-09 06:17:27 +00:00
Anthony Scopatz
4f4270079c more 2016-06-09 01:55:34 -04:00
Brian Visel
24438d4715 Minimal changes for conformity, bugfix / py3.4 compat 2016-06-09 01:53:10 -04:00
Jeremy Donahue
e7db11c586 Fix PEP-8 styling 2016-06-08 22:45:59 -07:00
Anthony Scopatz
51518756da merge and fix conflict 2016-06-09 01:44:34 -04:00
Hugo Wang
af55ed4049 fix crash caused by prompt exceptions 2016-06-09 11:44:50 +08:00
adam j hartz
7be4156e7b Merge branch 'master' of https://github.com/eode/xonsh into eode-iter 2016-06-08 23:08:32 -04:00
Hugo Wang
6dc835a9fd fix crase caused by malformed prompt or title 2016-06-09 10:51:50 +08:00
Anthony Scopatz
cb1a3cb4f0 Merge pull request #1184 from mszu/patch-1
Fix typo in tutorial
2016-06-08 22:49:09 -04:00
Mark Szumowski
d408049705 Fix typo in tutorial 2016-06-09 12:47:07 +10:00
Jeremy Donahue
3a758887a5 Error handling for invalid deque access 2016-06-08 19:26:11 -07:00
Brian Visel
d7b0cbfb0f Added _CCTuple.executed_cmd for use with iter(!(command)) 2016-06-08 22:23:08 -04:00
Jeremy Donahue
a775b287db Update docker script reference to reflect its new name
docker.py was renamed to xonsh-in-docker.py, update the docs to reflect it.
2016-06-08 18:46:48 -07:00
Jeremy Donahue
cf2addad88 Include '+' and '-' position indicators in jobs list
Again, for BASHwards compatability.
2016-06-08 18:45:40 -07:00
Jeremy Donahue
4400a6f98a Implement '+' and '-' for fg
Implement '+' and '-' for fg for BASHwards compatability.
2016-06-08 18:43:39 -07:00
Brian Visel
91bf3a260b remove newlines from !(command) iteration, minor bugfix 2016-06-08 21:29:29 -04:00
adam j hartz
d36eb8066d Merge branch 'cryzed-feature-1169' 2016-06-08 20:25:08 -04:00
cryzed
0843818515 Fix small typo and add documentation for XONSH_SOURCE 2016-06-09 02:13:19 +02:00
adam j hartz
be54245ad3 merge from cryzed:fix-1173 into master 2016-06-08 20:09:08 -04:00