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

468 Commits

Author SHA1 Message Date
Olivier Mengué
48f435b8d4 WIP: add backend for wifi level 
Very early work in progress.
Need help to design the output. LP_MARK_WIFI?
 2013-12-06 00:38:51 +01:00
dryman
4111ffc493 Use LP_MARK_PREFIX="\n" to seperate the prompt into two lines 2013-12-06 00:08:16 +01:00
Olivier Mengué
8e2cc80a54 _lp_temp_*: get result through variable instead of stdout 2013-12-05 00:24:19 +01:00
Olivier Mengué
47d093dbe6 _lp_temp_acpi: handle multiple temperature sensors (multi CPU) 2013-12-05 00:13:57 +01:00
Olivier Mengué
f634a94418 Temperature/Linux: fetch using "acpi -t" 2013-12-05 00:00:38 +01:00
Olivier Mengué
34835335c7 screen: stricter matching in detached sessions counting 2013-12-04 23:38:20 +01:00
Yannack
8d090f584a Support for counting screen sessions with 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 also makes sure the
"Detached" word appears inside a parenthesis (so it's not an attached
screen to a machine called Detach for example).
 2013-12-04 23:32:21 +01:00
Olivier Mengué
c5b1c3d705 Fix tabs in source (fossil support) 2013-12-04 22:54:03 +01:00
Olivier Mengué
83266cd6a5 Fix spaces in source 2013-12-04 22:51:48 +01:00
Olivier Mengué
4840795bf7 Merge branch 'develop': post release fixes 2013-12-02 15:01:28 +01:00
polyphemus
50e91cd3e3 Fix use of non-exist variable 'count' 
Fixes shell error:
""bash: 46 / : syntax error: operand expected (error token is "/ ")
 2013-12-01 17:42:04 +01:00
Anthony Gelibert
9e5bb5c0d3 Add forgotten local declaration. 2013-12-01 17:39:56 +01:00
nojhan
8f149fd892 nojhan, original author and dolmen, maintener 2013-11-30 16:06:41 +01:00
Olivier Mengué
189a6fd71b Credit myself as co-maintainer 2013-11-28 00:08:47 +01:00
Anthony Gelibert
bdfe920d39 Typos in comments. 2013-11-28 00:06:45 +01:00
Anthony Gelibert
1c7defb11d Add myself in the authors. 2013-11-28 00:05:01 +01:00
Anthony Gelibert
b87e0c0f9f Corret LC_ALL setting in git branch. 2013-11-28 00:02:50 +01:00
Anthony Gelibert
da940677ee Correct a bug in git parsing. 2013-11-28 00:00:16 +01:00
Anthony Gelibert
141131502a zsh compat: separate variable declaration from first set 2013-11-27 23:56:05 +01:00
George Macon
02d6f3f376 Update mac-battery support to use pmset instead of ioreg 
pmset's output is much closer to the point.
 2013-11-27 12:32:25 +01:00
George Macon
d66cafb86a Enable battery on Mac OS X 
This uses ioreg to read the battery status.  This was tested on
Mac OS 10.8.3, but will probably work a few versions back as well.
 2013-11-27 12:32:25 +01:00
Ryan Wilson-Perkin
75afb57855 Fix #124: zsh magic of %~ with environment variables 
unset local variables that interfere with autonamedirs in oh-my-zsh
1) unset local variable p before use in zsh pwd truncation
2) prefix LP_OLD_PWD with "LP:" to avoid autonaming
 2013-11-26 23:27:57 +01:00
Taahir Ahmed
c7c57732a2 Fixed an error in _lp_upwards_find, and enhanced it slightly. 
_lp_upwards_find was using a single-quoted $@, not double-quoted, so
find was actually looking for files called '$@'.

In addition, once _lp_upwards_find finds the file it's looking for, it
breaks out so it doesn't need to always traverse to root.  I doubt
this actually saves much in practice, but it might as well be there.
 2013-11-26 09:08:33 +01:00
Taahir Ahmed
31a86c9327 Added "upwards find" tests for expensive dvcs. 
Mercurial and Bazaar are written in Python, which, on my system,
causes a noticeable hitch in the prompt generation when changing
directories.  I have added code that, before invoking the 'hg' or
'bzr' executables, first tests if we could possibly be in a bazaar or
hg repository checkout by traversing the directory structure upwards
to the root, looking for an '.hg' or '.bzr' folder.

At least for me, this makes the prompt instantaneous.  There may be
more elegant solutions to this problem, but this one works.
 2013-11-26 09:04:32 +01:00
Olivier Mengué
7fe87a5cf5 Revert fix applied on the wrong branch (lp_temp_sensors) 
Revert "Added null check for count in _lp_temp_sensors() to stop division by zero errors in case count is still zero."
Closes #214.
Thanks @jaesivsm

This reverts commit 9d96a82c80.

Conflicts:
	liquidprompt
 2013-11-25 23:12:43 +01:00
Olivier Mengué
6da1e9bc6a Fix a typo in variable name that makes a variable leak 
Closes #232.
 2013-11-25 22:45:36 +01:00
Olivier Mengué
bc4450e3ec _lp_git_branch: minor optimization 2013-08-20 20:09:26 +02:00
Olivier Mengué
aeb0a6afed Fix initialisation of _LP_RUNTIME_LAST_SECONDS 2013-08-01 08:23:42 +02:00
Olivier Mengué
bf8ef5b513 Bypass shell aliases on the 'git' command. Closes #213 2013-07-26 10:30:50 +02:00
nojhan
635285fbc4 Merge branch 'mainerror-master' into develop 
Conflicts:
	liquidprompt
 2013-07-07 15:25:56 +02:00
nojhan
0a161a6d3f Use the same convention for test as elsewhere in the code 2013-07-07 15:22:19 +02:00
nojhan
3a6798334d Merge branch 'runtime-squashed' of https://github.com/mrks/liquidprompt into mrks-runtime-squashed 2013-07-07 15:12:31 +02:00
nojhan
993979c213 Merge branch 'dxtr-openbsd' into develop 
Conflicts:
	liquidprompt
 2013-07-07 15:08:48 +02:00
Kim Lidström
2f2f79f9d6 Made _lp_cpu_load more consistent under OpenBSD 2013-07-01 14:01:16 +02:00
Kim Lidström
8624a4f6c6 Added OpenBSD support 2013-07-01 13:42:48 +02:00
Octavian Damiean
9d96a82c80 Added null check for count in _lp_temp_sensors() to stop division by zero errors in case count is still zero. 2013-06-30 22:04:00 +02:00
Markus Dreseler
f783e5f979 Changed expr to bash arithmetic expression 2013-06-24 11:57:20 +02:00
Markus Dreseler
b075b46c85 Added runtime displaying 2013-06-23 12:30:44 +02:00
nojhan
a39c2c8342 do not unset LP_OS, used in _llp_set_prompt (at runtime) 2013-06-19 21:24:55 +02:00
Olivier Mengué
e79a8707f0 FreeBSD, Darwin: _lp_cpu_load improvements 
FreeBSD: fixed _lp_cpu_load
Darwin: optimized _lp_cpu_load

Note that this change may break syntax coloring in Vim if Vim is not
configured to read the file as 'bash'. Workaround: create a symbolic
link with a '.bash' extension and open that file.
 2013-06-17 21:09:43 +02:00
Olivier Mengué
46db8c53c9 Fix mark for root 
I broke it in cf2ff289c8.
Thanks to François Schmidts who immediately noticed the bug and produced
a patch (but that I choose to not apply).
Closes #201.
 2013-06-13 02:32:20 +02:00
Olivier Mengué
78176780e0 Optimize _lp_smart_mark more: case .. esac 
Use a 'case..esac' in _lp_smart_mark.
 2013-06-13 02:26:40 +02:00
Olivier Mengué
0381fb68e0 Optimize _lp_smart_mark 
Remove one _LP_SHELL_zsh test from runtime.
Introduce _LP_MARK_SYMBOL.
 2013-06-13 02:13:17 +02:00
Olivier Mengué
c1f04183c3 Cleanup _lp_connection once done with it 2013-06-13 00:31:56 +02:00
Olivier Mengué
a7dd161877 Inline LP_PROXY building 2013-06-13 00:25:39 +02:00
Olivier Mengué
c65beba85c Color map: zsh fixes 2013-06-12 15:21:11 +02:00
Olivier Mengué
f610ed4f2b Add LP_DEBUG_TIME for bash: if 1 shows PS1 build time 
Doesn't work on zsh: looks like 'time' doesn't output anything if
applied to a shell function. Need a zsh expert.
 2013-06-12 15:13:33 +02:00
Olivier Mengué
cf2ff289c8 Root: huge optimisation (and security feature) for VCS directories 
If under root user, for VCS directories we do not collect anymore the
VCS status information. Before it was collected (even if
LP_ENABLE_VCS_ROOT=0, which is the default) but just not displayed.
This is a huge optimisation for VCS directories, and also a security
feature, as our shell code is absolutely not resistant to specially
crafted VCS content.
 2013-06-11 22:54:44 +02:00
Olivier Mengué
aad57e8497 Move common code to 2 branches of an 'if' out of it 
Still optimizing EUID...
 2013-06-11 22:37:14 +02:00
Olivier Mengué
cc839487ec Optimize as $EUID can't change during the shell life 
$EUID will not change during the shell life. So we can optimize color
selection at liquidprompt startup instead of testing multiple times
every time the prompt is shown.
Optimizes LP_MARK and LP_PWD.
 2013-06-11 22:34:36 +02:00
Olivier Mengué
a31d37edad smart mark: lowercase variable for code style consistency 2013-06-11 22:14:26 +02:00
Olivier Mengué
91f5409c43 Rename variable _lp_temp_function to _LP_TEMP_FUNCTION for consistency 2013-06-11 22:06:20 +02:00
Olivier Mengué
aa5e3f3591 _lp_temperature: fix variable leak 2013-06-11 22:00:48 +02:00
Olivier Mengué
3b246ecae3 Simplify color map lookup 
Thanks to François Schmidts (jaesisvm) for the previous work.
 2013-06-11 21:03:10 +02:00
François Schmidts
7b631646a3 the _lp_color_map will use a scale system 
and not a step one
 2013-06-11 20:24:07 +02:00
François Schmidts
d104b275a1 _lp_color_map is now able to adjust to different scales 
Given a second parameters, _lp_color_map is now able to display
different colors depending on a scale. The second parameter is the
lowest step on the scale and ten times it the highest.
 2013-06-11 20:23:54 +02:00
François Schmidts
43c7016c34 _lp_temp_sensors : a better use of sed 
closes #189
 2013-06-10 09:58:29 +02:00
Nicolas Pouillard
ebd3ef9bc1 More quotes to improve Zsh compatibility 
This commit changes most of the occurrences of
  x=$(cmd)
into
  x="$(cmd)"

When cmd is returning multiple words or lines Zsh interprets
them as an array. Putting those quotes ensures we get a single
string with spaces inside.
 2013-06-02 12:14:58 +02:00
Nicolas Pouillard
37d0777b74 Fix compatibility with Zsh arrays 
* Zsh arrays starts at 1
* Zsh arrays have to be declared before being assigned
 2013-06-02 11:03:58 +02:00
François Schmidts
6104394764 fixes the parsing of git --shortstat 
now the parsing work either there is only deletion or only insertions or both
 2013-05-28 00:34:35 +02:00
François Schmidts
430d9bf6b9 light bug in "git diff --shortstat" parsing 
the string substitution assumed "insertions" was always plural, but git
actually takes care of suffixing insertion with an "s" only if there is
more than one insertion
 2013-05-26 19:57:03 +02:00
Olivier Mengué
ab56219df1 Merge git, git-svn in case..esac 2013-05-23 00:23:56 +02:00
Olivier Mengué
ad3a979614 Optimize LP_ERR: inline _lp_return_value 2013-05-22 23:56:50 +02:00
Olivier Mengué
56cef06883 Optimize _lp_svn_branch 2013-05-22 23:42:55 +02:00
nojhan
73599b07e9 Merge pull request #187 from jaesivsm/enhance/temp 
Enhance/temp
 2013-05-22 12:02:43 -07:00
nojhan
6ef3fd0c9d Merge pull request #186 from milouse/develop 
Display changes in fossil repository the same way as for git
 2013-05-22 11:54:05 -07:00
nojhan
e10595144a Merge pull request #183 from dolmen/optimize/git 
More Git optimizations
 2013-05-22 11:39:32 -07:00
nojhan
9867090c66 Merge pull request #182 from dolmen/fix/lp_escape-usage 
Fix redundant (and slow): echo $(_lp_escape ...)
 2013-05-22 11:38:33 -07:00
nojhan
71466d8636 Merge pull request #181 from dolmen/optimize/_lp_are_vcs_disabled 
Optimize _lp_are_vcs_disabled
 2013-05-22 11:38:07 -07:00
François Schmidts
2f7cd163cd _lp_temp_sensors will now return the hottest temp 
* the average may hide temp that are significantly higher than the other temps
* _lp_temp_sensors will also now use more values to calculate system temperature
 2013-05-20 18:39:50 +02:00
François Schmidts
4c369bc458 fixes #185 2013-05-20 18:14:20 +02:00
Étienne Deparis
7ffd524d6e Fix doc regarding the last change in fossil repository management 2013-05-20 16:47:31 +02:00
É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