Commit Graph

687 Commits

Author SHA1 Message Date
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
nojhan
36659d81ee Merge pull request #91 from milouse/develop
Add support for Fossil SCM (the return)
2013-01-12 08:16:42 -08:00
nojhan
9df3105d0a Merge pull request #90 from LudovicRousseau/master
Fixes a warning: -bash: local: can only be used in a function
2013-01-12 08:16:18 -08:00
Étienne Deparis
7df52a3d53 Invert if order to speed up a bit the prompt display when parsing a fossil repository 2013-01-12 16:29:55 +01:00
Ludovic Rousseau
dedff1a222 Use a chroot() function
Fixes a warning:
-bash: local: can only be used in a function

A local variable can only be used inside a function.
The function is also unset after use.
2013-01-12 15:42:22 +01:00
Johann Dreo
1048cc7831 Escape configured sequences instead of bash ones ; bugfix: parse the whole prompt as a title ; LP_ENABLE_TITLE in the rc ; indent fixes 2013-01-11 14:18:24 +01:00
Johann Dreo
08666e4e31 Merge branch 'lp_as_title' of ssh://localhost:8480/nojhan/liquidprompt into lp_as_title 2013-01-11 10:23:34 +01:00
Johann Dreo
f34996baa6 Add an option to hide the logged user
LP_USER_ALWAYS=1 will display the user, even if he is the same than the logged one.
Defaults to 1 (always display the user), set to 0 if you want to hide the logged user (it will always display different users).
2013-01-11 10:15:12 +01:00
nojhan
11473777ca Replicate the prompt in the title
Add an explicit option to replicate the whole computed liquid prompt in the window's title.
(Works with a vanilla xterm, but not under xterm-256 for me)
2013-01-10 17:18:45 +01:00
François Schmidts
f078f1dc4b changing my mail 2013-01-10 11:58:28 +01:00
nojhan
9b4f27a938 Merge pull request #88 from dolmen/fix/git
More efficient git parsing (2)
2013-01-10 01:56:41 -08:00
François Schmidts
dfea80c397 optimisation : less operation 2013-01-10 10:56:13 +01:00
François Schmidts
977fca59fb adding comments and documentation 2013-01-10 10:22:58 +01:00
François Schmidts
73a804d05d no systematic setting of PROMPT_DIRTRIM 2013-01-10 10:12:35 +01:00
Olivier Mengué
d4f41d5a88 _lp_git_branch: faster (less external programs calls) 2013-01-09 18:41:32 +01:00
Olivier Mengué
e7cdc7f9fe git: fix variable leaks 2013-01-09 18:41:31 +01:00
François Schmidts
fd9e15c737 my way of shorting path was way slower than the one originally implemented
redoing the dirtrim feature though
2013-01-09 13:50:06 +01:00
François Schmidts
ea5d844819 more efficient path parsing
* no call to sed
* use of the "\w" for bash default value when path shorting is desactivated
2013-01-09 13:16:45 +01:00
nojhan
9685323d6a Merge pull request #87 from dolmen/fix/batt
Optimize _lp_battery: no sed
2013-01-09 00:03:21 -08:00
Olivier Mengué
17750477e4 Optimize _lp_battery: no sed 2013-01-09 00:50:03 +01:00
Étienne Deparis
2e8718f1d0 Changege the untracked behavior to the same as git. Fix branch display bug while browsing deep fossil repositories 2013-01-05 23:03:26 +01:00
Étienne Deparis
a10d18c1bf Re-add two auto-deleted line during cherry-picking 2013-01-05 21:16:25 +01:00