Commit graph

3499 commits

Author SHA1 Message Date
Anthony Scopatz
cf48f89752 another trial 2016-06-11 17:27:31 -04:00
Anthony Scopatz
52cb06e033 more changes 2016-06-11 17:24:31 -04:00
Anthony Scopatz
8e4ab188a7 more work 2016-06-11 17:21:01 -04:00
Anthony Scopatz
b406cfb8a6 first 2016-06-11 17:15:37 -04:00
Anthony Scopatz
8a92da66b1 some prep movements 2016-06-11 16:11:26 -04:00
adam j hartz
d4c9c3783e Merge pull request #1208 from tbekolay/typo-fix
Add missing word in text on xontrib
2016-06-11 13:25:43 -04:00
Trevor Bekolay
8a625a35ac Add missing word in text on xontrib 2016-06-11 13:11:13 -04:00
Anthony Scopatz
2b963271bf Merge pull request #1205 from mitnk/fix-pipe-with-aliased-cmd
fixed piped jobs including alias on OS X
2016-06-11 12:09:23 -04:00
Morten Enemark Lund
791d4aeefe Merge pull request #1145 from VHarisop/traceback_file
Added file option for XONSH_SHOW_TRACEBACK
2016-06-11 16:25:03 +02:00
VHarisop
ca37a9a41e
Minor formatting fixes 2016-06-11 14:27:39 +03:00
Hugo Wang
5d68d1cbd9 fixed piped jobs including alias on OS X 2016-06-11 18:18:06 +08:00
VHarisop
2541702672
Don't notify about logfile if traceback hasn't been set 2016-06-11 11:40:01 +03:00
adam j hartz
3046095961 docs 2016-06-11 01:53:11 -04:00
adam j hartz
78cb2206ba merge from master 2016-06-11 01:41:23 -04:00
adam j hartz
db39040b31 add tests for new callable list 2016-06-11 01:40:26 -04:00
adam j hartz
5a785dd4ca rename 'n' variable 2016-06-11 01:28:32 -04:00
Anthony Scopatz
aeb9ad54a7 Merge pull request #1165 from adqm/completer_squared
Tab Completion for `completer` Alias
2016-06-10 17:38:10 -04:00
Anthony Scopatz
417e935120 Merge pull request #1193 from adqm/cygwin_permission_error
Attempted fix for PermissionError and ProcessLookupError on Cygwin
2016-06-10 16:41:17 -04:00
adam j hartz
528a6a8683 merge from master 2016-06-10 16:00:12 -04:00
adam j hartz
c24c8fd38e Merge pull request #1199 from xonsh/bfix
Increment line numbers on transformation
2016-06-10 15:19:06 -04:00
adam j hartz
79fa0185f6 merge from master 2016-06-10 20:08:30 +01:00
adam j hartz
8e665439c0 update tests 2016-06-10 15:02:39 -04:00
adam j hartz
31f8a0cfc3 merge from master 2016-06-10 14:50:29 -04:00
adam j hartz
b11d77dad7 update changelog 2016-06-10 14:48:47 -04:00
adam j hartz
1d4c81274f changelog update 2016-06-10 14:48:02 -04:00
adam j hartz
f73d925324 remove bare alias option 2016-06-10 14:46:04 -04:00
adam j hartz
e2554f7544 Merge pull request #1202 from xonsh/fix_for_bash_wsl
Fix for bash wsl
2016-06-10 14:21:56 -04:00
JohnLunzer
301792fffd Merge branch 'master' of https://github.com/JohnLunzer/xonsh into history-all 2016-06-10 13:22:19 -04:00
JohnLunzer
ff1a463210 Initial changes supporting history-all 2016-06-10 13:14:43 -04:00
adam j hartz
9d1093c877 just catch everything 2016-06-10 18:04:06 +01:00
Morten Enemark Lund
7c9631f8d4 Forgot that CalledProcessError lives in subprocess namespace 2016-06-10 14:28:20 +02:00
Morten Enemark Lund
2c6b19d89b Add entry to CHANGELOG.rst 2016-06-10 14:16:40 +02:00
Morten Enemark Lund
08b38afcd2 Catch CalledProcessError which can happen if Bash from the Linux subsystem for Windows (WSL) is on the Path. 2016-06-10 14:15:07 +02:00
Morten Enemark Lund
7086c315af Merge pull request #1042 from willsALMANJ/check_jobs_on_exit
Check no stopped or background jobs exist before exiting interactive shell
2016-06-10 13:00:22 +02:00
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