stonewareslord/lpr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
558 Commits 1 Branch 0 Tags 919 KiB
ee61cd3423
Commit Graph

558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonas Bengtsson
e8649fc440 git: Add support for detached head state 2013-03-12 20:47:52 +01:00
nojhan
f23bac5325 Merge pull request #111 from ldidry/108 
Issue #108 - Zsh:error in git dir if there is new files
 2013-03-12 12:44:08 -07:00
nojhan
0703a0ca19 Merge pull request #112 from ldidry/107 
Issue #107 - same error appears with LP_ENABLE_SSH_COLORS new feature
 2013-03-12 12:43:11 -07:00
Luc Didry
d8d7e28be3 Issue #107 - same error appears with LP_ENABLE_SSH_COLORS new feature 
Same problem as #107, same solution ;)
 2013-03-12 20:33:25 +01:00
Luc Didry
22cf1aaafb Issue #108 - Zsh:error in git dir if there is new files 
It was a problem with local declaration and assignation in the same
time. Don't ask me why zsh complains, but it did.
Also, I took the liberty to make a similar change en bzr part, just a
precaution.
 2013-03-12 20:15:13 +01:00
nojhan
0ee5944f79 Differents colors for differents hosts you SSH in 
Adds the LP_ENABLE_SSH_COLORS option to use a numeric hash of the hostname as the displayed color.
 2013-03-12 00:02:04 +01:00
nojhan
3d711323d5 Replace lptag by prompt_tag 
prompt_tag is more consistent with the other prompt_* functions.
 2013-03-11 23:05:10 +01:00
nojhan
9a1e779d11 bugfix #107: zsh-compatible if statement 
An if statement was used without the conditional operator: if [[ "" ]]
This patch adds one: if [[ ! -z "" ]]
Making the code zsh compatible.
 2013-03-11 22:26:49 +01:00
Johann Dreo
d4d5a9f1d1 Revert "avoid replacing "/home/user-alt" by "~-alt"" 
Doesn't work in home folder as $HOME and $PWD don't have any trailing "/".
This reverts commit 4a64c6ccec.
 2013-03-08 14:07:54 +01:00
Nicolas LACOURTE
c5e642a09f Add more generic test for screen/byobu/tmux title 2013-03-08 12:05:42 +01:00
Nicolas LACOURTE
834d3ddea9 Suppress double escape in screen title 2013-03-08 12:05:42 +01:00
Nicolas LACOURTE
2296081d01 Add case for screen title escape chars 2013-03-08 12:05:42 +01:00
nojhan
4a64c6ccec Bugfix: avoid replacing "/home/user-alt" by "~-alt" 
Add escaped backslashes so as to replace the "/home/user/" string in the path by "~/"
 2013-03-07 21:08:14 +01:00
nojhan
b55126e7d3 Display colored brackets in a term multiplexer 
A pair of square brackets, colored in blue if your current shell is running in a
terminal multiplexer (screen or tmux).
 2013-02-26 14:18:58 +01:00
nojhan
516f982f82 Merge branch 'develop' 2013-02-26 13:39:43 +01:00
nojhan
31caf8a72d Add the lptag function to add a prefix 
Note: the `lptag` function is  convenient way to add a prefix. You can thus add
a keyword to your different terminals:

    [:~/code/liquidprompt] develop ± lptag mycode
    mycode [:~/code/liquidprompt] develop ±
 2013-02-26 13:37:31 +01:00
nojhan
bcd7378f58 use escape h as hostname 2013-02-22 18:09:57 +01:00
nojhan
ccdef4bcaa bugfix: correct host display switch and corresponding unit tests 2013-02-20 10:20:42 +01:00
nojhan
38e23ff556 remove a useless escape in front of the tests print 2013-02-20 10:17:46 +01:00
nojhan
c88ebf656e Merge pull request #102 from jaesivsm/develop 
some fixes and optimization
 2013-02-05 04:08:49 -08:00
Johann Dreo
aa729f9775 Merge branch 'develop' of ssh://localhost:8480/nojhan/liquidprompt into develop 2013-01-31 10:14:36 +01:00
Johann Dreo
39c718a6b9 SVN prompt color to DIFF 
The SVN prompt counts the modified files, thus the color of the number should be LP_COLOR_DIFF instead of LP_COLOR_COMMITS
 2013-01-31 10:14:13 +01:00
François Schmidts
264c2c156f removing another useless NO_COL 2013-01-30 13:55:38 +01:00
nojhan
e9ab57ff89 bugfix #99: bad quotes around virtualenv name 2013-01-29 23:45:29 +01:00
nojhan
15c1991ce0 Merge branch 'develop' of github.com:nojhan/liquidprompt into develop 2013-01-29 23:36:37 +01:00
nojhan
8c9a41f234 Update the demo screenshot 2013-01-29 23:36:09 +01:00
François Schmidts
33dc6547d7 optimisation: use built-in time vars \t and %* 2013-01-25 13:17:05 +01:00
François Schmidts
5b247e3d82 it doesn't seem that LP_USER need to be defined at each prompt set 2013-01-25 12:20:19 +01:00
François Schmidts
102392f4e0 do not recalculate darwin kernel version at each prompt set 2013-01-25 12:06:48 +01:00
François Schmidts
6e2a35cafd cleaning: no useless color definition 
* no color definition in PS1 setting, if the functionnalitie is desactivated there is no need to define a color
* no NO_COL in the begining of functionnalitie output, the previous one is supposed to end with a clean color (NO_COL)
 2013-01-25 11:48:03 +01:00
nojhan
883901008b Merge pull request #98 from jaesivsm/feature/vcs 
Feature/vcs
 2013-01-24 02:08:27 -08:00
François Schmidts
254407cfa4 fixing regression : lost the smart mark in vars renaming 2013-01-24 09:42:53 +01:00
nojhan
537f7991df Merge branch 'master' of https://github.com/dloureiro/liquidprompt into develop 2013-01-23 19:49:16 +01:00
nojhan
5950e94733 Merge branch 'develop' of github.com:nojhan/liquidprompt into develop 2013-01-23 19:46:42 +01:00
David Loureiro
f8ab6280f2 Correction 'update_terminal_cwd error' on Mac OSX (Mountain) Lion systems 2013-01-23 19:00:26 +01:00
François Schmidts
9ca0b9d239 modification of the documentation concerning the LP_VCS 2013-01-23 18:26:21 +01:00
François Schmidts
115a1e554b do not recalculate some vars if the $PWD hasn't changed 
vars that will not be recalculated whithout path change :
* LP_VCS_TYPE : the type of repository we're in (git / svn / nothing
* / ...)
* LP_PWD : the (maybe shortened) path
* LP_MARK : the prompt mark which depend on the type of repository
* we're in
* LP_PERM : the color of the colon indicating the permission for the
* current directory
 2013-01-23 18:17:24 +01:00
François Schmidts
486a67aca1 refactorisation for fixes concerning issue 95/96 2013-01-23 16:07:17 +01:00
François Schmidts
31272e37ed issue #95: no double call to _lp.*branch() 
_lp_smart_mark is now called with an argument specifying if a CVS mark
is needed
noticeable execution speed improvement
 2013-01-23 15:44:42 +01:00
François Schmidts
163e1cf5f3 issue #96: a way to disable vcs depending on a list 
redoing
forked from the wrong branch and couldn't add support for bazar
 2013-01-23 13:36:29 +01:00
nojhan
226263ebaf Merge pull request #94 from cykl/develop 
Add Bazaar support
 2013-01-21 06:34:21 -08:00
Clément MATHIEU
bb7efa5bd8 Add Bazaar support 
The support is still quite limited:
  - green if not modified
  - red   if modified (shelved changes are currently considered as changes)
  - Current revno is displayed

TODO:
  - Since bzr is slow to start, refactor liquidprompt to not invoke bzr twice (smarttag and bzr_prompt)
  - Display not pushed changes
 2013-01-18 17:23:09 +01:00
nojhan
b776cd8e64 Display a yellow + if stashs 
Add a yellow + after the git infos, if there is at least one stash.
The * in case of untracked file is now red.
 2013-01-17 23:02:17 +01:00
nojhan
e2b51ef3da Merge branch 'master' of github.com:nojhan/liquidprompt 2013-01-17 21:44:36 +01:00
nojhan
8773806485 Note about PROMPT_COMMAND 2013-01-17 21:44:16 +01:00
Johann Dreo
1826cfa007 solve a remaining merge conflict in the readme 2013-01-17 11:29:55 +01:00
Johann Dreo
209f9765d7 Merge branch 'develop' 2013-01-16 15:49:01 +01:00
Johann Dreo
819c2c5ae2 manual merge 2013-01-16 15:47:47 +01:00
Johann Dreo
d26b97fd49 Merge branch 'master' of ssh://localhost:8480/nojhan/liquidprompt 2013-01-16 15:43:09 +01:00
nojhan
3aedf713f4 Merge pull request #89 from jaesivsm/feature/dirtrim 
Feature/dirtrim
 2013-01-12 08:36:00 -08:00