Commit graph

5132 commits

Author SHA1 Message Date
Morten Enemark Lund
a6efcf2dad Merge pull request #1671 from xonsh/consist
Macro Consistency
2016-09-03 07:08:07 +02:00
BlahGeek
8bb74a11ff Merge branch 'master' into xontrib-gitstatus 2016-09-03 13:00:17 +08:00
BlahGeek
a30639fe08 move gitstatus xontrib to prompt/ 2016-09-03 13:00:04 +08:00
BlahGeek
78bfee18c0 move prompts from environ.py to prompt/ 2016-09-03 12:55:52 +08:00
BlahGeek
cbcaace4b3 flake8 fix, load env every call 2016-09-03 11:14:36 +08:00
Konstantinos Tsakiltzidis
419b35da89 Merge pull request #1668 from blahgeek/fix-ptk-completer
Better completer display in prompt-toolkit
2016-09-03 05:30:15 +03:00
BlahGeek
04442df7d7 flake8 fix 2016-09-03 10:20:47 +08:00
Konstantinos Tsakiltzidis
8b19858b44 Merge pull request #1672 from xonsh/timo
Stop nightly timeouts
2016-09-03 04:44:51 +03:00
Anthony Scopatz
1c139047d6 some stuff 2016-09-02 19:57:25 -04:00
Anthony Scopatz
2e775ae98a remove test parser table creation 2016-09-02 19:51:48 -04:00
Anthony Scopatz
37f86d0a84 consist news 2016-09-02 19:32:48 -04:00
Anthony Scopatz
ed9f9ea041 consistenty with macro args 2016-09-02 19:30:39 -04:00
Bob Hyman
cd7b9c7e66 fix for #1667, cd <singleCharacter> fails 2016-09-02 13:51:35 -04:00
BlahGeek
fc58f8fa22 split completions on comma 2016-09-03 01:26:27 +08:00
BlahGeek
09e290a45f fix stash count 2016-09-03 01:14:11 +08:00
BlahGeek
f21726440c fix staged count 2016-09-03 01:10:01 +08:00
BlahGeek
0c569b9ac9 new xontrib: gitstatus 2016-09-03 01:04:53 +08:00
BlahGeek
53856ca493 add changelog 2016-09-02 23:58:39 +08:00
BlahGeek
379cbd37c5 better display of ptk completer 2016-09-02 23:56:42 +08:00
Konstantinos Tsakiltzidis
e0185dd2be Merge pull request #1654 from xonsh/mcont
Context Manager Macros
2016-09-02 17:03:39 +03:00
Konstantinos Tsakiltzidis
513691c2c5 Merge pull request #1665 from xonsh/code_clean_lazy_locate_binary
Code clean up of lazy_locate_binary()
2016-09-02 16:59:37 +03:00
Anthony Scopatz
1391c34358 Merge pull request #1664 from laerus/histtut
history tutorial and a bug fix
2016-09-02 09:50:04 -04:00
Anthony Scopatz
6a32442ac9 macro typos 2016-09-02 09:38:17 -04:00
Morten Enemark Lund
22f86f69ee Code clean up of lazy_locate_binary() 2016-09-02 13:36:10 +02:00
Konstantinos Tsakiltzidis
d672567e16 fix rst 2016-09-02 13:40:19 +03:00
laerus
c2b7e50d45 history tutorial and a bug fix 2016-09-02 13:33:45 +03:00
Anthony Scopatz
725055c3ea Merge pull request #1662 from blahgeek/fix-bash-completion
fix completion of paths starting with '~'
2016-09-01 23:52:24 -04:00
BlahGeek
a26d0aaacb fix completion of paths starting with '~' 2016-09-02 11:11:33 +08:00
Anthony Scopatz
f79e7f6844 Merge pull request #1637 from blahgeek/fix-bash-completion
More enhancement on bash completion
2016-09-01 23:07:48 -04:00
Anthony Scopatz
4f1cc49e37 resolved news conflict 2016-09-01 20:10:29 -04:00
Anthony Scopatz
e1384d65bc minor fixes to changelog 2016-09-01 20:06:59 -04:00
Anthony Scopatz
e10c38decc version bump to 0.4.6 2016-09-01 19:48:09 -04:00
Anthony Scopatz
991104dd30 Merge pull request #1658 from bobhy/misc_fix
Misc fix - support subprocess running from different drive letter than PWD (on windows)
2016-09-01 19:44:01 -04:00
Anthony Scopatz
6052a36531 Merge pull request #1657 from xonsh/fix_win_tests
Fix win tests
2016-09-01 19:39:36 -04:00
Anthony Scopatz
48ff3d3754 fixed conflict 2016-09-01 19:33:01 -04:00
Morten Enemark Lund
f1dab1a853 pep8 2016-09-01 12:47:35 +02:00
Morten Enemark Lund
bf10c20804 Merge pull request #1653 from xonsh/msubnest
Nested subporcess macros
2016-09-01 12:07:03 +02:00
Morten Enemark Lund
f8c8c519a3 Simplify code a bit 2016-09-01 12:03:55 +02:00
Morten Enemark Lund
b162552d6d Add news entry 2016-09-01 11:57:18 +02:00
Morten Enemark Lund
87ec9e4c07 Disables win_unicode_console in tests if it is installed.
The packages collides with the pytest output capture and causes some tests to error.
2016-09-01 11:54:45 +02:00
Morten Enemark Lund
20032ecaa5 Skip dirstack_unc tests if drive letters are already used by windows 2016-09-01 08:53:45 +02:00
Morten Enemark Lund
05064a222d Merge pull request #1410 from bobhy/winuncpushd
Winuncpushd
2016-09-01 08:51:22 +02:00
Morten Enemark Lund
e671c72f1f Merge pull request #1608 from bobhy/track_wd
Track working directory changes in invoked commands
2016-09-01 08:47:09 +02:00
Anthony Scopatz
ceba93ef4a minor doc fixes 2016-09-01 00:10:21 -04:00
Anthony Scopatz
3eb4bab802 Merge pull request #1656 from xonsh/pr-params
Pr params
2016-08-31 23:37:30 -04:00
Anthony Scopatz
6774bcfca2 Merge branch 'pr-params' of https://github.com/rbignon/xonsh into rbignon-pr-params 2016-08-31 23:28:47 -04:00
Bob Hyman
d9bb2088c0 cleanup for PR 2016-08-31 21:24:38 -04:00
Bob Hyman
33c68e3757 Merge branch 'master' into track_wd 2016-08-31 21:21:25 -04:00
Bob Hyman
a1c22e66a3 cleanup for PR 2016-08-31 21:20:14 -04:00
Bob Hyman
416dfa9ad4 Merge branch 'master' into misc_fix 2016-08-31 21:16:08 -04:00