mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-12-18 21:41:57 +00:00
wip
This commit is contained in:
romkatv
parent
00bc22e194
commit
1858bbdd20
8 changed files with 1363 additions and 203 deletions
84
README.md
84
README.md
|
|
@ -11,13 +11,10 @@ shell like it's 80's again!
|
|||
Powerlevel10k uses the same configuration options as Powerlevel9k and produces the
|
||||
same results. It's simply faster. There is no catch.
|
||||
|
||||
If you are on Linux or WSL, enable [gitstatus](https://github.com/romkatv/gitstatus)
|
||||
plugin for additional performance improvement in the vcs/prompt segment.
|
||||
|
||||
## Table of Contents
|
||||
|
||||
1. [Installation and configuration](#installation-and-configuration)
|
||||
2. [Try it in Docker](#try-it-in-docker)
|
||||
2. [Try it out](#try-it-out)
|
||||
3. [How fast is it?](#how-fast-is-it)
|
||||
4. [What's the catch?](#whats-the-catch)
|
||||
|
||||
|
|
@ -32,19 +29,53 @@ you restart zsh, your prompt will be faster. No configuration changes are needed
|
|||
Manual installation:
|
||||
|
||||
```zsh
|
||||
git clone https://github.com/romkatv/gitstatus.git ~/gitstatus
|
||||
git clone https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k
|
||||
echo 'source ~/gitstatus/gitstatus.plugin.zsh' >>! ~/.zshrc
|
||||
echo 'source ~/powerlevel10k/powerlevel10k.zsh-theme' >>! ~/.zshrc
|
||||
```
|
||||
|
||||
**Do not load both Powerlevel9k and Powerlevel10k themes at the same time. Variable name clashes
|
||||
will cause mayhem. You can source either one or the other. Consider Powerlevel10k a patched fork
|
||||
of Powerlevel9k, which it is.**
|
||||
Make sure to disable your current theme.
|
||||
|
||||
## Try it in Docker
|
||||
## Try it out
|
||||
|
||||
Try Powerlevel10k in Docker without making any changes to your system.
|
||||
Try Powerlevel10k without making any changes to your setup. If you like it, see
|
||||
[Installation and configuration](#installation-and-configuration) for how to make a permanent
|
||||
switch.
|
||||
|
||||
### For existing Powerlevel9k users
|
||||
|
||||
If you are currently using Powerlevel9k, you can try Powerlevel10k in a temporary zsh shell. The
|
||||
prompt will look exactly like what you are used to but it'll be faster.
|
||||
|
||||
```zsh
|
||||
git clone https://github.com/romkatv/powerlevel10k.git /tmp/powerlevel10k
|
||||
source /tmp/powerlevel10k/powerlevel10k.zsh-theme
|
||||
```
|
||||
|
||||
When you are done playing, `rm -rf /tmp/powerlevel10k` and exit zsh.
|
||||
|
||||
### For new users
|
||||
|
||||
```zsh
|
||||
git clone https://github.com/romkatv/powerlevel10k.git /tmp/powerlevel10k
|
||||
echo "
|
||||
# Your prompt configuration goes here.
|
||||
POWERLEVEL9K_PROMPT_ON_NEWLINE=true
|
||||
POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(root_indicator dir_writable dir vcs)
|
||||
POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status command_execution_time background_jobs time)
|
||||
source ~/powerlevel10k/powerlevel10k.zsh-theme" >/tmp/powerlevel10k/.zshrc
|
||||
ZDOTDIR=/tmp/powerlevel10k zsh
|
||||
```
|
||||
|
||||
When you are done playing, `rm -rf /tmp/powerlevel10k` and exit zsh.
|
||||
|
||||
```zsh
|
||||
git clone https://github.com/romkatv/powerlevel10k.git /tmp/powerlevel10k
|
||||
source /tmp/powerlevel10k/powerlevel10k.zsh-theme
|
||||
```
|
||||
|
||||
### Docker playground (Linux only)
|
||||
|
||||
You can try Powerlevel10k in Docker. Once you exit zsh, the image is deleted.
|
||||
|
||||
```zsh
|
||||
docker run -e LANG=C.UTF-8 -e LC_ALL=C.UTF-8 -e TERM=$TERM -it --rm ubuntu bash -c '
|
||||
|
|
@ -52,44 +83,21 @@ docker run -e LANG=C.UTF-8 -e LC_ALL=C.UTF-8 -e TERM=$TERM -it --rm ubuntu bash
|
|||
apt update
|
||||
apt install -y zsh git
|
||||
cd
|
||||
git clone https://github.com/romkatv/gitstatus.git
|
||||
git clone https://github.com/romkatv/powerlevel10k.git
|
||||
echo "
|
||||
# Your prompt configuration goes here.
|
||||
POWERLEVEL9K_PROMPT_ON_NEWLINE=true
|
||||
POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(root_indicator dir_writable dir vcs)
|
||||
POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status command_execution_time background_jobs time)
|
||||
source ~/gitstatus/gitstatus.plugin.zsh
|
||||
source ~/powerlevel10k/powerlevel10k.zsh-theme" >~/.zshrc
|
||||
cd powerlevel10k
|
||||
zsh -i'
|
||||
```
|
||||
|
||||
Compare prompt responsiveness to Powerlevel9k.
|
||||
|
||||
```zsh
|
||||
docker run -e LANG=C.UTF-8 -e LC_ALL=C.UTF-8 -e TERM=$TERM -it --rm ubuntu bash -c '
|
||||
set -uex
|
||||
apt update
|
||||
apt install -y zsh git
|
||||
cd
|
||||
git clone https://github.com/bhilburn/powerlevel9k.git
|
||||
echo "
|
||||
# Your prompt configuration goes here.
|
||||
POWERLEVEL9K_PROMPT_ON_NEWLINE=true
|
||||
POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(root_indicator dir_writable dir vcs)
|
||||
POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status command_execution_time background_jobs time)
|
||||
source ~/powerlevel9k/powerlevel9k.zsh-theme" >~/.zshrc
|
||||
cd powerlevel9k
|
||||
zsh -i'
|
||||
```
|
||||
|
||||
## How fast is it?
|
||||
|
||||
Powerlevel10k with [gitstatus](https://github.com/romkatv/gitstatus) renders prompt about
|
||||
10 times faster than powerlevel9k/master (stable version) and about 5 times faster than
|
||||
powerlevel9k/next (beta version). Powerlevel10k is faster than Powerlevel9k even without
|
||||
[gitstatus](https://github.com/romkatv/gitstatus) but the difference isn't as dramatic.
|
||||
Powerlevel10k renders prompt about 10 times faster than powerlevel9k/master (stable version) and
|
||||
about 5 times faster than powerlevel9k/next (beta version).
|
||||
|
||||
Here are benchmark results obtained with
|
||||
[zsh-prompt-benchmark](https://github.com/romkatv/zsh-prompt-benchmark) on Intel i9-7900X
|
||||
|
|
@ -97,10 +105,10 @@ running Ubuntu 18.04.
|
|||
|
||||
| Theme | / | ~/testrepo | ~/nerd-fonts | ~/linux |
|
||||
|----------------------------------|----------:|-----------:|-------------:|-----------:|
|
||||
| powerlevel9k/master | 135 ms | 207 ms | 234 ms | 326 ms |
|
||||
| powerlevel9k/master | 135 ms | 207 ms | 234 ms | 338 ms |
|
||||
| powerlevel9k/next | 47 ms | 101 ms | 122 ms | 213 ms |
|
||||
| powerlevel10k | 24 ms | 82 ms | 104 ms | 197 ms |
|
||||
| **powerlevel10k with gitstatus** | **9 ms** | **11 ms** | **27 ms** | **71 ms** |
|
||||
| **powerlevel10k with gitstatus** | **2 ms** | **5 ms** | **6 ms** | **126 ms** |
|
||||
| naked zsh | 1 ms | 1 ms | 1 ms | 1 ms |
|
||||
|
||||
Columns define the current directory where the prompt was rendered.
|
||||
|
|
|
|||
674
gitstatus/LICENSE
Normal file
674
gitstatus/LICENSE
Normal file
|
|
@ -0,0 +1,674 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||
119
gitstatus/README.md
Normal file
119
gitstatus/README.md
Normal file
|
|
@ -0,0 +1,119 @@
|
|||
# gitstatus
|
||||
**gitstatus** enables much faster vcs/git prompt in
|
||||
[Powerlevel10k](https://github.com/romkatv/powerlevel10k) ZSH theme. It works on Mac OS, Linux, FreeBSD and WSL. See [benchmarks](https://github.com/romkatv/powerlevel10k#how-fast-is-it).
|
||||
|
||||
## Installation
|
||||
|
||||
1. Install [Powerlevel10k](https://github.com/romkatv/powerlevel10k) ZSH theme.
|
||||
|
||||
2. If you use WSL (even occasionally), it's a good idea to define this option in your `.zshrc`:
|
||||
|
||||
```zsh
|
||||
# When running on WSL, do not scan dirty files in git repos with over 4k files.
|
||||
[[ $(</proc/version) =~ Microsoft ]] && GITSTATUS_DIRTY_MAX_INDEX_SIZE=4096
|
||||
```
|
||||
|
||||
With this option gitstatus won't be looking for dirty (unstaged and untracked) files in git repos with over 4k files. Scanning such repos is incredibly slow on WSL! The prompt will indicate with color that there _might_ be dirty files. With default color settings it means the prompt will never be green.
|
||||
|
||||
The option must be set before sourcing gitstatus.
|
||||
|
||||
3. Clone gitstatus repo.
|
||||
|
||||
```zsh
|
||||
# Assuming oh-my-zsh at the standard location. Adjust to your circumstances.
|
||||
git clone https://github.com/romkatv/gitstatus.git ~/.oh-my-zsh/custom/plugins/gitstatus
|
||||
```
|
||||
|
||||
4. Either manually source `gitstatus.plugin.zsh` from your `.zshrc` or enable `gitstatus` plugin in oh-my-zsh.
|
||||
|
||||
## How it works
|
||||
|
||||
When using common tools such as [vcs_info](http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#vcs_005finfo-Quickstart) to embed git status in shell prompt, latency is high for three main reasons:
|
||||
|
||||
1. About a dozen processes are created to generate each prompt. Creating processes and pipes to communicate with them is expensive.
|
||||
2. There is a lot of redundancy between different `git` commands that are invoked. For example, every command has to scan parent directories in search of `.git`. Many commands have to resolve HEAD. Several have to read index.
|
||||
3. There is redundancy between consecutive prompts, too. Even if you stay within the same repo, each prompt will read git index form disk before it can be rendered.
|
||||
|
||||
Some prompt generators attempt to work around this problem by rendering prompt asynchronously. This has undesirable effects. When you `cd` to another repo, or make changes to an existing repo such as creating a new untracked file, the prompt will either display incorrect repo state and fix later while you are typing, or not display the prompt at all and add it a second later.
|
||||
|
||||
**gitstatus** solves this problem by running a daemon next to each interactive shell. Whenever prompt needs to refresh, it sends the current directory to the daemon and receives git info back, all with a single roundtrip. The daemon is written in C++ and is using [libgit2](https://libgit2.org/) under the hood for heavy lifting. it keeps indices of all repos in memory for faster access. It never serves stale data -- every prompt receives accurate representation of the current state of the repo. Since fetching git info this way very fast, there is no need for asynchronous prompts.
|
||||
|
||||
## Requirements
|
||||
|
||||
* To compile: C++17 compiler, GNU make, pkg-config, libgit2.
|
||||
* To run: GNU libc on Linux, FreeBSD and WSL; nothing on Mac OS.
|
||||
|
||||
## Compiling
|
||||
|
||||
There are prebuilt `gitstatusd` binaries for `{darwin,freebsd,linux}-x86_64` bundled with the plugin. When you source `gitstatus.plugin.zsh`, it'll pick the right binary for your architecture automatically.
|
||||
|
||||
If precompiled binaries don't work for you, you'll need to get your hands dirty. On Mac OS you'll first need to build [libiconv](https://www.gnu.org/software/libiconv/) as a static library. Then download, compile and install [libgit2](https://github.com/libgit2/libgit2). Compile it statically with all optional features disabled and all required features bundled.
|
||||
|
||||
|
||||
```zsh
|
||||
git clone https://github.com/libgit2/libgit2.git
|
||||
cd libgit2
|
||||
mkdir build
|
||||
cd build
|
||||
cmake \
|
||||
-DUSE_SSH=OFF \
|
||||
-DUSE_HTTPS=OFF \
|
||||
-DTHREADSAFE=OFF \
|
||||
-DBUILD_SHARED_LIBS=OFF \
|
||||
-DUSE_EXT_HTTP_PARSER=OFF \
|
||||
-DUSE_BUNDLED_ZLIB=ON \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
..
|
||||
make VERBOSE=1 -j 20
|
||||
sudo make install
|
||||
```
|
||||
|
||||
Then build gitstatus itself.
|
||||
|
||||
```zsh
|
||||
git clone https://github.com/romkatv/gitstatus.git
|
||||
cd gitstatus
|
||||
make -j 20
|
||||
```
|
||||
|
||||
You can use `CXX=clang++ make` to compile with clang (the default compiler is gcc). On Mac OS you'll also need to override `LDLIBS`:
|
||||
|
||||
```zsh
|
||||
CXX=clang++ LDLIBS=-lgit2 make -j 20
|
||||
```
|
||||
|
||||
In order to achieve static linking with libgit2 and iconv on MacOS, make sure linker cannot find the dynamic versions of these libraries.
|
||||
|
||||
Here's what the resulting binary should look like on Linux, FreeBSD and WSL:
|
||||
|
||||
```zsh
|
||||
$ ldd ./gitstatusd
|
||||
linux-vdso.so.1 (0x00007ffccbfd4000)
|
||||
libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f59e6823000)
|
||||
/lib64/ld-linux-x86-64.so.2 (0x00007f59e700b000)
|
||||
```
|
||||
|
||||
On Mac OS:
|
||||
|
||||
```zsh
|
||||
$ otool -L gitstatusd
|
||||
gitstatusd:
|
||||
/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 400.9.4)
|
||||
/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1252.200.5)
|
||||
```
|
||||
|
||||
To verify that it works type the following command from a clean zsh shell (run `zsh -df` to get there):
|
||||
|
||||
```zsh
|
||||
GITSTATUS_DAEMON=./gitstatusd source ./gitstatus.plugin.zsh && [[ -v GITSTATUS_DAEMON_PID ]] && echo works || echo broken
|
||||
```
|
||||
|
||||
## More Docs
|
||||
|
||||
Run `gitstatusd --help` for help or read the same thing in [options.cc](https://github.com/romkatv/gitstatus/blob/master/src/options.cc).
|
||||
|
||||
There are also docs in [gitstatus.plugin.zsh](https://github.com/romkatv/gitstatus/blob/master/gitstatus.plugin.zsh).
|
||||
|
||||
## License
|
||||
|
||||
GNU General Public License v3.0. See [LICENSE](https://github.com/romkatv/gitstatus/blob/master/LICENSE).
|
||||
BIN
gitstatus/bin/gitstatusd-darwin-x86_64
Executable file
BIN
gitstatus/bin/gitstatusd-darwin-x86_64
Executable file
Binary file not shown.
1
gitstatus/bin/gitstatusd-freebsd-x86_64
Symbolic link
1
gitstatus/bin/gitstatusd-freebsd-x86_64
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
gitstatusd-linux-x86_64
|
||||
BIN
gitstatus/bin/gitstatusd-linux-x86_64
Executable file
BIN
gitstatus/bin/gitstatusd-linux-x86_64
Executable file
Binary file not shown.
255
gitstatus/gitstatus.plugin.zsh
Normal file
255
gitstatus/gitstatus.plugin.zsh
Normal file
|
|
@ -0,0 +1,255 @@
|
|||
[[ -o interactive ]] || return
|
||||
|
||||
zmodload zsh/datetime || return
|
||||
|
||||
# Retrives status of a git repo from a directory under its working tree.
|
||||
#
|
||||
# -d STR Directory to query. Defaults to $PWD. Must be absolute.
|
||||
# -c STR Callback function to call once the results are available. Called only after
|
||||
# gitstatus_query returns 0 with VCS_STATUS_RESULT=tout.
|
||||
# -t FLOAT Timeout in seconds. Will block for at most this long. If no results are
|
||||
# available by then: if -c isn't specified, will return 1; otherwise will set
|
||||
# VCS_STATUS_RESULT=tout and return 0.
|
||||
#
|
||||
# On success sets VCS_STATUS_RESULT to one of the following values:
|
||||
#
|
||||
# tout Timed out waiting for data; will call the user-specified callback later.
|
||||
# norepo-sync The directory isn't a git repo.
|
||||
# ok-sync The directory is a git repo.
|
||||
#
|
||||
# When the callback is called VCS_STATUS_RESULT s set to one of the following values:
|
||||
#
|
||||
# norepo-async The directory isn't a git repo.
|
||||
# ok-async The directory is a git repo.
|
||||
#
|
||||
# If VCS_STATUS_RESULT is ok-sync or ok-async, additional variables are set:
|
||||
#
|
||||
# VCS_STATUS_LOCAL_BRANCH Local branch name. Not empty.
|
||||
# VCS_STATUS_REMOTE_BRANCH Upstream branch name. Can be empty.
|
||||
# VCS_STATUS_REMOTE_URL Remote URL. Can be empty.
|
||||
# VCS_STATUS_ACTION Repository state, A.K.A. action. Can be empty.
|
||||
# VCS_STATUS_HAS_STAGED 1 if there are staged changes, 0 otherwise.
|
||||
# VCS_STATUS_HAS_UNSTAGED 1 if there are unstaged changes, 0 if there aren't, -1 if unknown.
|
||||
# VCS_STATUS_HAS_UNTRACKED 1 if there are untracked files, 0 if there aren't, -1 if unknown.
|
||||
# VCS_STATUS_COMMITS_AHEAD Number of commits the current branch is ahead of upstream.
|
||||
# Non-negative integer.
|
||||
# VCS_STATUS_COMMITS_BEHIND Number of commits the current branch is behind upstream. Non-negative
|
||||
# integer.
|
||||
# VCS_STATUS_STASHES Number of stashes. Non-negative integer.
|
||||
# VCS_STATUS_WORKDIR Git repo working directory. Not empty.
|
||||
# VCS_STATUS_ALL All of the above in an array. The order of elements is unspecified.
|
||||
# More elements can be added in the future.
|
||||
#
|
||||
# The point of reporting -1 as unstaged and untracked is to allow the command to skip scanning
|
||||
# files in large repos. See -m flag of gitstatus_start.
|
||||
#
|
||||
# !!!!! WARNING: CONCURRENT CALLS WITH THE SAME NAME ARE NOT ALLOWED !!!!!
|
||||
#
|
||||
# It's illegal to call `gitstatus_query NAME` if `gitstatus_query NAME` is running concurrently in
|
||||
# the same interactive shell or its child, or if the callback for the last timed out request hasn't
|
||||
# fired yet. If you need to issue concurrent requests, use different NAME arguments.
|
||||
function gitstatus_query() {
|
||||
emulate -L zsh
|
||||
setopt err_return no_unset
|
||||
|
||||
local opt
|
||||
local dir=$PWD
|
||||
local callback=''
|
||||
local -F timeout=-1
|
||||
while true; do
|
||||
getopts "d:c:t:" opt || break
|
||||
case $opt in
|
||||
d) dir=$OPTARG;;
|
||||
c) callback=$OPTARG;;
|
||||
t) timeout=$OPTARG;;
|
||||
?) return 1;;
|
||||
done) break;;
|
||||
esac
|
||||
done
|
||||
(( OPTIND == ARGC )) || { echo "usage: gitstatus_query [OPTION]... NAME" >&2; return 1 }
|
||||
local name=${*[$OPTIND]}
|
||||
|
||||
[[ -v GITSTATUS_DAEMON_PID_${name} ]]
|
||||
|
||||
local -i req_fd
|
||||
local req_fd_var=_GITSTATUS_REQ_FD_${name}
|
||||
local client_pid_var=_GITSTATUS_CLIENT_PID_${name}
|
||||
|
||||
[[ ${(P)client_pid_var} == $$ ]] && {
|
||||
req_fd=${(P)req_fd_var}
|
||||
} || {
|
||||
local req_fifo_var=_GITSTATUS_REQ_FIFO_${name}
|
||||
local resp_fifo_var=_GITSTATUS_RESP_FIFO_${name}
|
||||
local resp_fd_var=_GITSTATUS_RESP_FD_${name}
|
||||
local -i resp_fd
|
||||
exec {req_fd}<>${(P)req_fifo_var}
|
||||
exec {resp_fd}<>${(P)resp_fifo_var}
|
||||
typeset -g $client_pid_var=$$
|
||||
typeset -g $req_fd_var=$req_fd
|
||||
typeset -g $resp_fd_var=$resp_fd
|
||||
typeset -giH $client_pid_var=$client_pid
|
||||
typeset -gfH _gitstatus_process_response_${name}() {
|
||||
_gitstatus_process_response ${0#_gitstatus_process_response_} 0 ''
|
||||
}
|
||||
zle -F $resp_fd _gitstatus_process_response_${name}
|
||||
}
|
||||
|
||||
local -r req_id="$EPOCHREALTIME"
|
||||
echo -nE "${req_id} ${callback}"$'\x1f'"${dir}"$'\x1e' >&$req_fd
|
||||
|
||||
while true; do
|
||||
_gitstatus_process_response $name $timeout $req_id
|
||||
[[ $VCS_STATUS_RESULT == *-async ]] || break
|
||||
done
|
||||
}
|
||||
|
||||
typeset -fH _gitstatus_process_response() {
|
||||
emulate -L zsh
|
||||
setopt err_return no_unset
|
||||
|
||||
local name=$1
|
||||
local -F timeout=$2
|
||||
local req_id=$3
|
||||
local resp_fd_var=_GITSTATUS_RESP_FD_${name}
|
||||
|
||||
typeset -ga VCS_STATUS_ALL
|
||||
typeset -g VCS_STATUS_RESULT
|
||||
(( timeout >= 0 )) && local -a t=(-t $timeout) || local -a t=()
|
||||
IFS=$'\x1f' read -rd $'\x1e' -u ${(P)resp_fd_var} $t -A VCS_STATUS_ALL || {
|
||||
VCS_STATUS_RESULT=tout
|
||||
unset VCS_STATUS_ALL
|
||||
return
|
||||
}
|
||||
|
||||
local -a header=("${(@Q)${(z)VCS_STATUS_ALL[1]}}")
|
||||
[[ ${header[1]} == $req_id ]] && local -i ours=1 || local -i ours=0
|
||||
shift header
|
||||
[[ ${VCS_STATUS_ALL[2]} == 1 ]] && {
|
||||
shift 2 VCS_STATUS_ALL
|
||||
(( ours )) && VCS_STATUS_RESULT=ok-sync || VCS_STATUS_RESULT=ok-async
|
||||
typeset -g VCS_STATUS_LOCAL_BRANCH="${VCS_STATUS_ALL[1]}"
|
||||
typeset -g VCS_STATUS_REMOTE_BRANCH="${VCS_STATUS_ALL[2]}"
|
||||
typeset -g VCS_STATUS_REMOTE_URL="${VCS_STATUS_ALL[3]}"
|
||||
typeset -g VCS_STATUS_ACTION="${VCS_STATUS_ALL[4]}"
|
||||
typeset -gi VCS_STATUS_HAS_STAGED="${VCS_STATUS_ALL[5]}"
|
||||
typeset -gi VCS_STATUS_HAS_UNSTAGED="${VCS_STATUS_ALL[6]}"
|
||||
typeset -gi VCS_STATUS_HAS_UNTRACKED="${VCS_STATUS_ALL[7]}"
|
||||
typeset -gi VCS_STATUS_COMMITS_AHEAD="${VCS_STATUS_ALL[8]}"
|
||||
typeset -gi VCS_STATUS_COMMITS_BEHIND="${VCS_STATUS_ALL[9]}"
|
||||
typeset -gi VCS_STATUS_STASHES="${VCS_STATUS_ALL[10]}"
|
||||
typeset -g VCS_STATUS_WORKDIR="${VCS_STATUS_ALL[11]}"
|
||||
} || {
|
||||
(( ours )) && VCS_STATUS_RESULT=norepo-sync || VCS_STATUS_RESULT=norepo-async
|
||||
unset VCS_STATUS_ALL
|
||||
unset VCS_STATUS_LOCAL_BRANCH
|
||||
unset VCS_STATUS_REMOTE_BRANCH
|
||||
unset VCS_STATUS_REMOTE_URL
|
||||
unset VCS_STATUS_ACTION
|
||||
unset VCS_STATUS_HAS_STAGED
|
||||
unset VCS_STATUS_HAS_UNSTAGED
|
||||
unset VCS_STATUS_HAS_UNTRACKED
|
||||
unset VCS_STATUS_COMMITS_AHEAD
|
||||
unset VCS_STATUS_COMMITS_BEHIND
|
||||
unset VCS_STATUS_STASHES
|
||||
unset VCS_STATUS_WORKDIR
|
||||
}
|
||||
|
||||
(( ! ours )) && (( #header )) && emulate -L zsh && "${header[@]}" || true
|
||||
}
|
||||
|
||||
# Usage: gitstatus_start [OPTION]... NAME
|
||||
#
|
||||
# -t FLOAT Fail the self-check on initialization if not getting a response from gitstatusd for
|
||||
# this this many seconds. Defaults to 5.
|
||||
# -m INT Report -1 unstaged and untracked if there are more than this many files in the index.
|
||||
# Negative value means infinity. Defaults to -1.
|
||||
function gitstatus_start() {
|
||||
emulate -L zsh
|
||||
setopt err_return no_unset
|
||||
|
||||
local opt
|
||||
local -F timeout=5
|
||||
local -i max_dirty=-1
|
||||
while true; do
|
||||
getopts "t:m:" opt || break
|
||||
case $opt in
|
||||
t) timeout=$OPTARG;;
|
||||
m) max_dirty=$OPTARG;;
|
||||
?) return 1;;
|
||||
done) break;;
|
||||
esac
|
||||
done
|
||||
|
||||
(( timeout > 0 )) || { echo "invalid -t: $timeout" >&2; return 1 }
|
||||
(( OPTIND == ARGC )) || { echo "usage: gitstatus_start [OPTION]... NAME" >&2; return 1 }
|
||||
local name=${*[$OPTIND]}
|
||||
|
||||
[[ ! -v GITSTATUS_DAEMON_PID_${name} ]] || return 0
|
||||
|
||||
function gitstatus_arch() {
|
||||
local kernel && kernel=$(uname -s) && [[ -n $kernel ]]
|
||||
local arch && arch=$(uname -m) && [[ -n $arch ]]
|
||||
echo -E "${kernel:l}-${arch:l}"
|
||||
}
|
||||
|
||||
local daemon && daemon=${GITSTATUS_DAEMON:-${${(%):-%x}:A:h}/bin/gitstatusd-$(gitstatus_arch)}
|
||||
[[ -f $daemon ]] || { echo "file not found: $daemon" >&2 && return 1 }
|
||||
|
||||
local req_fifo resp_fifo log
|
||||
local -i req_fd resp_fd daemon_pid
|
||||
|
||||
function start() {
|
||||
req_fifo=$(mktemp -u "${TMPDIR:-/tmp}"/gitstatus.$$.pipe.req.XXXXXXXXXX)
|
||||
resp_fifo=$(mktemp -u "${TMPDIR:-/tmp}"/gitstatus.$$.pipe.resp.XXXXXXXXXX)
|
||||
mkfifo $req_fifo
|
||||
mkfifo $resp_fifo
|
||||
exec {req_fd}<>$req_fifo
|
||||
exec {resp_fd}<>$resp_fifo
|
||||
typeset -gfH _gitstatus_process_response_${name}() {
|
||||
_gitstatus_process_response ${0#_gitstatus_process_response_} 0 ''
|
||||
}
|
||||
zle -F $resp_fd _gitstatus_process_response_${name}
|
||||
|
||||
log=$(mktemp "${TMPDIR:-/tmp}"/gitstatus.$$.log.XXXXXXXXXX)
|
||||
|
||||
(
|
||||
nice -n -20 $daemon --dirty-max-index-size=$max_dirty --parent-pid=$$ \
|
||||
<&$req_fd >&$resp_fd 2>$log || true
|
||||
echo -nE $'bye\x1f0\x1e' >&$resp_fd || true
|
||||
rm -f $req_fifo $resp_fifo
|
||||
) &!
|
||||
|
||||
daemon_pid=$!
|
||||
|
||||
local reply
|
||||
echo -nE $'hello\x1f\x1e' >&$req_fd
|
||||
IFS='' read -r -d $'\x1e' -u $resp_fd -t $timeout reply
|
||||
[[ $reply == $'hello\x1f0' ]]
|
||||
}
|
||||
|
||||
start && {
|
||||
typeset -g GITSTATUS_DAEMON_LOG_${name}=$log
|
||||
typeset -gi GITSTATUS_DAEMON_PID_${name}=$daemon_pid
|
||||
typeset -gH _GITSTATUS_REQ_FIFO_${name}=$req_fifo
|
||||
typeset -gH _GITSTATUS_RESP_FIFO_${name}=$resp_fifo
|
||||
typeset -giH _GITSTATUS_REQ_FD_${name}=$req_fd
|
||||
typeset -giH _GITSTATUS_RESP_FD_${name}=$resp_fd
|
||||
typeset -giH _GITSTATUS_CLIENT_PID_${name}=$$
|
||||
} || {
|
||||
echo "gitstatus failed to initialize" >&2
|
||||
[[ -n $daemon_pid ]] && kill $daemon_pid &>/dev/null || true
|
||||
[[ -n $req_fd ]] && exec {req_fd}>&- || true
|
||||
[[ -n $resp_fd ]] && { zle -F $resp_fd || true } && { exec {resp_fd}>&- || true}
|
||||
rm -f $req_fifo $resp_fifo
|
||||
return 1
|
||||
}
|
||||
}
|
||||
|
||||
# Usage: gitstatus_check NAME.
|
||||
#
|
||||
# Returns 0 if and only if `gitstatus_start NAME` has succeeded previously.
|
||||
# If it returns non-zero, gitstatus_query NAME is guaranteed to return non-zero.
|
||||
function gitstatus_check() {
|
||||
local name=$1
|
||||
[[ -v GITSTATUS_DAEMON_PID_${name} ]]
|
||||
}
|
||||
|
|
@ -65,6 +65,10 @@ source "${p9k_directory}/functions/colors.zsh"
|
|||
|
||||
source "${p9k_directory}/functions/vcs.zsh"
|
||||
|
||||
if [[ $POWERLEVEL9K_DISABLE_GITSTATUS != true ]]; then
|
||||
source ${POWERLEVEL9K_GITSTATUS_DIR:-${p9k_directory}/gitstatus}/gitstatus.plugin.zsh
|
||||
fi
|
||||
|
||||
# cleanup temporary variables.
|
||||
unset p9k_directory
|
||||
|
||||
|
|
@ -95,23 +99,12 @@ fi
|
|||
# this naming convention.
|
||||
################################################################
|
||||
|
||||
# The `CURRENT_BG` variable is used to remember what the last BG color used was
|
||||
# when building a prompt segment.
|
||||
CURRENT_BG=NONE
|
||||
LAST_SEGMENT_INDEX=0
|
||||
|
||||
# Specifies the maximum number of elements in the cache. When the cache grows over this limit,
|
||||
# it gets cleared. This is meant to avoid memory leaks when a rogue prompt is filling the cache
|
||||
# with data.
|
||||
set_default POWERLEVEL9K_MAX_CACHE_SIZE 10000
|
||||
|
||||
# Functions producing left and right prompts are called from subshells, so any
|
||||
# changes to the environment variables they do get wiped out after the prompt is
|
||||
# printed. In order to cache the results of expensive computations in these functions,
|
||||
# we use a temporary file to communicate with the parent shell and to ask it to
|
||||
# change environment variables.
|
||||
typeset -gAH _p9k_cache_data=()
|
||||
typeset -gH _P9K_CACHE_CHANNEL=$(mktemp -u "${TMPDIR:-/tmp}"/p9k_cache_channel.$$.XXXXXXXXXX)
|
||||
typeset -gAH _P9K_CACHE=()
|
||||
|
||||
# Note: Several performance-critical functions return results to the caller via global
|
||||
# variable _P9K_RETVAL rather than stdout. This is faster.
|
||||
|
|
@ -126,7 +119,7 @@ typeset -gH _P9K_CACHE_CHANNEL=$(mktemp -u "${TMPDIR:-/tmp}"/p9k_cache_channel.$
|
|||
_p9k_cache_set() {
|
||||
# Uncomment to see cache misses.
|
||||
# echo "cache: ${(qq)1} => ${(qq)2}" >&2
|
||||
echo -E "_p9k_cache_data+=(${(qq)1} ${(qq)2})" >>! $_P9K_CACHE_CHANNEL
|
||||
_P9K_CACHE[$1]=$2
|
||||
_P9K_RETVAL=$2
|
||||
}
|
||||
|
||||
|
|
@ -137,14 +130,14 @@ _p9k_cache_set() {
|
|||
# If there is value associated with the specified key, sets _P9K_RETVAL and returns 0.
|
||||
# Otherwise returns 1.
|
||||
_p9k_cache_get() {
|
||||
_P9K_RETVAL=${_p9k_cache_data[$1]-__p9k_empty__}
|
||||
_P9K_RETVAL=${_P9K_CACHE[$1]-__p9k_empty__}
|
||||
[[ $_P9K_RETVAL != __p9k_empty__ ]]
|
||||
}
|
||||
|
||||
# Sets _P9K_RETVAL to icon whose name is supplied via $1.
|
||||
_p9k_get_icon() {
|
||||
local var_name=POWERLEVEL9K_$1
|
||||
_P9K_RETVAL=${${(P)var_name}-$icons[$1]}
|
||||
_P9K_RETVAL=${(g::)${${(P)var_name}-$icons[$1]}}
|
||||
}
|
||||
|
||||
typeset -gaH _p9k_left_join=(1)
|
||||
|
|
@ -168,8 +161,8 @@ for ((i = 2; i <= $#POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS; ++i)); do
|
|||
done
|
||||
unset elem
|
||||
|
||||
_p9k_should_join_left() [[ $LAST_SEGMENT_INDEX -ge ${_p9k_left_join[$1]:-$1} ]]
|
||||
_p9k_should_join_right() [[ $LAST_SEGMENT_INDEX -ge ${_p9k_right_join[$1]:-$1} ]]
|
||||
_p9k_should_join_left() [[ $_P9K_LAST_SEGMENT_INDEX -ge ${_p9k_left_join[$1]:-$1} ]]
|
||||
_p9k_should_join_right() [[ $_P9K_LAST_SEGMENT_INDEX -ge ${_p9k_right_join[$1]:-$1} ]]
|
||||
|
||||
# Resolves a color to its numerical value, or an empty string. Communicates the result back
|
||||
# by setting _P9K_RETVAL.
|
||||
|
|
@ -206,7 +199,7 @@ _p9k_foreground() {
|
|||
set_default POWERLEVEL9K_WHITESPACE_BETWEEN_LEFT_SEGMENTS " "
|
||||
left_prompt_segment() {
|
||||
_p9k_should_join_left $2 && local join=true || local join=false
|
||||
local cache_key="${(q)0} ${(q)1} ${(q)3} ${(q)4} ${(q)5:+1} ${(q)6} ${(q)CURRENT_BG} $join"
|
||||
local cache_key="${(q)0} ${(q)1} ${(q)3} ${(q)4} ${(q)5:+1} ${(q)6} ${(q)_P9K_CURRENT_BG} $join"
|
||||
if ! _p9k_cache_get $cache_key; then
|
||||
_p9k_color $3 $1 BACKGROUND
|
||||
local background_color=$_P9K_RETVAL
|
||||
|
|
@ -219,11 +212,11 @@ left_prompt_segment() {
|
|||
_p9k_background $background_color
|
||||
local output=$_P9K_RETVAL
|
||||
|
||||
if [[ $CURRENT_BG == NONE ]]; then
|
||||
if [[ $_P9K_CURRENT_BG == NONE ]]; then
|
||||
# The first segment on the line.
|
||||
output+=$POWERLEVEL9K_WHITESPACE_BETWEEN_LEFT_SEGMENTS
|
||||
elif [[ $join == false ]]; then
|
||||
if [[ $background_color == $CURRENT_BG ]]; then
|
||||
if [[ $background_color == $_P9K_CURRENT_BG ]]; then
|
||||
# Middle segment with same color as previous segment
|
||||
# We take the current foreground color as color for our
|
||||
# subsegment (or the default color). This should have
|
||||
|
|
@ -237,7 +230,7 @@ left_prompt_segment() {
|
|||
_p9k_get_icon LEFT_SUBSEGMENT_SEPARATOR
|
||||
output+="${_P9K_RETVAL}${POWERLEVEL9K_WHITESPACE_BETWEEN_LEFT_SEGMENTS}"
|
||||
else
|
||||
_p9k_foreground $CURRENT_BG
|
||||
_p9k_foreground $_P9K_CURRENT_BG
|
||||
output+=$_P9K_RETVAL
|
||||
_p9k_get_icon LEFT_SEGMENT_SEPARATOR
|
||||
output+="${_P9K_RETVAL}${POWERLEVEL9K_WHITESPACE_BETWEEN_LEFT_SEGMENTS}"
|
||||
|
|
@ -261,27 +254,27 @@ left_prompt_segment() {
|
|||
fi
|
||||
|
||||
local tuple=("${(@Q)${(z)_P9K_RETVAL}}")
|
||||
echo -n "${tuple[1]}${5}${POWERLEVEL9K_WHITESPACE_BETWEEN_LEFT_SEGMENTS}"
|
||||
LAST_SEGMENT_INDEX=$2
|
||||
CURRENT_BG=$tuple[2]
|
||||
_P9K_PROMPT+="${tuple[1]}${5}${POWERLEVEL9K_WHITESPACE_BETWEEN_LEFT_SEGMENTS}"
|
||||
_P9K_LAST_SEGMENT_INDEX=$2
|
||||
_P9K_CURRENT_BG=$tuple[2]
|
||||
}
|
||||
|
||||
# End the left prompt, closes the final segment.
|
||||
left_prompt_end() {
|
||||
local cache_key="$0 ${(q)CURRENT_BG}"
|
||||
local cache_key="$0 ${(q)_P9K_CURRENT_BG}"
|
||||
if ! _p9k_cache_get $cache_key; then
|
||||
local output="%k"
|
||||
if [[ $CURRENT_BG != NONE ]]; then
|
||||
_p9k_foreground $CURRENT_BG
|
||||
if [[ $_P9K_CURRENT_BG != NONE ]]; then
|
||||
_p9k_foreground $_P9K_CURRENT_BG
|
||||
output+=$_P9K_RETVAL
|
||||
_p9k_get_icon LEFT_SEGMENT_SEPARATOR
|
||||
output+="${_P9K_RETVAL}"
|
||||
fi
|
||||
_p9k_get_icon LEFT_SEGMENT_END_SEPARATOR
|
||||
output+="%f${_P9K_RETVAL}"
|
||||
output+="%f${_P9K_RETVAL}"
|
||||
_p9k_cache_set $cache_key $output
|
||||
fi
|
||||
echo -n $_P9K_RETVAL
|
||||
_P9K_PROMPT+=$_P9K_RETVAL
|
||||
}
|
||||
|
||||
# Begin a right prompt segment
|
||||
|
|
@ -297,7 +290,7 @@ left_prompt_end() {
|
|||
set_default POWERLEVEL9K_WHITESPACE_BETWEEN_RIGHT_SEGMENTS " "
|
||||
right_prompt_segment() {
|
||||
_p9k_should_join_right $2 && local join=true || local join=false
|
||||
local cache_key="${(q)0} ${(q)1} ${(q)3} ${(q)4} ${(q)6} ${(q)CURRENT_BG} $join"
|
||||
local cache_key="${(q)0} ${(q)1} ${(q)3} ${(q)4} ${(q)6} ${(q)_P9K_CURRENT_BG} $join"
|
||||
|
||||
if ! _p9k_cache_get $cache_key; then
|
||||
_p9k_color $3 $1 BACKGROUND
|
||||
|
|
@ -312,8 +305,8 @@ right_prompt_segment() {
|
|||
|
||||
local output=''
|
||||
|
||||
if [[ $CURRENT_BG == NONE || $join == false ]]; then
|
||||
if [[ $background_color == $CURRENT_BG ]]; then
|
||||
if [[ $_P9K_CURRENT_BG == NONE || $join == false ]]; then
|
||||
if [[ $background_color == $_P9K_CURRENT_BG ]]; then
|
||||
# Middle segment with same color as previous segment
|
||||
# We take the current foreground color as color for our
|
||||
# subsegment (or the default color). This should have
|
||||
|
|
@ -356,10 +349,10 @@ right_prompt_segment() {
|
|||
fi
|
||||
|
||||
local tuple=("${(@Q)${(z)_P9K_RETVAL}}")
|
||||
echo -n "${tuple[1]}${5}${5:+ }${tuple[3]}"
|
||||
_P9K_PROMPT+="${tuple[1]}${5}${5:+ }${tuple[3]}"
|
||||
|
||||
CURRENT_BG=$tuple[2]
|
||||
LAST_SEGMENT_INDEX=$2
|
||||
_P9K_CURRENT_BG=$tuple[2]
|
||||
_P9K_LAST_SEGMENT_INDEX=$2
|
||||
}
|
||||
|
||||
################################################################
|
||||
|
|
@ -431,7 +424,7 @@ prompt_newline() {
|
|||
"$0" \
|
||||
"$2" \
|
||||
"" "" "${newline}"
|
||||
CURRENT_BG=NONE
|
||||
_P9K_CURRENT_BG=NONE
|
||||
POWERLEVEL9K_WHITESPACE_BETWEEN_LEFT_SEGMENTS=$lws
|
||||
}
|
||||
|
||||
|
|
@ -1011,25 +1004,21 @@ prompt_dir() {
|
|||
|
||||
# save state of path for highlighting and bold options
|
||||
local path_opt=$current_path
|
||||
|
||||
typeset -AH dir_states
|
||||
dir_states=(
|
||||
"DEFAULT" "FOLDER_ICON"
|
||||
"HOME" "HOME_ICON"
|
||||
"HOME_SUBFOLDER" "HOME_SUB_ICON"
|
||||
"NOT_WRITABLE" "LOCK_ICON"
|
||||
"ETC" "ETC_ICON"
|
||||
)
|
||||
local state_path="$(print -P '%~')"
|
||||
local current_state="DEFAULT"
|
||||
local icon="FOLDER_ICON"
|
||||
if [[ $state_path == '/etc'* ]]; then
|
||||
current_state='ETC'
|
||||
icon='ETC_ICON'
|
||||
elif [[ "${POWERLEVEL9K_DIR_SHOW_WRITABLE}" == true && ! -w "$PWD" ]]; then
|
||||
current_state="NOT_WRITABLE"
|
||||
icon='LOCK_ICON'
|
||||
elif [[ $state_path == '~' ]]; then
|
||||
current_state="HOME"
|
||||
icon='HOME_ICON'
|
||||
elif [[ $state_path == '~'* ]]; then
|
||||
current_state="HOME_SUBFOLDER"
|
||||
icon='HOME_SUB_ICON'
|
||||
fi
|
||||
|
||||
# declare variables used for bold and state colors
|
||||
|
|
@ -1101,7 +1090,7 @@ prompt_dir() {
|
|||
current_path=${current_path:s/~/$POWERLEVEL9K_HOME_FOLDER_ABBREVIATION}
|
||||
fi
|
||||
|
||||
_p9k_cache_set $cache_key "$0_$current_state ${(qq)2} blue ${(qq)DEFAULT_COLOR} ${(qq)current_path} ${(qq)dir_states[$current_state]}"
|
||||
_p9k_cache_set $cache_key "$0_$current_state ${(qq)2} blue ${(qq)DEFAULT_COLOR} ${(qq)current_path} ${(qq)icon}"
|
||||
fi
|
||||
|
||||
"$1_prompt_segment" "${(@Q)${(z)_P9K_RETVAL}}"
|
||||
|
|
@ -1441,14 +1430,10 @@ set_default POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE false
|
|||
|
||||
exit_code_or_status() {
|
||||
local ec=$1
|
||||
if [[ "$POWERLEVEL9K_STATUS_HIDE_SIGNAME" = true ]]; then
|
||||
echo "$ec"
|
||||
elif (( ec <= 128 )); then
|
||||
echo "$ec"
|
||||
if [[ "$POWERLEVEL9K_STATUS_HIDE_SIGNAME" = true ]] || (( ec <= 128 )); then
|
||||
_P9K_RETVAL=$ec
|
||||
else
|
||||
local sig=$(( ec - 128 ))
|
||||
local idx=$(( sig + 1 ))
|
||||
echo "SIG${signals[$idx]}(${sig})"
|
||||
_P9K_RETVAL="SIG${signals[$((sig + 1))]}($((ec - 128)))"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -1461,22 +1446,25 @@ prompt_status() {
|
|||
|
||||
if [[ $POWERLEVEL9K_STATUS_SHOW_PIPESTATUS == true ]]; then
|
||||
if (( $#RETVALS > 1 )); then
|
||||
ec_text=$(exit_code_or_status "${RETVALS[1]}")
|
||||
ec_sum=${RETVALS[1]}
|
||||
exit_code_or_status "${RETVALS[1]}"
|
||||
|
||||
else
|
||||
ec_text=$(exit_code_or_status "${RETVAL}")
|
||||
ec_sum=${RETVAL}
|
||||
exit_code_or_status "${RETVAL}"
|
||||
fi
|
||||
|
||||
ec_text=$_P9K_RETVAL
|
||||
for ec in "${(@)RETVALS[2,-1]}"; do
|
||||
ec_text="${ec_text}|$(exit_code_or_status "$ec")"
|
||||
ec_sum=$(( $ec_sum + $ec ))
|
||||
(( ec_sum += ec ))
|
||||
exit_code_or_status "$ec"
|
||||
ec_text+="|$_P9K_RETVAL"
|
||||
done
|
||||
else
|
||||
ec_sum=${RETVAL}
|
||||
# We use RETVAL instead of the right-most RETVALS item because
|
||||
# PIPE_FAIL may be set.
|
||||
ec_text=$(exit_code_or_status "${RETVAL}")
|
||||
ec_sum=${RETVAL}
|
||||
exit_code_or_status "${RETVAL}"
|
||||
ec_text=$_P9K_RETVAL
|
||||
fi
|
||||
|
||||
if (( ec_sum > 0 )); then
|
||||
|
|
@ -1566,8 +1554,8 @@ build_test_stats() {
|
|||
# System time
|
||||
prompt_time() {
|
||||
set_default POWERLEVEL9K_TIME_FORMAT "%D{%H:%M:%S}"
|
||||
|
||||
"$1_prompt_segment" "$0" "$2" "$DEFAULT_COLOR_INVERTED" "$DEFAULT_COLOR" "$POWERLEVEL9K_TIME_FORMAT" "TIME_ICON"
|
||||
[[ -v _P9K_REFRESH_PROMPT ]] || typeset -gH _P9K_TIME=${(%)POWERLEVEL9K_TIME_FORMAT}
|
||||
"$1_prompt_segment" "$0" "$2" "$DEFAULT_COLOR_INVERTED" "$DEFAULT_COLOR" "$_P9K_TIME" "TIME_ICON"
|
||||
}
|
||||
|
||||
################################################################
|
||||
|
|
@ -1595,6 +1583,7 @@ prompt_todo() {
|
|||
set_default POWERLEVEL9K_VCS_ACTIONFORMAT_FOREGROUND "red"
|
||||
# Default: Just display the first 8 characters of our changeset-ID.
|
||||
set_default POWERLEVEL9K_VCS_INTERNAL_HASH_LENGTH "8"
|
||||
|
||||
powerlevel9k_vcs_init() {
|
||||
if [[ -n "$POWERLEVEL9K_CHANGESET_HASH_LENGTH" ]]; then
|
||||
POWERLEVEL9K_VCS_INTERNAL_HASH_LENGTH="$POWERLEVEL9K_CHANGESET_HASH_LENGTH"
|
||||
|
|
@ -1612,6 +1601,7 @@ powerlevel9k_vcs_init() {
|
|||
'clean' 'green'
|
||||
'modified' 'yellow'
|
||||
'untracked' 'green'
|
||||
'loading' 'grey'
|
||||
)
|
||||
|
||||
VCS_CHANGESET_PREFIX=''
|
||||
|
|
@ -1619,7 +1609,6 @@ powerlevel9k_vcs_init() {
|
|||
VCS_CHANGESET_PREFIX="$(print_icon 'VCS_COMMIT_ICON')%0.$POWERLEVEL9K_VCS_INTERNAL_HASH_LENGTH""i "
|
||||
fi
|
||||
|
||||
zstyle ':vcs_info:*' enable git hg svn
|
||||
zstyle ':vcs_info:*' check-for-changes true
|
||||
|
||||
VCS_DEFAULT_FORMAT="$VCS_CHANGESET_PREFIX%b%c%u%m"
|
||||
|
|
@ -1655,22 +1644,182 @@ powerlevel9k_vcs_init() {
|
|||
fi
|
||||
}
|
||||
|
||||
# git workdir => the last prompt we've shown for it
|
||||
typeset -gAH _P9K_LAST_GIT_PROMPT
|
||||
|
||||
# git workdir => 1 if gitstatus is slow on it, 0 if it's fast.
|
||||
typeset -gAH _P9K_GIT_SLOW
|
||||
|
||||
typeset -fH _p9k_vcs_render() {
|
||||
if [[ -v _P9K_NEXT_VCS_DIR ]]; then
|
||||
local prompt
|
||||
local dir=$PWD
|
||||
while true; do
|
||||
prompt=${_P9K_LAST_GIT_PROMPT[$dir]}
|
||||
[[ -n $prompt || $dir == / ]] && break
|
||||
dir=${dir:h}
|
||||
done
|
||||
$2_prompt_segment $1_LOADING $3 "${vcs_states[loading]}" "$DEFAULT_COLOR" ${prompt:-loading}
|
||||
return 0
|
||||
fi
|
||||
|
||||
[[ $VCS_STATUS_RESULT == ok-* ]] || return 1
|
||||
local cache_key="$0
|
||||
${(q)VCS_STATUS_LOCAL_BRANCH}
|
||||
${(q)VCS_STATUS_REMOTE_BRANCH}
|
||||
${(q)VCS_STATUS_REMOTE_URL}
|
||||
${(q)VCS_STATUS_ACTION}
|
||||
${(q)VCS_STATUS_HAS_STAGED}
|
||||
${(q)VCS_STATUS_HAS_UNSTAGED}
|
||||
${(q)VCS_STATUS_HAS_UNTRACKED}
|
||||
${(q)VCS_STATUS_COMMITS_AHEAD}
|
||||
${(q)VCS_STATUS_COMMITS_BEHIND}
|
||||
${(q)VCS_STATUS_STASHES}"
|
||||
if ! _p9k_cache_get $cache_key; then
|
||||
local state
|
||||
if [[ $VCS_STATUS_HAS_STAGED != 0 || $VCS_STATUS_HAS_UNSTAGED != 0 ]]; then
|
||||
state='modified'
|
||||
elif [[ $VCS_STATUS_HAS_UNTRACKED != 0 ]]; then
|
||||
state='untracked'
|
||||
else
|
||||
state='clean'
|
||||
fi
|
||||
|
||||
local vcs_prompt
|
||||
if [[ "$VCS_STATUS_REMOTE_URL" == *github* ]] then
|
||||
_p9k_get_icon VCS_GIT_GITHUB_ICON
|
||||
vcs_prompt+=$_P9K_RETVAL
|
||||
elif [[ "$VCS_STATUS_REMOTE_URL" == *bitbucket* ]] then
|
||||
_p9k_get_icon VCS_GIT_BITBUCKET_ICON
|
||||
vcs_prompt+=$_P9K_RETVAL
|
||||
elif [[ "$VCS_STATUS_REMOTE_URL" == *stash* ]] then
|
||||
_p9k_get_icon VCS_GIT_GITHUB_ICON
|
||||
vcs_prompt+=$_P9K_RETVAL
|
||||
elif [[ "$VCS_STATUS_REMOTE_URL" == *gitlab* ]] then
|
||||
_p9k_get_icon VCS_GIT_GITLAB_ICON
|
||||
vcs_prompt+=$_P9K_RETVAL
|
||||
else
|
||||
_p9k_get_icon VCS_GIT_ICON
|
||||
vcs_prompt+=$_P9K_RETVAL
|
||||
fi
|
||||
|
||||
_p9k_get_icon VCS_BRANCH_ICON
|
||||
vcs_prompt+="$_P9K_RETVAL$VCS_STATUS_LOCAL_BRANCH"
|
||||
if [[ -n $VCS_STATUS_ACTION ]]; then
|
||||
vcs_prompt+=" %F{${POWERLEVEL9K_VCS_ACTIONFORMAT_FOREGROUND}}| $VCS_STATUS_ACTION%f"
|
||||
else
|
||||
if [[ -n $VCS_STATUS_REMOTE_BRANCH &&
|
||||
$VCS_STATUS_LOCAL_BRANCH != $VCS_STATUS_REMOTE_BRANCH ]]; then
|
||||
_p9k_get_icon VCS_REMOTE_BRANCH_ICON
|
||||
vcs_prompt+=" $_P9K_RETVAL$VCS_STATUS_REMOTE_BRANCH"
|
||||
fi
|
||||
if [[ $VCS_STATUS_HAS_STAGED == 1 ]]; then
|
||||
_p9k_get_icon VCS_STAGED_ICON
|
||||
vcs_prompt+=" $_P9K_RETVAL"
|
||||
fi
|
||||
if [[ $VCS_STATUS_HAS_UNSTAGED == 1 ]]; then
|
||||
_p9k_get_icon VCS_UNSTAGED_ICON
|
||||
vcs_prompt+=" $_P9K_RETVAL"
|
||||
fi
|
||||
if [[ $VCS_STATUS_HAS_UNTRACKED == 1 ]]; then
|
||||
_p9k_get_icon VCS_UNTRACKED_ICON
|
||||
vcs_prompt+=" $_P9K_RETVAL"
|
||||
fi
|
||||
if [[ $VCS_STATUS_COMMITS_AHEAD -gt 0 ]]; then
|
||||
_p9k_get_icon VCS_OUTGOING_CHANGES_ICON
|
||||
vcs_prompt+=" $_P9K_RETVAL$VCS_STATUS_COMMITS_AHEAD"
|
||||
fi
|
||||
if [[ $VCS_STATUS_COMMITS_BEHIND -gt 0 ]]; then
|
||||
_p9k_get_icon VCS_INCOMING_CHANGES_ICON
|
||||
vcs_prompt+=" $_P9K_RETVAL$VCS_STATUS_COMMITS_BEHIND"
|
||||
fi
|
||||
if [[ $VCS_STATUS_STASHES -gt 0 ]]; then
|
||||
_p9k_get_icon VCS_STASH_ICON
|
||||
vcs_prompt+=" $_P9K_RETVAL$VCS_STATUS_STASHES"
|
||||
fi
|
||||
fi
|
||||
|
||||
_p9k_cache_set $cache_key "${1}_${(U)state} ${(qq)vcs_states[$state]} ${(qq)vcs_prompt}"
|
||||
fi
|
||||
|
||||
local tuple=("${(@Q)${(z)_P9K_RETVAL}}")
|
||||
_P9K_LAST_GIT_PROMPT[$VCS_STATUS_WORKDIR]="${tuple[3]}"
|
||||
"$2_prompt_segment" "${tuple[1]}" $3 "${tuple[2]}" "$DEFAULT_COLOR" "${tuple[3]}"
|
||||
return 0
|
||||
}
|
||||
|
||||
typeset -fH _p9k_vcs_resume() {
|
||||
if [[ $VCS_STATUS_RESULT == ok-async ]]; then
|
||||
local slow=$((EPOCHREALTIME - _P9K_GITSTATUS_START_TIME > POWERLEVEL9K_VCS_MAX_SYNC_LATENCY_SECONDS))
|
||||
_P9K_GIT_SLOW[$VCS_STATUS_WORKDIR]=$slow
|
||||
fi
|
||||
|
||||
if [[ -z $_P9K_NEXT_VCS_DIR ]]; then
|
||||
unset _P9K_NEXT_VCS_DIR
|
||||
_p9k_reset_prompts
|
||||
else
|
||||
typeset -gFH _P9K_GITSTATUS_START_TIME=$EPOCHREALTIME
|
||||
if ! gitstatus_query -d $_P9K_NEXT_VCS_DIR -t 0 -c _p9k_vcs_resume POWERLEVEL9K; then
|
||||
unset _P9K_NEXT_VCS_DIR
|
||||
return
|
||||
fi
|
||||
case $VCS_STATUS_RESULT in
|
||||
*-sync)
|
||||
unset _P9K_NEXT_VCS_DIR
|
||||
_p9k_reset_prompts
|
||||
;;
|
||||
tout)
|
||||
typeset -gH _P9K_NEXT_VCS_DIR=""
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
}
|
||||
|
||||
typeset -fH _p9k_vcs_gitstatus() {
|
||||
[[ $POWERLEVEL9K_DISABLE_GITSTATUS == true ]] && return 1
|
||||
if [[ ! -v _P9K_REFRESH_PROMPT ]]; then
|
||||
if [[ -v _P9K_NEXT_VCS_DIR ]]; then
|
||||
typeset -gH _P9K_NEXT_VCS_DIR=$PWD
|
||||
else
|
||||
local dir=$PWD
|
||||
local -F timeout=$POWERLEVEL9K_VCS_MAX_SYNC_LATENCY_SECONDS
|
||||
while true; do
|
||||
case "$_P9K_GIT_SLOW[$dir]" in
|
||||
"") [[ $dir == / ]] && break; dir=${dir:h};;
|
||||
0) break;;
|
||||
1) timeout=0; break;;
|
||||
esac
|
||||
done
|
||||
typeset -gFH _P9K_GITSTATUS_START_TIME=$EPOCHREALTIME
|
||||
gitstatus_query -t $timeout -c _p9k_vcs_resume POWERLEVEL9K || return 1
|
||||
[[ $VCS_STATUS_RESULT == tout ]] && typeset -gH _P9K_NEXT_VCS_DIR=""
|
||||
fi
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
################################################################
|
||||
# Segment to show VCS information
|
||||
|
||||
# If it takes longer than this to fetch git repo status, display the prompt with a greyed out
|
||||
# vcs segment and fix it asynchronously when the results come it.
|
||||
[ -v POWERLEVEL9K_VCS_MAX_SYNC_LATENCY_SECONDS ] || typeset -gF POWERLEVEL9K_VCS_MAX_SYNC_LATENCY_SECONDS=0.05
|
||||
|
||||
prompt_vcs() {
|
||||
# If POWERLEVEL9K_VCS_STATUS_COMMAND isn't empty, it should be a command that provides vcs info
|
||||
# in the format of gitstatus. See https://github.com/romkatv/gitstatus. If you enable gitstatus,
|
||||
# it'll define POWERLEVEL9K_VCS_STATUS_COMMAND for you. To disable, you can explicitly set
|
||||
# POWERLEVEL9K_VCS_STATUS_COMMAND="".
|
||||
if [[ -z $POWERLEVEL9K_VCS_STATUS_COMMAND ]]; then
|
||||
local -a backends
|
||||
[[ -v POWERLEVEL9K_VCS_BACKENDS ]] && backends=($POWERLEVEL9K_VCS_BACKENDS) || backends=(git)
|
||||
if (( ${backends[(I)git]} )) && _p9k_vcs_gitstatus; then
|
||||
_p9k_vcs_render $0 $1 $2 && return
|
||||
backends=(${backends:#git})
|
||||
fi
|
||||
if (( #backends )); then
|
||||
VCS_WORKDIR_DIRTY=false
|
||||
VCS_WORKDIR_HALF_DIRTY=false
|
||||
local current_state=""
|
||||
|
||||
# Actually invoke vcs_info manually to gather all information.
|
||||
zstyle ':vcs_info:*' enable ${backends}
|
||||
vcs_info
|
||||
local vcs_prompt="${vcs_info_msg_0_}"
|
||||
|
||||
if [[ -n "$vcs_prompt" ]]; then
|
||||
if [[ "$VCS_WORKDIR_DIRTY" == true ]]; then
|
||||
# $vcs_visual_identifier gets set in +vi-vcs-detect-changes in functions/vcs.zsh,
|
||||
|
|
@ -1685,71 +1834,6 @@ prompt_vcs() {
|
|||
fi
|
||||
"$1_prompt_segment" "${0}_${(U)current_state}" "$2" "${vcs_states[$current_state]}" "$DEFAULT_COLOR" "$vcs_prompt" "$vcs_visual_identifier"
|
||||
fi
|
||||
else
|
||||
"${(@Q)${(z)POWERLEVEL9K_VCS_STATUS_COMMAND}}" || return
|
||||
local cache_key="$0 ${(@q)VCS_STATUS_ALL}"
|
||||
if ! _p9k_cache_get $cache_key; then
|
||||
local current_state
|
||||
if [[ $VCS_STATUS_HAS_STAGED != 0 || $VCS_STATUS_HAS_UNSTAGED != 0 ]]; then
|
||||
current_state='modified'
|
||||
elif [[ $VCS_STATUS_HAS_UNTRACKED != 0 ]]; then
|
||||
current_state='untracked'
|
||||
else
|
||||
current_state='clean'
|
||||
fi
|
||||
|
||||
local vcs_prompt
|
||||
if [[ "$VCS_STATUS_REMOTE_URL" =~ "github" ]] then
|
||||
_p9k_get_icon VCS_GIT_GITHUB_ICON
|
||||
vcs_prompt+=$_P9K_RETVAL
|
||||
elif [[ "$VCS_STATUS_REMOTE_URL" =~ "bitbucket" ]] then
|
||||
_p9k_get_icon VCS_GIT_BITBUCKET_ICON
|
||||
vcs_prompt+=$_P9K_RETVAL
|
||||
elif [[ "$VCS_STATUS_REMOTE_URL" =~ "stash" ]] then
|
||||
_p9k_get_icon VCS_GIT_GITHUB_ICON
|
||||
vcs_prompt+=$_P9K_RETVAL
|
||||
elif [[ "$VCS_STATUS_REMOTE_URL" =~ "gitlab" ]] then
|
||||
_p9k_get_icon VCS_GIT_GITLAB_ICON
|
||||
vcs_prompt+=$_P9K_RETVAL
|
||||
else
|
||||
_p9k_get_icon VCS_GIT_ICON
|
||||
vcs_prompt+=$_P9K_RETVAL
|
||||
fi
|
||||
|
||||
_p9k_get_icon VCS_BRANCH_ICON
|
||||
vcs_prompt+="$_P9K_RETVAL$VCS_STATUS_LOCAL_BRANCH"
|
||||
if [[ -n $VCS_STATUS_ACTION ]]; then
|
||||
vcs_prompt+=" %F{${POWERLEVEL9K_VCS_ACTIONFORMAT_FOREGROUND}}| $VCS_STATUS_ACTION%f"
|
||||
else
|
||||
if [[ -n $VCS_STATUS_REMOTE_BRANCH &&
|
||||
$VCS_STATUS_LOCAL_BRANCH != $VCS_STATUS_REMOTE_BRANCH ]]; then
|
||||
_p9k_get_icon VCS_REMOTE_BRANCH_ICON
|
||||
vcs_prompt+=" $_P9K_RETVAL$VCS_STATUS_REMOTE_BRANCH"
|
||||
fi
|
||||
if [[ $VCS_STATUS_HAS_STAGED == 1 ]]; then
|
||||
_p9k_get_icon VCS_STAGED_ICON && vcs_prompt+=" $_P9K_RETVAL"
|
||||
fi
|
||||
if [[ $VCS_STATUS_HAS_UNSTAGED == 1 ]]; then
|
||||
_p9k_get_icon VCS_UNSTAGED_ICON && vcs_prompt+=" $_P9K_RETVAL"
|
||||
fi
|
||||
if [[ $VCS_STATUS_HAS_UNTRACKED == 1 ]]; then
|
||||
_p9k_get_icon VCS_UNTRACKED_ICON && vcs_prompt+=" $_P9K_RETVAL"
|
||||
fi
|
||||
if [[ $VCS_STATUS_COMMITS_AHEAD -gt 0 ]]; then
|
||||
_p9k_get_icon VCS_OUTGOING_CHANGES_ICON && vcs_prompt+=" $_P9K_RETVAL$VCS_STATUS_COMMITS_AHEAD"
|
||||
fi
|
||||
if [[ $VCS_STATUS_COMMITS_BEHIND -gt 0 ]]; then
|
||||
_p9k_get_icon VCS_INCOMING_CHANGES_ICON && vcs_prompt+=" $_P9K_RETVAL$VCS_STATUS_COMMITS_BEHIND"
|
||||
fi
|
||||
if [[ $VCS_STATUS_STASHES -gt 0 ]]; then
|
||||
_p9k_get_icon VCS_STASH_ICON && vcs_prompt+=" $_P9K_RETVAL$VCS_STATUS_STASHES"
|
||||
fi
|
||||
fi
|
||||
|
||||
_p9k_cache_set $cache_key "${0}_${(U)current_state} $2 ${(qq)vcs_states[$current_state]} ${(qq)DEFAULT_COLOR} ${(qq)vcs_prompt}"
|
||||
fi
|
||||
|
||||
"$1_prompt_segment" "${(@Q)${(z)_P9K_RETVAL}}"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -1896,6 +1980,9 @@ prompt_java_version() {
|
|||
################################################################
|
||||
# Main prompt
|
||||
build_left_prompt() {
|
||||
typeset -gH _P9K_CURRENT_BG=NONE
|
||||
typeset -gH _P9K_LAST_SEGMENT_INDEX=0
|
||||
|
||||
local index=1
|
||||
local element
|
||||
for element in "${POWERLEVEL9K_LEFT_PROMPT_ELEMENTS[@]}"; do
|
||||
|
|
@ -1914,12 +2001,18 @@ build_left_prompt() {
|
|||
done
|
||||
|
||||
left_prompt_end
|
||||
|
||||
unset _P9K_CURRENT_BG _P9K_LAST_SEGMENT_INDEX
|
||||
}
|
||||
|
||||
# Right prompt
|
||||
build_right_prompt() {
|
||||
typeset -gH _P9K_CURRENT_BG=NONE
|
||||
typeset -gH _P9K_LAST_SEGMENT_INDEX=0
|
||||
|
||||
local index=1
|
||||
local element
|
||||
|
||||
for element in "${POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS[@]}"; do
|
||||
# Remove joined information in direct calls
|
||||
element=${element%_joined}
|
||||
|
|
@ -1936,7 +2029,9 @@ build_right_prompt() {
|
|||
done
|
||||
|
||||
# Clear to the end of the line
|
||||
echo -n "%E"
|
||||
_P9K_PROMPT+="%E"
|
||||
|
||||
unset _P9K_CURRENT_BG _P9K_LAST_SEGMENT_INDEX
|
||||
}
|
||||
|
||||
powerlevel9k_preexec() {
|
||||
|
|
@ -1946,35 +2041,19 @@ powerlevel9k_preexec() {
|
|||
_P9K_MULTILINE_FIRST_PROMPT_PREFIX=$(print_icon MULTILINE_FIRST_PROMPT_PREFIX)
|
||||
_P9K_MULTILINE_LAST_PROMPT_PREFIX=$(print_icon MULTILINE_LAST_PROMPT_PREFIX)
|
||||
|
||||
set_default POWERLEVEL9K_PROMPT_ADD_NEWLINE false
|
||||
powerlevel9k_prepare_prompts() {
|
||||
# Return values. These need to be global, because
|
||||
# they are used in prompt_status. Also, we need
|
||||
# to get the return value of the last command at
|
||||
# very first in this function. Do not move the
|
||||
# lines down, otherwise the last command is not
|
||||
# what you expected it to be.
|
||||
RETVAL=$?
|
||||
RETVALS=( "$pipestatus[@]" )
|
||||
|
||||
local RPROMPT_SUFFIX RPROMPT_PREFIX
|
||||
_P9K_COMMAND_DURATION=$((EPOCHREALTIME - _P9K_TIMER_START))
|
||||
|
||||
# Reset start time
|
||||
_P9K_TIMER_START=0x7FFFFFFF
|
||||
|
||||
if [[ -s $_P9K_CACHE_CHANNEL ]]; then
|
||||
eval $(<$_P9K_CACHE_CHANNEL)
|
||||
rm -f $_P9K_CACHE_CHANNEL
|
||||
if [[ -n $POWERLEVEL9K_MAX_CACHE_SIZE && $#_p9k_cache_data -gt $POWERLEVEL9K_MAX_CACHE_SIZE ]]; then
|
||||
_p9k_cache_data=()
|
||||
fi
|
||||
fi
|
||||
typeset -fH _p9k_set_prompts() {
|
||||
typeset -gH _P9K_PROMPT=''
|
||||
build_left_prompt
|
||||
local left=$_P9K_PROMPT
|
||||
_P9K_PROMPT=''
|
||||
build_right_prompt
|
||||
local right=$_P9K_PROMPT
|
||||
unset _P9K_PROMPT
|
||||
|
||||
local NEWLINE=$'\n'
|
||||
|
||||
local RPROMPT_SUFFIX RPROMPT_PREFIX
|
||||
if [[ "$POWERLEVEL9K_PROMPT_ON_NEWLINE" == true ]]; then
|
||||
PROMPT="$_P9K_MULTILINE_FIRST_PROMPT_PREFIX%f%b%k\$(build_left_prompt)$NEWLINE$_P9K_MULTILINE_LAST_PROMPT_PREFIX"
|
||||
PROMPT="$_P9K_MULTILINE_FIRST_PROMPT_PREFIX%f%b%k$left$NEWLINE$_P9K_MULTILINE_LAST_PROMPT_PREFIX"
|
||||
if [[ "$POWERLEVEL9K_RPROMPT_ON_NEWLINE" != true ]]; then
|
||||
# The right prompt should be on the same line as the first line of the left
|
||||
# prompt. To do so, there is just a quite ugly workaround: Before zsh draws
|
||||
|
|
@ -1989,17 +2068,17 @@ powerlevel9k_prepare_prompts() {
|
|||
RPROMPT_SUFFIX=''
|
||||
fi
|
||||
else
|
||||
PROMPT='%f%b%k$(build_left_prompt)'
|
||||
PROMPT="%f%b%k$left"
|
||||
RPROMPT_PREFIX=''
|
||||
RPROMPT_SUFFIX=''
|
||||
fi
|
||||
|
||||
if [[ "$POWERLEVEL9K_DISABLE_RPROMPT" != true ]]; then
|
||||
RPROMPT="${RPROMPT_PREFIX}"'%f%b%k$(build_right_prompt)%{$reset_color%}'"${RPROMPT_SUFFIX}"
|
||||
RPROMPT="${RPROMPT_PREFIX}%f%b%k$right%{$reset_color%}${RPROMPT_SUFFIX}"
|
||||
fi
|
||||
|
||||
if [[ $POWERLEVEL9K_PROMPT_ADD_NEWLINE == true ]]; then
|
||||
NEWLINES=""
|
||||
local NEWLINES=""
|
||||
repeat ${POWERLEVEL9K_PROMPT_ADD_NEWLINE_COUNT:-1} { NEWLINES+=$NEWLINE }
|
||||
PROMPT="$NEWLINES$PROMPT"
|
||||
fi
|
||||
|
|
@ -2008,6 +2087,28 @@ powerlevel9k_prepare_prompts() {
|
|||
[[ $ITERM_SHELL_INTEGRATION_INSTALLED == "Yes" ]] && PROMPT="%{$(iterm2_prompt_mark)%}$PROMPT"
|
||||
}
|
||||
|
||||
typeset -fH _p9k_reset_prompts() {
|
||||
typeset -gH _P9K_REFRESH_PROMPT=''
|
||||
_p9k_set_prompts
|
||||
unset _P9K_REFRESH_PROMPT
|
||||
zle && zle .reset-prompt
|
||||
}
|
||||
|
||||
set_default POWERLEVEL9K_PROMPT_ADD_NEWLINE false
|
||||
powerlevel9k_prepare_prompts() {
|
||||
# Return values. These need to be global, because
|
||||
# they are used in prompt_status. Also, we need
|
||||
# to get the return value of the last command at
|
||||
# very first in this function. Do not move the
|
||||
# lines down, otherwise the last command is not
|
||||
# what you expected it to be.
|
||||
RETVAL=$?
|
||||
RETVALS=( "$pipestatus[@]" )
|
||||
_P9K_COMMAND_DURATION=$((EPOCHREALTIME - _P9K_TIMER_START))
|
||||
_P9K_TIMER_START=0x7FFFFFFF
|
||||
_p9k_set_prompts
|
||||
}
|
||||
|
||||
zle-keymap-select () {
|
||||
zle reset-prompt
|
||||
zle -R
|
||||
|
|
@ -2078,6 +2179,8 @@ prompt_powerlevel9k_setup() {
|
|||
add-zsh-hook preexec powerlevel9k_preexec
|
||||
|
||||
zle -N zle-keymap-select
|
||||
|
||||
[[ $POWERLEVEL9K_DISABLE_GITSTATUS == true ]] || gitstatus_start POWERLEVEL9K
|
||||
}
|
||||
|
||||
prompt_powerlevel9k_teardown() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue