Commit graph

3395 commits

Author SHA1 Message Date
VHarisop
2541702672
Don't notify about logfile if traceback hasn't been set 2016-06-11 11:40:01 +03:00
VHarisop
b958cfa710
Fix conflict with master 2016-06-10 13:49:17 +03:00
VHarisop
ae83c035fb
Added default value for logfile, some pep8 fixes 2016-06-10 13:14:59 +03:00
Anthony Scopatz
d77d7cad24 Merge pull request #1197 from pelson/typo
Typo.
2016-06-10 00:46:31 -04:00
adam j hartz
724729a5fb Merge pull request #1166 from xonsh/vc
Version control branch info speedups
2016-06-10 00:40:36 -04:00
Phil Elson
64e8e2016f Typo. 2016-06-10 05:39:38 +01:00
Anthony Scopatz
9f9161eb47 nice 2016-06-09 23:50:35 -04:00
VHarisop
97ddecd58d
Added is_manually_set() method, mention 2016-06-10 05:57:31 +03:00
Anthony Scopatz
0a921d5db7 changelog 2016-06-09 22:54:50 -04:00
Anthony Scopatz
2d7533af22 updates fom comunicating to users 2016-06-09 22:52:41 -04:00
Gil Forsyth
fd41facdd6 Merge pull request #1167 from adqm/fuzzy_completions
Fuzzy Path Completion
2016-06-09 22:31:21 -04:00
VHarisop
b8820f1576
Made traceback logging to a file work independently 2016-06-10 05:24:37 +03:00
VHarisop
3aab92ded5
Added env.var to avoid ambiguity with traceback logging 2016-06-10 04:56:32 +03:00
adam j hartz
a98ad0f2f9 merge from master 2016-06-09 21:36:44 -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
adam j hartz
e9c40c7cb8 merge from master 2016-06-09 21:19:43 -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
adam j hartz
f5627047e8 merge from master 2016-06-09 02:56:10 -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