adam j hartz
faf861cefd
io bugfix
2015-05-21 05:42:01 -04:00
adam j hartz
1974f653c1
Merge branch 'rbrewer123-windows-git'
2015-05-20 22:52:23 -04:00
adam j hartz
ccf2352816
pep8 environ.py
2015-05-20 22:52:06 -04:00
adam j hartz
5f2c96a0a9
Merge branch 'feature-windows-git-prompt' of github.com:rbrewer123/xonsh into rbrewer123-windows-git
2015-05-20 22:34:12 -04:00
adam j hartz
d2a4e8906f
some io parser tests
2015-05-20 18:17:34 -04:00
adam j hartz
fb0949194e
set->frozenset
2015-05-20 17:43:38 -04:00
adam j hartz
1a76d47c66
io redirection docs
2015-05-20 16:18:45 -04:00
adam j hartz
9972fefe3e
pep8 in built_ins
2015-05-20 14:48:15 -04:00
adam j hartz
b05ae3a9f3
PEP8 in lexer
2015-05-20 14:47:25 -04:00
adam j hartz
844ddf342c
improving IO docs
2015-05-20 14:43:20 -04:00
adam j hartz
99ceb20e76
io redirection docs: take 1
2015-05-19 21:55:11 -04:00
adam j hartz
14cb4e0de0
small ioredirect tests
2015-05-19 18:05:49 -04:00
adam j hartz
6d18fdaf78
lexer bugfix
2015-05-19 18:00:46 -04:00
adam j hartz
51207f45c1
error reporting issue
2015-05-19 17:46:31 -04:00
adam j hartz
418d81355d
redirection to file descriptors
2015-05-19 17:37:06 -04:00
adam j hartz
2a3ac6a4bb
bugfix in lexer
2015-05-19 17:36:53 -04:00
adam j hartz
af36590ea0
major lexer refactor
2015-05-19 17:10:54 -04:00
adam j hartz
44348dfa19
some error reporting
2015-05-19 16:18:26 -04:00
adam j hartz
9024c1f9ee
need additional check for stderr = stdout
2015-05-19 16:05:33 -04:00
Michał Zając
9ae796e477
updated gitignore
2015-05-19 18:07:30 +02:00
Michał Zając
e25c99a454
stub of completion from manpages
2015-05-19 18:07:04 +02:00
adam j hartz
7a11bd1c77
Merge branch 'io' of github.com:wrywerytwreywery/xonsh into io
2015-05-19 09:59:48 -04:00
Anthony Scopatz
f3f9f0a8c2
Merge branch 'anula-history_tests'
2015-05-19 06:38:48 +03:00
adam j hartz
31cf10016e
Merge branch 'master' of github.com:scopatz/xonsh into io
2015-05-18 23:06:18 -04:00
anula
640c3991ab
Fix bugs in LimitedFileHistory (plus tests) and move it to different file.
...
* Move LimitedFileHistory from history.py to prompt_toolkit_history.py
because it is needed only for prompt_toolkit and requires prompt_toolkit.
* Add instalation of prompt_toolkit to .travis.yml
* Update docs hooks
2015-05-18 19:33:37 +02:00
Anthony Scopatz
402513db14
Merge branch 'rbrewer123-feature-windows-shebang'
2015-05-18 10:56:09 -05:00
Robert W. Brewer
3d920ec9fd
windows: use PATHEXT to find runnable files and skip shebang parsing
2015-05-17 23:14:43 -04:00
Robert W. Brewer
cb7256915a
windows: improve @ensure_git decorator
2015-05-17 21:45:33 -04:00
Robert W. Brewer
18104f15ff
Merge branch 'master' into feature-windows-git-prompt
2015-05-17 21:22:29 -04:00
adam j hartz
2be276299a
merge upstream changes
2015-05-17 17:56:00 -04:00
Anthony Scopatz
2afb966115
Merge branch 'wrywerytwreywery-shebang'
2015-05-17 16:31:05 -05:00
adam j hartz
5b34f267ef
fix for alias bug from #241
2015-05-17 17:26:42 -04:00
Adam Hartz
c07e806002
Merge pull request #239 from ngoldbaum/hg-prompt
...
Add prompt output for mercurial repository branches and bookmarks
2015-05-17 17:05:01 -04:00
Anthony Scopatz
49d268d973
Merge branch 'wrywerytwreywery-windows-shebang'
2015-05-17 15:58:26 -05:00
Anthony Scopatz
f7163b01b2
Merge branch 'windows-shebang' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-windows-shebang
2015-05-17 15:57:32 -05:00
Anthony Scopatz
96a89a9b01
Merge pull request #237 from rbrewer123/feature-windows-doc
...
windows: doc updates
2015-05-17 15:45:11 -05:00
adam j hartz
e0417f6a1f
another last_cmd bug
2015-05-17 16:15:41 -04:00
adam j hartz
fb5a070975
test to make sure everything in path is a valid directory
2015-05-17 14:51:51 -04:00
adam j hartz
68ea0b3c6f
windows shebang
2015-05-17 14:43:12 -04:00
adam j hartz
cee9de4795
windows shebang handling
2015-05-17 14:35:53 -04:00
adam j hartz
e6f0650b6c
base_shell needs os on Windows
2015-05-17 14:35:33 -04:00
Nathan Goldbaum
fdb1218649
Fix corner case in hg branch checking.
...
Newly created repositories don't have a branch file, so we infer by calling
the hg binary. This is slower but should still be pretty quick since it should
only happen in new repositories.
2015-05-17 00:25:46 -07:00
Nathan Goldbaum
4f29bf0ff2
Strip newline from hg id output
2015-05-16 22:54:30 -07:00
Nathan Goldbaum
b581e80f64
Avoid one call to hg by caching the path to the repository root
2015-05-16 22:45:56 -07:00
Nathan Goldbaum
bf9c02f2dc
Refactor mercurial prompt integration to call hg via a subprocess
2015-05-16 22:24:41 -07:00
adam j hartz
e6e82178c0
bugfixes with stdin and last_cmd
2015-05-16 23:58:07 -04:00
adam j hartz
62c837eefa
lexer state bugfix
2015-05-16 23:45:32 -04:00
adam j hartz
8f2070ba1f
io: almost there
2015-05-16 23:27:03 -04:00
adam j hartz
7010210c4e
fix bugs with lexer state
2015-05-16 23:26:52 -04:00
Nathan Goldbaum
c723cb9802
Merge branch 'master' of https://github.com/scopatz/xonsh into hg-prompt
...
Conflicts:
xonsh/environ.py
2015-05-16 19:08:13 -07:00