Commit graph

3515 commits

Author SHA1 Message Date
VHarisop
b958cfa710
Fix conflict with master 2016-06-10 13:49:17 +03:00
Will S
d94233ba0f Rephrase reminder for force quitting xonsh 2016-06-10 06:39:58 -04:00
Will S
4ba1098153 Make ctrl+D exit prompt_toolkit without extra newlines or text 2016-06-10 06:39:58 -04:00
Will S
570c1104d9 Make jobs() call signature match command template 2016-06-10 06:39:58 -04:00
Will S
363a3f34d0 "unfinished" denotes both stopped and background jobs and makes the code simpler 2016-06-10 06:39:58 -04:00
Will S
18120522f8 Kill jobs when exit is attempted twice rather than prompting on first exit 2016-06-10 06:39:58 -04:00
Will S
25731b5cd1 Change stopped jobs on exit prompt text 2016-06-10 06:35:18 -04:00
Will S
7851d4a7d2 Show more information about running jobs on exit and offer to kill them 2016-06-10 06:35:18 -04:00
Will S
dbc1fb9544 Check no stopped or background jobs exist before exiting interactive shell 2016-06-10 06:35:18 -04:00
VHarisop
ae83c035fb
Added default value for logfile, some pep8 fixes 2016-06-10 13:14:59 +03:00
Anthony Scopatz
2e2e39a540 increment line numbers on transformation 2016-06-10 02:50:56 -04: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
adam j hartz
e8c10ddc75 fix timing issue 2016-06-09 23:52:53 -04:00
adam j hartz
f70e715337 fix parser error 2016-06-09 23:52:46 -04:00
Anthony Scopatz
9f9161eb47 nice 2016-06-09 23:50:35 -04:00
adam j hartz
daaab24c29 changelog 2016-06-09 23:39:44 -04:00
adam j hartz
c72b6f0905 allow functions to be escaped with @(), allowing anonymous aliases 2016-06-09 23:37:59 -04:00
adam j hartz
f79fb24846 enable running aliases without adding them to the aliases mapping 2016-06-09 23:00:45 -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
adam j hartz
8b2f8e0a2a changelog fixes 2016-06-09 22:29:05 -04:00
adam j hartz
5c6e7857ac attempted fix for PermissionError and ProcessLookupError on Cygwin 2016-06-09 22:24:47 -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
283144fcc9 merge from master 2016-06-09 21:38:37 -04: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
b841e0b775 merge from master 2016-06-09 03:35:06 -04:00
adam j hartz
e734fd84d8 merge from master 2016-06-09 03:19:24 -04:00