Commit Graph

662 Commits

Author SHA1 Message Date
Panayiotis Kkolos
98cbca4786 Fix mark prefix
Now the prompt mark can be at the beginning
of a new line without a space before it.

Conflicts:
	liquidprompt
2014-06-28 01:18:13 +02:00
Panayiotis Kkolos
7e7734e624 Count merge commits in git when checking differences with tracking remote branch 2014-06-28 00:36:54 +02:00
Olivier Mengué
0e0cc870c2 Simplifiy git working tree detection
Thanks to @pkkolos (Panayiotis Kkolos <pkkolos@gmail.com>) for the inspiration.
63e1b8229b
2014-06-28 00:29:16 +02:00
Panayiotis Kkolos
4572bd02fa Fix *BSD support for terminal colours 2014-06-28 00:17:51 +02:00
Panayiotis Kkolos
81b080e2a6 Fix LP_OLD_PROMPT_COMMAND to work with zsh 2014-06-28 00:07:22 +02:00
Panayiotis Kkolos
b4939868ce Synchronize rc, theme, and ps1 files with main file 2014-06-28 00:07:01 +02:00
Panayiotis Kkolos
cbba559340 Simplify chroot detection code 2014-06-27 23:11:11 +02:00
Olivier Mengué
82425e51b0 More _lp_jobcount_color refactoring 2014-06-27 22:00:36 +02:00
Olivier Mengué
07d18d4ca3 Fix #304: _lp_jobcount_color() when is tmux not installed
Refactor _lp_jobcount_color() to avoid running either 'screen' or 'tmux'
if they are not installed.
2014-06-27 21:49:44 +02:00
Olivier Mengué
50a3867819 Add utility function _lp_bool
_lp_bool converts a return code (default to $?) into a "true"/"false"
value.
2014-06-27 19:54:00 +02:00
Linus Wallgren
5813a710fc Simplified unwanted tilde expansion handling
The idea comes from https://github.com/edkolev/promptline.vim/pull/11
2014-06-10 18:07:39 +02:00
Olivier Mengué
dc7be2540d From #291: fix $TERM check
Thanks to Daniel Serodio (@dserodio) for the catch.
2014-05-30 22:40:01 +02:00
nzwulfin
cc1be7e29d Enable support for Software Collections
Fedora, RHEL, and CentOS provide support for multiple versions of
the same software components using Software Collections.  This
patch lists the active collections in a similar manner to Python
virtualenvs.
2014-05-30 22:30:55 +02:00
Linus Wallgren
db25aedffe Handle bug in bash 4.2 with tilde expansion
Pattern substituion in bash 4.2 was faulty, which caused tilde to not be
expanded in certain cases. This behaviour was previously relied on, now
we are only using that behaviour as a fallback on bash 4.2.

This resolves issue #289
2014-05-30 22:29:12 +02:00
Brett McBride
5425a5eb56 SVN: Support for paths that are not branches or trunk
Also fallback to displaying the repo's root name in the case where the
repo path is none of tags/branches/trunk
2014-04-05 13:22:53 +02:00
Cosmin L. Neagu
e9279856c4 add vcsh support (#148) 2014-04-05 13:15:30 +02:00
alexbel
5cc46c68d8 Fix incorrect detection of tmux output if tmux is not installed 2014-04-05 13:10:36 +02:00
Olivier Mengué
465d008ebd Merge branch 'refactor/fossil' into develop
Close #274
https://github.com/nojhan/liquidprompt/pull/274
2014-03-28 17:16:02 +01:00
Olivier Mengué
c71abe49a5 Fossil: use internal diff (fossil diff -i)
Thanks to @sekiroh for the tip...
2014-02-20 21:35:57 +01:00
Olivier Mengué
f24a41d911 Fix tabs 2014-02-20 21:09:42 +01:00
Olivier Mengué
f48f56ab30 Fossil support: more cleanup 2014-02-14 18:28:54 +01:00
Étienne Deparis
9f0c0e6d47 Fossil MARK_UNTRACKED is now colorized as for git or hg support 2014-02-14 18:18:18 +01:00
Étienne Deparis
e2b3ad6313 Forgot one _lp_escape 2014-02-14 18:18:18 +01:00
Étienne Deparis
edb4cb1dce Replace over use of grep/cut with sed or awk, globally reduce number of fossil call 2014-02-14 18:18:18 +01:00
Olivier Mengué
fc5e045d34 RUNTIME: minor optimization 2014-02-14 18:17:34 +01:00
Anthony Gelibert
73a42ba856 Correct the analog hour calculation.
"date %I" returns a number between 1 and 12 and we want 12 to be 0.
2014-01-31 21:39:00 +01:00
Olivier Mengué
2e9cfa2e3c "hg outgoing" is slow, so diabled. closes #217 2014-01-24 22:24:16 +01:00
Olivier Mengué
782fad08fd Save IFS at startup to restore it in _lp_set_prompt
We already restore IFS to its default value. This patch only changes the
way it is done to avoid a call to 'echo' in a sub-shell at runtime.
Fixes #267.
2014-01-22 22:56:48 +01:00
François Schmidts
89540d3125 replacing replacing "git status" option "--short" by "--porcelain"
The behavior of porcelain seems more adapted to the liquidprompt usage

From the "git status" documentation :

The porcelain format is similar to the short format, but is guaranteed
not to change in a backwards-incompatible way between git versions or
based on user configuration. This makes it ideal for parsing by scripts.
The description of the short format above also describes the porcelain
format, with a few exceptions:

1. The user’s color.status configuration is not respected;
   color will always be off.
[...]
2014-01-22 16:48:26 +01:00
François Schmidts
6c012c28d6 fixing the untracked flag being always up 2014-01-22 16:47:58 +01:00
Anthony Gelibert
f6a9bdeee9 has_commit is an integer. 2014-01-22 09:42:51 +01:00
Anthony Gelibert
b5830cdf28 Reduce the verbosity of git calls. 2014-01-22 09:42:33 +01:00
Anthony Gelibert
a61e382bb2 Replace "pmset -g batt" parsing. 2014-01-22 09:38:30 +01:00
Anthony Gelibert
3f1df58ae5 Respect the _lp_battery API. 2014-01-22 09:38:08 +01:00
Anthony Gelibert
10121e3d13 Rename misnamed local variable. 2014-01-22 09:34:46 +01:00
Anthony Gelibert
c9bdefe020 Quote $LP_MARK_DEFAULT to avoid problem with space. 2014-01-22 09:32:26 +01:00
Olivier Mengué
dd9a024b48 Merge branch 'refactor/hg-cleanup' into develop
Cleanup _lp_hg_branch_color implementation for improved speed.
2014-01-19 20:18:14 +01:00
Olivier Mengué
a201e152f7 hg: remove usage of tail+awk in favor of sed 2014-01-19 19:56:00 +01:00
Olivier Mengué
8df6cffef7 hg: minor code layout 2014-01-19 16:03:28 +01:00
Olivier Mengué
6bfa957689 hg: improve speed of check for uncommitted stuff 2014-01-19 16:02:26 +01:00
Olivier Mengué
4955326aa5 hg: refactor outgoing commits counting
Rename variable 'has_commit' to 'commits' and declare it as integer.
2014-01-19 15:15:52 +01:00
Olivier Mengué
35e39d8b50 hg: improve untracked files detection (speed) 2014-01-19 15:05:30 +01:00
Olivier Mengué
7f54e6dee7 CONTRIBUTING: more policies 2014-01-19 11:03:23 +01:00
yannack
5f8fcc46ea Support for counting screen sessions running with extra parameters
In some cases (multi user enabled in screen for example), the count of
detached screen sessions was incorrect. The command to locate these has
been improved using a more tolerant regex, which does not require
'detached' to be the first word inside the parenthesis.

To test, open a new screen session, add multiuser (type Ctrl+A, then
':', then multiuser on), then detach (Ctrl+A, Ctrl+D), and see that
liquidprompt detects the screen, as would "screen -list".
2014-01-19 10:35:52 +01:00
Frédéric Mahé
aed833058f Consistent style for loops (while and for) 2014-01-19 10:08:38 +01:00
Frédéric Mahé
df26c49ff9 Use $() instead of ticks 2014-01-19 10:08:37 +01:00
Frédéric Mahé
83a2215163 Use a redirection to avoid a call to cut (second) 2014-01-19 10:08:37 +01:00
Frédéric Mahé
74778659ae Use a redirection to avoid a call to cut 2014-01-19 10:08:37 +01:00
Frédéric Mahé
549f820e9d Use less wc calls
Use grep -c to avoid a call to wc
2014-01-19 10:08:37 +01:00
Frédéric Mahé
1808f69405 Use builtins when possible
a call to cat can be replaced by a redirection.
2014-01-19 10:08:37 +01:00