Étienne Deparis
f1aa5676a0
Display modifications in fossil repository as for git (by line and not by file)
2013-05-20 16:29:13 +02:00
Olivier Mengué
efd235ab52
Optimize _lp_are_vcs_disabled (renamed to _are_vcs_enabled)
...
Use return code for the boolean return value instead of inefficient
usage of string values.
2013-05-16 22:31:34 +02:00
Olivier Mengué
46dbc6157f
Fix redundant (and slow): echo $(_lp_escape ...)
...
_lp_escape is: print "%q" "$*"
So echo $(_lp_escape ...) is a slow synonym for _lp_escape
Not all the usage cases are fixed in this commit. The remaining ones are
fixed in other patches with more global optimizations.
2013-05-16 19:41:25 +02:00
Olivier Mengué
e4626c4e0f
_lp_git_branch: optimize code paths
2013-05-16 19:12:42 +02:00
Olivier Mengué
0c1e66d12a
git: optimize changed lines extraction
...
- use "git diff --shortstat" to replace 3 different calls to "git diff"
- drop usage of awk
2013-05-15 00:36:02 +02:00
Olivier Mengué
6b6e511387
git: litle optimisation (do not concat $end everywhere)
2013-05-15 00:28:32 +02:00
Olivier Mengué
e7ae332fc8
Optimize _lp_load_color
2013-05-14 22:16:26 +02:00
Olivier Mengué
ea1c897aef
_lp_color_map: rename 'load' to 'value'
2013-05-14 22:16:26 +02:00
Olivier Mengué
43511f6f15
_lp_color_map: use dichotomy to more evenly distribute cost
2013-05-14 22:16:26 +02:00
Olivier Mengué
b50970f634
Optimize _lp_color_map using arithmetic comparisons
2013-05-14 22:16:25 +02:00
Olivier Mengué
b3ca6fcdaa
Fix _lp_battery return value when LP_ENABLE_BATT != 1
2013-05-14 22:16:25 +02:00
nojhan
1e9036eb57
Merge branch 'fix/IFS' of http://github.com/dolmen/liquidprompt into develop
2013-05-14 15:35:32 +02:00
nojhan
e08e278a7c
Merge branch 'fix/_lp_bzr_color' of http://github.com/mainerror/liquidprompt into develop
2013-05-14 15:33:40 +02:00
nojhan
136da693bb
Merge branch 'devel' of http://github.com/Cougar/liquidprompt into develop
...
Conflicts:
liquidprompt
2013-05-14 15:14:36 +02:00
Olivier Mengué
64c6b7c0f9
Restore LP_ERR as the first instruction of _lp_set_prompt
2013-05-14 09:08:54 +02:00
Olivier Mengué
cf8b8b29bb
Local IFS reset to our expected standard value
...
Revert 289782f350
(broken patch from issue #133 ) and really fix #132 .
2013-05-14 00:36:38 +02:00
Octavian Damiean
8423e9c8a4
Fixed issue #162 . Added programm exit value check to _lp_bzr_branch_color to return in case the current directory is not a Bazaar directory.
2013-05-11 01:15:11 +02:00
Cougar
57af36a028
fixing issue #171
...
Fixes situation when HOME=/root and /any/other/dir/root
will be replaced with /any/other/dir~
2013-05-06 14:02:21 +03:00
nojhan
a963743bbb
Merge pull request #155 from jaesivsm/fix/git-rev-list
...
fix for issue #151 "bug in _lp_git_branch_color"
2013-05-05 12:02:36 -07:00
nojhan
197714ff19
Merge pull request #169 from jaesivsm/issue/159
...
a fix for issue #159
2013-05-05 12:02:10 -07:00
nojhan
fca791a06f
Merge pull request #167 from dolmen/optimize/shell-checks
...
Optimize bash/zsh checks
2013-05-05 11:51:21 -07:00
Olivier Mengué
cc6c0e8d20
s/if [[ ! -z /if [[ -n /
2013-05-05 00:36:33 +02:00
Olivier Mengué
81bc91d4dc
Optimize _lp_sl/sr/sb
2013-05-05 00:34:03 +02:00
Olivier Mengué
b424c62ba8
Optimize bash/zsh checks
...
Avoid string comparisons. Use instead true/false builtins.
So:
if [[ $_LP_WORKING_SHELL == bash ]]
becomes:
if $_LP_SHELL_bash
2013-05-05 00:16:37 +02:00
Olivier Mengué
7e01b1648c
_lp_time: fix wrong usage of 'echo -e'
2013-05-04 22:58:12 +02:00
Olivier Mengué
4148a3d9a2
_lp_time_analog: optimize and fix variable leaks
2013-05-04 22:50:49 +02:00
nojhan
56f4883d8b
Merge branch 'fix/multiplexer-brackets' of https://github.com/dolmen/liquidprompt into develop
...
Conflicts:
liquidprompt
2013-05-04 17:06:11 +02:00
nojhan
91501581a5
Merge branch 'optimize/shorten_path' of https://github.com/dolmen/liquidprompt into develop
...
Conflicts:
liquidprompt
2013-05-04 16:54:00 +02:00
nojhan
7e47557fe0
Merge branch 'zshshortenpathfix' of https://github.com/nullpuppy/liquidprompt into develop
2013-05-04 16:50:14 +02:00
nojhan
1b2211072e
Merge branch 'master' of https://github.com/youngking/liquidprompt into develop
2013-05-04 16:46:13 +02:00
nojhan
5bafff5c3a
Move the temperature before the jobs, with other sensors
2013-05-04 16:41:07 +02:00
nojhan
de4c7ea8d2
More the temperature mark before the colored value
...
Because the θ character may be confused with a 0, which was less readable.
2013-05-04 16:38:55 +02:00
nojhan
6ce373114a
Merge branch 'feature/temp' of https://github.com/jaesivsm/liquidprompt into jaesivsm-feature/temp
...
Add the temperature threshold in the RC file
Conflicts:
liquidpromptrc-dist
2013-05-04 16:30:45 +02:00
nojhan
de78b8288e
Merge branch 'optimize-http_proxy' of https://github.com/dolmen/liquidprompt into develop
2013-05-04 16:21:47 +02:00
nojhan
293c3d637f
bugfix: do not increase the bracket colors when sourcing
2013-05-04 16:04:51 +02:00
Olivier Mengué
2aaf7bb002
Major fix for brackets in terminal multiplexer
...
Optimize terminal multiplexer detection by moving it to the initial
loading instead of at each prompt display: the terminal multiplexer is
always a parent process and that can not change during the shell life.
This also fixes a major leak: LP_MARK_BRACKET_OPEN was growing at each
prompt display when running in a terminal multiplexer.
(check with: echo "$LP_MARK_BRACKET_OP" | od -c )
2013-05-04 15:15:26 +02:00
Olivier Mengué
9daaaa9f4f
Optimize _lp_in_multiplexer
...
Use the return code of the function to return the value instead of
stdout.
2013-05-04 15:07:51 +02:00
Olivier Mengué
bfeaffdc3b
Optimize _lp_shorten_path by using bash/zsh features
...
Optimizations:
- move variable declaration in blocks where they will be used
(so they are not computed in blocks where they are not used)
- "local -i" for integer variables
- if [[ $(( ... )) -gt $(( ... )) ]] ==> if (( ... > ... ))
- i=$((i+1)) ==> let i++
As a side effect the readability of the code is improved.
2013-05-04 14:41:38 +02:00
François Schmidts
32b7bc04e5
fixing a bug in the execution of git rev-list
2013-05-04 13:55:07 +02:00
François Schmidts
75c346feb4
add commentaries and a selection process for temperature source
...
* add a function selection process at loading time so liquidprompt can use other command than sensors to get temperature
* add commentaries
2013-05-04 09:58:37 +02:00
Olivier Mengué
a3afd42ca9
Fix credits
2013-05-03 23:44:27 +02:00
Olivier Mengué
5ead985c8a
Optimize _lp_proxy
2013-05-03 23:42:26 +02:00
nojhan
f9e9be43aa
Update the doc about the postfix, add an author.
2013-05-03 21:06:08 +02:00
nojhan
e76781d617
Merge https://github.com/f4hy/liquidprompt into develop
2013-05-03 20:59:58 +02:00
François Schmidts
55df57508f
propsing a fix for issue #159
2013-04-30 14:03:37 +02:00
Dustin Knie
3773188b4f
Use print -P instead of echo for printing %~.
2013-04-29 21:04:53 -07:00
YoungKing
ccde12c406
make LP_TITLE works under macos
2013-04-29 00:10:08 +08:00
François Schmidts
e35c90318e
prevent the feature from breaking systems that can't run the "sensors" command
2013-04-22 23:32:50 +02:00
François Schmidts
43e426d0e8
add configuration options and temperature mark
2013-04-22 23:22:32 +02:00
Brendan Fahy
4f0a1c9af6
added LP_PS1_POSTFIX
2013-04-22 15:16:56 -04:00
nojhan
554c155afb
Merge branch 'git-untracked-dir' of https://github.com/jab416171/liquidprompt into develop
2013-04-22 20:35:35 +02:00
Joseph Bass
0c57f27bba
Only show the branch specifier if the current directory is part of a git repo
2013-04-22 11:41:08 -06:00
nojhan
d367976932
Add a special mark when in a disabled VCS repository
...
This adds the LP_MARK_DISABLED (default: "⌀"), used as a prompt mark
when in disabled repositories (see `LP_DISABLED_VCS_PATH`).
2013-04-22 19:16:31 +02:00
Daniel Miranda
ccd417584a
Cygwin lack of 'o' option for ps shows error messages on every prompt
...
Cygwin doesn't support the 'o' option for ps (version: ps (cygwin) 1.7.17), which causes errors to show on every prompt
displayed. A simple fix is redirecting stderr to /dev/nullin liquidprompt/liquidprompt (it might actually be a good idea
to do the same for other commands, since any kind of undesired output makes the prompt pretty much blow up).
2013-04-22 18:17:01 +02:00
nojhan
f4815f07f0
Merge branch 'master' of https://github.com/cyli/liquidprompt into develop
2013-04-22 18:14:59 +02:00
nojhan
322d4e846d
Merge branch 'logged-in-user-fix' of https://github.com/jab416171/liquidprompt into develop
2013-04-22 18:13:11 +02:00
nojhan
16d4014a2e
bugfix analog time with a correct and faster implementation
2013-04-22 00:07:45 +02:00
cyli
ffa3e894bc
Allow setting the color on the virtualenv display
2013-04-21 14:17:30 -07:00
Joseph Bass
9c95ac472e
Fixing an issue where logname might not return the right value, but
...
$LOGNAME does
2013-04-21 11:02:42 -06:00
François Schmidts
454dfddd44
implementing a temp monitoring solution
2013-04-21 16:16:06 +02:00
nojhan
f483697fda
Merge branch 'develop' of github.com:nojhan/liquidprompt into develop
2013-04-20 21:53:09 +02:00
nojhan
91959b636a
Add an analog clock
...
Using `LP_TIME_ANALOG`, you can now display an analog clock instead of
numeric values. The analog clock is "accurate" to the nearest half hour.
2013-04-20 21:51:55 +02:00
nojhan
86fc212656
Merge pull request #136 from jaesivsm/issue/135
...
Issue/135 — default prompt mark
2013-04-19 08:55:07 -07:00
François Schmidts
2b9d9c7aae
implementing default prompt mark
...
as described in issue #135
2013-04-17 14:12:17 +02:00
François Schmidts
289782f350
fixing issue #132
...
forcing a certain value for IFS in _lp_load_color
2013-04-12 14:46:17 +02:00
nojhan
42af71d3f1
Merge branch 'master' of https://github.com/alexprengere/liquidprompt into develop
2013-04-11 21:32:19 +02:00
Alex
ca41823cdb
Update mail for contributor in comments
2013-04-10 00:55:24 +02:00
Étienne Deparis
4a25d9d236
Fix bug in fossil branch management
2013-03-25 20:57:46 +01:00
nojhan
256191c11b
Merge branch 'develop'
2013-03-25 20:14:24 +01:00
Luc Didry
a1db31b7e3
Fix bad regex for submodule from #118
...
The regex in bash and zsh doesn't need to be quoted. It resulted a
bad regex warning in zsh (#127 ) and it didn't worked in submodule.
Plus, bash and zsh regexes have perlish syntax.
2013-03-25 19:40:04 +01:00
Jean-Sebastien Leroy
9e53b9a0a7
Add shortened path mark user configuration
2013-03-21 21:22:20 +01:00
Johann Dreo
0b0398015b
bugfix: display git-svn branches
2013-03-20 14:02:09 +01:00
Johann Dreo
ff58dac980
Merge branch 'develop' of github.com:nojhan/liquidprompt into develop
2013-03-20 13:59:11 +01:00
Johann Dreo
79e51ded84
Use a double mark for git-svn repos
...
If the current git repository is a git-svn one (if it has a .git/svn
directory), use ±‡ as a prompt instead of just ±.
2013-03-20 13:56:44 +01:00
nojhan
59ac71a2b9
Merge pull request #120 from augmentedfourth/sucheck
...
Handle remote sessions that have changed user
2013-03-16 00:52:44 -07:00
nojhan
3fc566b3a3
Merge pull request #123 from polyphemus/tmux
...
tmux sessions support
2013-03-15 12:11:33 -07:00
nojhan
d1c7c9d394
Merge pull request #121 from ldidry/115
...
Resolving Issue #115
2013-03-15 12:06:00 -07:00
polyphemus
ecfdc47a8d
Only match detached tmux sessions, not all.
2013-03-14 22:58:27 +01:00
polyphemus
9221d0916c
tmux support. Cleanup of _lp_jobcount_color. Adds number of screens sessions and number of tmux sessions as a total of detached sessions.
2013-03-14 22:41:09 +01:00
Brad Beyenhof
fc5da29acb
Handle remote sessions that have changed user
...
Previously, if you were connected via SSH but had changed user with
su/sudo, the _lp_connection function would report you as being connected
via telnet. Now, if the parent process of your shell is 'su' or 'sudo',
it sets the hostname to the color LP_COLOR_SU (default: bold yellow).
This is probably only useful for people who have installed liquidprompt
in a global location and run it with a globally-accessible shell config
(/etc/profile or similar). But since there's already code to handle a
current user of 'root', I assume this has already happened.
2013-03-14 10:15:55 -07:00
Luc Didry
9b9191823f
Resolving Issue #115
2013-03-14 08:33:21 +01:00
Nicolas LACOURTE
ac92772061
No title for linux console
2013-03-13 23:37:43 +01:00
Nicolas LACOURTE
8b17356596
Add git submodule support
2013-03-13 23:36:15 +01:00
nojhan
4f036f1f0c
Merge branch 'master' of https://github.com/LeStef/liquidprompt into develop
2013-03-13 23:01:19 +01:00
nojhan
2869cbaeb4
Test SVN root + temporary remove of result escape
...
Now use a direct echo instead of an escaped string, should be fixed.
2013-03-13 22:49:23 +01:00
Stéphane Pajot
a00944c490
Add some Mercurial informations : nb of lines inserted, deleted and nb of changes to commit
2013-03-13 18:31:26 +01:00
nojhan
8beba7babe
Handle cases where git has no upstream with default locals
2013-03-13 16:09:46 +01:00
nojhan
92bd933905
Escape strings that may comes from remote sources
...
Use printf "%q" to escape branch names.
2013-03-13 15:58:56 +01:00
nojhan
b7ffd46f9b
Add LP_PERCENTS_ALWAYS, can hide numeric values
...
Do you want to display the percentages of load/batteries along with their
corresponding marks? Set to 0 to only print the colored marks.
Defaults to 1 (display percentages)
2013-03-13 12:30:41 +01:00
nojhan
5aa1484f05
More authors, sorted
2013-03-13 12:14:48 +01:00
nojhan
bb992127ee
bugfix: do not try to source if there is no file
2013-03-12 22:14:09 +01:00
nojhan
036847f5b3
Merge branch 'master' into develop
...
Conflicts:
liquidprompt
2013-03-12 21:59:06 +01:00
nojhan
3aee03d3bb
Merge branch 'ps1' of https://github.com/ldidry/liquidprompt into develop
2013-03-12 21:50:07 +01:00
nojhan
38b041de06
Merge branch 'fix-git-integration' of https://github.com/jonasb/liquidprompt into develop
2013-03-12 21:43:35 +01:00
Luc Didry
48743da6e3
Fix custom.ps1 sourcing
2013-03-12 21:02:28 +01:00
Jonas Bengtsson
6da70cc63d
git: check the correct remote branch for has_commit
...
Previously it was always checking against origin/$branch, but the
remote branch can have any name and the remote branch can also have
any name.
2013-03-12 20:51:22 +01:00
Jonas Bengtsson
e8649fc440
git: Add support for detached head state
2013-03-12 20:47:52 +01: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
ccdef4bcaa
bugfix: correct host display switch and corresponding unit tests
2013-02-20 10:20:42 +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
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
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
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
Johann Dreo
819c2c5ae2
manual merge
2013-01-16 15:47:47 +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
É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
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
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
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
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
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
Christophe Drevet
337c473f6a
fix git in a directory containing spaces
2012-12-06 13:38:37 +01:00
Frederic Lepied
0a6d4960f3
added support for python virtualenv
2012-11-03 22:09:50 +01:00
nojhan
452ef223ce
Better default host colorscheme
...
Add two color for the X11 support, green (support) and yellow (no support, not
set in red, because it is not a critical warning). The bold cyan of the hostname
was to close to the green of the colon and the @, change it to blue.
2012-09-25 21:13:08 +02:00
nojhan
5794c3aeac
Feature: blue @ when connected with X11 support
...
If the current connection supports X (if we are in a X session or if we have
enabled X11 forwarding under ssh), the @ displayed in front of the hostname
is colored in blue (use LP_COLOR_X11 to change the color).
2012-09-23 23:07:51 +02:00
nojhan
0efdd9da71
clean chroot patch: add chroot for every connexions, modern test, local variabls
2012-09-09 22:43:10 +02:00
nojhan
23f31f952e
Merge branch 'master' of https://github.com/LudovicRousseau/liquidprompt into develop
2012-09-09 22:32:32 +02:00
nojhan
7e4feadb0e
manual merge
2012-09-09 22:25:02 +02:00
Ludovic Rousseau
d870fc4742
Remove extra new line in case of SVN directory
...
Without the patch my prompt is (on 3 lines):
[rousseau:~/Documents/sc/nfc/libnfc]
svn ‡
With the patch my prompt is (on 1 line only):
[rousseau:~/Documents/sc/nfc/libnfc] svn ‡
This is because expr(1) adds a new line at the end of the result.
2012-09-08 15:59:05 +02:00
Ludovic Rousseau
b78882a944
Merge remote branch 'upstream/master'
2012-09-07 17:45:06 +02:00
nojhan
871c38096d
bugfix: consider every X screen as a local connection, not only the first one
2012-09-05 19:44:53 +02:00
nojhan
4ca0203a28
Merge branch 'develop'
2012-09-05 19:39:46 +02:00
Ludovic Rousseau
fe4f98349e
Add support of /etc/debian_chroot
...
Debian uses the file /etc/debian_chroot to give a name to a chroot.
The default /etc/bash.bashrc contains:
if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
debian_chroot=$(cat /etc/debian_chroot)
fi
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
2012-08-27 11:45:04 +02:00
Luc Didry
109a4e08f8
Fixed #63 -- Better fix, and fixed a path repetition problem.
...
Fix little error
2012-08-24 14:09:18 +02:00
Luc Didry
fbaac8fa8e
Fixed #63 -- Better fix, and fixed a path repetition problem.
2012-08-24 13:54:43 +02:00
Ludovic Rousseau
b9e020cb19
Fix Darwnin _lp_cpu_load()
...
With the previous code I get an error before each prompt:
-bash: $/dev/fd/62: No such file or directory
Maybe the same code can't be used for both Darwnin and FreeBSD.
I reuse the code removed in 2a833475bc
2012-08-21 23:49:55 +02:00
Ludovic Rousseau
5ebf982ceb
Update comment for Colors declarations
...
Make it more explicit that the default case is not only for Linux but
also for SunOS and Darwin.
Darwin case can not be merged with FreeBSD.
2012-08-21 23:39:46 +02:00
Ludovic Rousseau
8192ed9a84
Darwin is NOT FreeBSD
...
The Colors declarations for Darwin should use the Linux method and NOT
the FreeBSD method or you get errors:
tput: unknown terminfo capability 'AF'
2012-08-21 23:35:14 +02:00
nojhan
1ca2808ffd
Merge https://github.com/flepied/liquidprompt
2012-08-21 23:01:01 +02:00
nojhan
4b5d703c73
manual merge
2012-08-21 22:39:07 +02:00
nojhan
bf9b895392
Merge branch 'refactor/terminfo-sh' of https://github.com/dolmen/liquidprompt into develop
2012-08-21 22:35:57 +02:00
nojhan
e0b1c14ff0
Merge pull request #65 from LudovicRousseau/master
...
Use BOLD instead of BOLD_WHITE as default color for PATH
2012-08-21 13:21:50 -07:00
nojhan
9a87c5b4d5
bugfix #63 : echo path in quotes to avoid problems with spaces
2012-08-21 22:17:37 +02:00
nojhan
2817abd914
do not search the .svn directory (subversion 1.7 compatibility)
2012-08-21 22:03:42 +02:00
nojhan
fc89cbc136
Merge pull request #58 from dolmen/fix/optimize-SCM
...
Optimizations for Subversion and Mercurial
2012-08-21 13:00:28 -07:00
Ludovic Rousseau
a86be2e435
Merge remote-tracking branch 'upstream/master'
2012-08-21 14:01:34 +02:00
Ludovic Rousseau
bd5fab3d29
Set LP_COLOR_MARK default to BOLD no color
...
Same reason as for 2a483f9430
2012-08-21 13:58:35 +02:00
Ludovic Rousseau
2a483f9430
Set LP_COLOR_PATH default to BOLD no color
...
The previous value was BOLD_WHITE but it does not work for black on
white terminal.
Using BOLD instead should work on any configuration.
2012-08-21 17:03:35 +02:00
Olivier Mengué
65b44cd64f
More comments
2012-08-21 12:13:06 +02:00
Olivier Mengué
c9f85763a6
Unset _lp_source_config once done
2012-08-21 08:21:41 +02:00
Olivier Mengué
f8b2194fa2
Cleanup _lp_source_config: remove _lp_ prefix from locals
...
Now that color definition utilities (_lp_ti_*) variables and functions
are "local" we do not fear to override someting defined by the user.
So just rename to shorter and cleaner names without the _lp_ prefix.
2012-08-21 07:54:54 +02:00
Olivier Mengué
c0d023b4ad
More comments
2012-08-21 07:51:40 +02:00
Olivier Mengué
a673a2e9fd
Refactor config loading: step 6
...
Move the 'local' keyword in front of where each color variable
is defined, for safer maintenance.
2012-08-21 07:40:02 +02:00
Olivier Mengué
92384caac9
Refactor config loading: step 5 (indent)
...
Just indenting lines in _lp_source_config after the move.
2012-08-21 07:22:21 +02:00
Olivier Mengué
5ee2b74f10
Refactor config loading: step 4
...
Move colors definitions inside _lp_source_config.
(The important part of the diff is that the beginning of the
_lp_source_config function is moving up).
2012-08-21 07:17:10 +02:00
Olivier Mengué
35cc6109fd
Refactor config loading: step 3 (indent)
...
Indent (separate commit just for readability of the step).
2012-08-21 07:07:34 +02:00
Olivier Mengué
29c5d217c7
Refactor config loading: step 2
...
Default settings are now set inside the _lp_source_config function
2012-08-21 07:06:02 +02:00