Commit Graph

470 Commits

Author SHA1 Message Date
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
Étienne Deparis
10863427e5 Add special color when current repository has no tag. 2013-01-05 21:05:42 +01:00
Étienne Deparis
35c865af8a Add the number of impacted files in fossil repository 2013-01-05 21:05:17 +01:00
Étienne Deparis
5f497a619c Align liquid.theme with liquidprompt after first cherry pick 2013-01-05 21:04:56 +01:00
Étienne Deparis
a1891ddf5d Add support for fossil scm
Conflicts:
	liquidprompt
2013-01-05 21:02:59 +01:00
nojhan
947781bac9 Default prefix put a classical prompt as title
Update the doc and themes accordingly
2013-01-04 14:08:26 +01:00
nojhan
af43ec0eac Merge branch 'ps1-prefix' of https://github.com/dr4Ke/liquidprompt into develop 2013-01-04 13:54:48 +01:00
Christophe Drevet
07e177ef70 added a CUSTOMIZING THE PROMPT section 2013-01-04 13:08:36 +01:00
Christophe Drevet
db313ba89e LP_PS1_PREFIX used to add arbitrary prompt before anything else 2013-01-04 13:01:06 +01:00
Christophe Drevet
a50b988f59 LP_ENABLE_VCS_ROOT to enable use of VCS features with root 2013-01-04 12:13:00 +01:00
Christophe Drevet
d6c5f3ca0f don't process VCS function if root
they do not appear in the result anyway, and they can be quite slow
2013-01-04 12:08:06 +01:00
nojhan
1bf7fd93a5 Merge branch 'fix_git_basename' of https://github.com/dr4Ke/liquidprompt into develop
Conflicts:
	liquidprompt
2013-01-04 11:24:49 +01:00
nojhan
0ac4e6b4f9 Merge branch 'master' of https://github.com/jorisv/liquidprompt into develop 2013-01-04 11:21:51 +01:00
nojhan
4fd5a07b05 Merge pull request #79 from jorisv/master
No line return in a git repository
2013-01-04 02:20:53 -08:00
nojhan
0375431bf2 fix issue #74 by adding an example bashrc 2013-01-04 11:16:44 +01:00
nojhan
45cdcdba0a move virtual env function in the path section, move the display from the front to the path section of the prompt, inside brackets, add flepied as an author, update the readme 2013-01-03 16:44:15 +01:00
nojhan
cb598c1cb8 Merge branch 'master' of https://github.com/flepied/liquidprompt into develop 2013-01-03 16:30:06 +01:00
Joris Vaillant
f70548525a Fix a bug in line jump in git directory. 2012-12-06 14:22:43 +01:00