mirror of
https://github.com/SpaceVim/SpaceVim.git
synced 2025-01-23 13:00:04 +08:00
Improve git.vim (#4033)
This commit is contained in:
Wang Shidong
GitHub
parent
29b3dcc45e
commit
f67a5928bd
@ -432,6 +432,9 @@ function! SpaceVim#layers#core#statusline#get(...) abort
|
||||
elseif &filetype ==# 'git-commit'
|
||||
return '%#SpaceVim_statusline_ia#' . s:winnr(1) . '%#SpaceVim_statusline_ia_SpaceVim_statusline_b#' . s:lsep
|
||||
\ . '%#SpaceVim_statusline_b# Git commit %#SpaceVim_statusline_b_SpaceVim_statusline_c#' . s:lsep . ' '
|
||||
elseif &filetype ==# 'git-rebase'
|
||||
return '%#SpaceVim_statusline_ia#' . s:winnr(1) . '%#SpaceVim_statusline_ia_SpaceVim_statusline_b#' . s:lsep
|
||||
\ . '%#SpaceVim_statusline_b# Git rebase %#SpaceVim_statusline_b_SpaceVim_statusline_c#' . s:lsep . ' '
|
||||
elseif &filetype ==# 'git-diff'
|
||||
return '%#SpaceVim_statusline_ia#' . s:winnr(1) . '%#SpaceVim_statusline_ia_SpaceVim_statusline_b#' . s:lsep
|
||||
\ . '%#SpaceVim_statusline_b# Git diff %#SpaceVim_statusline_b_SpaceVim_statusline_c#' . s:lsep . ' '
|
||||
|
||||
@ -27,7 +27,7 @@ function! SpaceVim#layers#git#plugins() abort
|
||||
elseif s:git_plugin ==# 'gita'
|
||||
call add(plugins, ['lambdalisue/vim-gita', { 'on_cmd' : 'Gita'}])
|
||||
else
|
||||
call add(plugins, ['wsdjeg/git.vim', { 'on_cmd' : 'Git'}])
|
||||
call add(plugins, [g:_spacevim_root_dir . 'bundle/git.vim', { 'on_cmd' : 'Git'}])
|
||||
endif
|
||||
if g:spacevim_filemanager ==# 'nerdtree'
|
||||
call add(plugins, ['Xuyuanp/nerdtree-git-plugin', {'merged' : 0}])
|
||||
|
||||
1
bundle/git.vim/.gitignore
vendored
Normal file
1
bundle/git.vim/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
doc/tags
|
||||
674
bundle/git.vim/LICENSE
Normal file
674
bundle/git.vim/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>.
|
||||
63
bundle/git.vim/README.md
Normal file
63
bundle/git.vim/README.md
Normal file
@ -0,0 +1,63 @@
|
||||
# git.vim
|
||||
|
||||
[](https://spacevim.org)
|
||||
|
||||
Use git in SpaceVim
|
||||
|
||||
|
||||
|
||||
<!-- vim-markdown-toc GFM -->
|
||||
|
||||
- [usage](#usage)
|
||||
- [Screenshot](#screenshot)
|
||||
- [Feedback](#feedback)
|
||||
|
||||
<!-- vim-markdown-toc -->
|
||||
|
||||
## usage
|
||||
|
||||
- `:Git add %`: stage current file.
|
||||
- `:Git add .`: stage all files
|
||||
- `:Git commit`: edit commit message
|
||||
- `:Git push`: push to remote
|
||||
- `:Git fetch`: fetch remotes
|
||||
- `:Git checkout`: checkout branches
|
||||
- `:Git log %`: view git log of current file
|
||||
- `:Git config`: list all git config
|
||||
- `:Git reflog`: manage reflog information
|
||||
- `:Git branch`: list, create, or delete branches
|
||||
|
||||
## Screenshot
|
||||
|
||||
**`:Git status`**
|
||||
|
||||
|
||||
|
||||
**`:Git commit`**
|
||||
|
||||
|
||||
|
||||
**`:Git push`**
|
||||
|
||||
|
||||
|
||||
**`:Git push`** completion
|
||||
|
||||
|
||||
|
||||
**`:Git diff`**
|
||||
|
||||
|
||||
|
||||
**`:Git log`**
|
||||
|
||||
|
||||
|
||||
|
||||
## Feedback
|
||||
|
||||
This plugin is based on SpaceVim's API, make sure your SpaceVim is the latest version.
|
||||
|
||||
To report bug or request new features about git.vim, please send me email.
|
||||
|
||||
wsdjeg@outlook.com
|
||||
5
bundle/git.vim/addon-info.json
Normal file
5
bundle/git.vim/addon-info.json
Normal file
@ -0,0 +1,5 @@
|
||||
{
|
||||
"name": "git",
|
||||
"description": "Git support in vim",
|
||||
"author": "Wang Shidong"
|
||||
}
|
||||
103
bundle/git.vim/autoload/git.vim
Normal file
103
bundle/git.vim/autoload/git.vim
Normal file
@ -0,0 +1,103 @@
|
||||
"=============================================================================
|
||||
" git.vim
|
||||
" Copyright (c) 2016-2019 Wang Shidong & Contributors
|
||||
" Author: Wang Shidong < wsdjeg@outlook.com >
|
||||
" URL: https://spacevim.org
|
||||
" License: GPLv3
|
||||
"=============================================================================
|
||||
|
||||
""
|
||||
" @section Introduction, intro
|
||||
" @library
|
||||
" @order intro options config layers api faq changelog
|
||||
" git.vim is a simple plugin for using git in vim and neovim.
|
||||
" This plugin requires SpaceVim API and |job| support.
|
||||
|
||||
function! git#run(...)
|
||||
let cmd = get(a:000, 0, '')
|
||||
if cmd ==# 'add'
|
||||
call git#add#run(a:000[1:])
|
||||
elseif cmd ==# 'push'
|
||||
call git#push#run(a:000[1:])
|
||||
elseif cmd ==# 'pull'
|
||||
call git#pull#run(a:000[1:])
|
||||
elseif cmd ==# 'status'
|
||||
call git#status#run(a:000[1:])
|
||||
elseif cmd ==# 'stash'
|
||||
call git#stash#run(a:000[1:])
|
||||
elseif cmd ==# 'config'
|
||||
call git#config#run(a:000[1:])
|
||||
elseif cmd ==# 'diff'
|
||||
call git#diff#run(a:000[1:])
|
||||
elseif cmd ==# 'log'
|
||||
call git#log#run(a:000[1:])
|
||||
elseif cmd ==# 'reflog'
|
||||
call git#reflog#run(a:000[1:])
|
||||
elseif cmd ==# 'reset'
|
||||
call git#reset#run(a:000[1:])
|
||||
elseif cmd ==# 'merge'
|
||||
call git#merge#run(a:000[1:])
|
||||
elseif cmd ==# 'blame'
|
||||
call git#blame#run(a:000[1:])
|
||||
elseif cmd ==# 'rebase'
|
||||
call git#rebase#run(a:000[1:])
|
||||
elseif cmd ==# 'fetch'
|
||||
call git#fetch#run(a:000[1:])
|
||||
elseif cmd ==# 'commit'
|
||||
call git#commit#run(a:000[1:])
|
||||
elseif cmd ==# 'branch'
|
||||
call git#branch#run(a:000[1:])
|
||||
elseif cmd ==# 'checkout'
|
||||
call git#checkout#run(a:000[1:])
|
||||
elseif cmd ==# '--log'
|
||||
let args = get(a:000, 1, '')
|
||||
if args ==# 'clear'
|
||||
call git#logger#clear()
|
||||
else
|
||||
call git#logger#view()
|
||||
endif
|
||||
else
|
||||
echohl WarningMsg
|
||||
echo 'Git ' . cmd . ' has not been implemented!'
|
||||
echohl None
|
||||
endif
|
||||
endfunction
|
||||
|
||||
|
||||
function! git#complete(ArgLead, CmdLine, CursorPos) abort
|
||||
let str = a:CmdLine[:a:CursorPos-1]
|
||||
if str =~# '^Git\s\+[a-zA-Z]*$'
|
||||
return join(['add', 'push', 'status', 'commit', 'diff',
|
||||
\ 'merge', 'rebase', 'branch', 'checkout',
|
||||
\ 'fetch', 'reset', 'log', 'config', 'reflog',
|
||||
\ 'blame', 'pull', 'stash',
|
||||
\ ],
|
||||
\ "\n")
|
||||
elseif str =~# '^Git\s\+add\s\+.*$'
|
||||
return git#add#complete(a:ArgLead, a:CmdLine, a:CursorPos)
|
||||
elseif str =~# '^Git\s\+push\s\+.*$'
|
||||
return git#push#complete(a:ArgLead, a:CmdLine, a:CursorPos)
|
||||
elseif str =~# '^Git\s\+diff\s\+.*$'
|
||||
return git#diff#complete(a:ArgLead, a:CmdLine, a:CursorPos)
|
||||
elseif str =~# '^Git\s\+blame\s\+.*$'
|
||||
return git#blame#complete(a:ArgLead, a:CmdLine, a:CursorPos)
|
||||
elseif str =~# '^Git\s\+merge\s\+.*$'
|
||||
return git#merge#complete(a:ArgLead, a:CmdLine, a:CursorPos)
|
||||
elseif str =~# '^Git\s\+log\s\+.*$'
|
||||
return git#log#complete(a:ArgLead, a:CmdLine, a:CursorPos)
|
||||
elseif str =~# '^Git\s\+branch\s\+.*$'
|
||||
return git#branch#complete(a:ArgLead, a:CmdLine, a:CursorPos)
|
||||
elseif str =~# '^Git\s\+checkout\s\+.*$'
|
||||
return git#checkout#complete(a:ArgLead, a:CmdLine, a:CursorPos)
|
||||
elseif str =~# '^Git\s\+fetch\s\+.*$'
|
||||
return git#fetch#complete(a:ArgLead, a:CmdLine, a:CursorPos)
|
||||
elseif str =~# '^Git\s\+stash\s\+.*$'
|
||||
return git#stash#complete(a:ArgLead, a:CmdLine, a:CursorPos)
|
||||
elseif str =~# '^Git\s\+config\s\+.*$'
|
||||
return git#config#complete(a:ArgLead, a:CmdLine, a:CursorPos)
|
||||
elseif str =~# '^Git\s\+reflog\s\+.*$'
|
||||
return git#reflog#complete(a:ArgLead, a:CmdLine, a:CursorPos)
|
||||
else
|
||||
return ''
|
||||
endif
|
||||
endfunction
|
||||
44
bundle/git.vim/autoload/git/add.vim
Normal file
44
bundle/git.vim/autoload/git/add.vim
Normal file
@ -0,0 +1,44 @@
|
||||
""
|
||||
" @section git-add, add
|
||||
" @parentsection commands
|
||||
" This commands is to add file contents to the index. For example, add current
|
||||
" file to the index.
|
||||
" >
|
||||
" :Git add %
|
||||
" <
|
||||
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
|
||||
function! git#add#run(files)
|
||||
|
||||
if len(a:files) == 1 && a:files[0] ==# '%'
|
||||
let cmd = ['git', 'add', expand('%')]
|
||||
else
|
||||
let cmd = ['git', 'add'] + a:files
|
||||
endif
|
||||
call git#logger#info('git-add cmd:' . string(cmd))
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ }
|
||||
\ )
|
||||
|
||||
endfunction
|
||||
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-add exit data:' . string(a:data))
|
||||
if a:data ==# 0
|
||||
if exists(':GitGutter')
|
||||
GitGutter
|
||||
endif
|
||||
echo 'done!'
|
||||
else
|
||||
echo 'failed!'
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! git#add#complete(ArgLead, CmdLine, CursorPos)
|
||||
|
||||
return "%\n" . join(getcompletion(a:ArgLead, 'file'), "\n")
|
||||
|
||||
endfunction
|
||||
161
bundle/git.vim/autoload/git/blame.vim
Normal file
161
bundle/git.vim/autoload/git/blame.vim
Normal file
@ -0,0 +1,161 @@
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
let s:BUFFER = SpaceVim#api#import('vim#buffer')
|
||||
let s:STRING = SpaceVim#api#import('data#string')
|
||||
|
||||
let s:blame_buffer_nr = -1
|
||||
let s:blame_show_buffer_nr = -1
|
||||
function! git#blame#run(...)
|
||||
if len(a:1) == 0
|
||||
let cmd = ['git', 'blame', '--line-porcelain', expand('%')]
|
||||
else
|
||||
let cmd = ['git', 'blame', '--line-porcelain'] + a:1
|
||||
endif
|
||||
let s:lines = []
|
||||
call git#logger#info('git-blame cmd:' . string(cmd))
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_stderr' : function('s:on_stderr'),
|
||||
\ 'on_stdout' : function('s:on_stdout'),
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ }
|
||||
\ )
|
||||
endfunction
|
||||
|
||||
function! s:on_stdout(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-blame stdout:' . data)
|
||||
endfor
|
||||
let s:lines += a:data
|
||||
endfunction
|
||||
function! s:on_stderr(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-blame stderr:' . data)
|
||||
endfor
|
||||
endfunction
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-blame exit data:' . string(a:data))
|
||||
let rst = s:parser(s:lines)
|
||||
if !empty(rst)
|
||||
if !bufexists(s:blame_buffer_nr)
|
||||
let s:blame_buffer_nr = s:openBlameWindow()
|
||||
endif
|
||||
call setbufvar(s:blame_buffer_nr, 'git_blame_info', rst)
|
||||
call s:BUFFER.buf_set_lines(s:blame_buffer_nr, 0 , -1, 0, map(deepcopy(rst), 's:STRING.fill(v:val.summary, 40) . repeat(" ", 4) . strftime("%Y %b %d %X", v:val.time)'))
|
||||
let fname = rst[0].filename
|
||||
if !bufexists(s:blame_show_buffer_nr)
|
||||
let s:blame_show_buffer_nr = s:openBlameShowWindow(fname)
|
||||
endif
|
||||
call s:BUFFER.buf_set_lines(s:blame_show_buffer_nr, 0 , -1, 0, map(deepcopy(rst), 'v:val.line'))
|
||||
endif
|
||||
endfunction
|
||||
|
||||
|
||||
function! s:openBlameWindow() abort
|
||||
tabedit git://blame
|
||||
normal! "_dd
|
||||
setl nobuflisted
|
||||
setl nomodifiable
|
||||
setl nonumber norelativenumber
|
||||
setl buftype=nofile
|
||||
setl scrollbind
|
||||
setf git-blame
|
||||
setlocal bufhidden=wipe
|
||||
nnoremap <buffer><silent> <Cr> :call <SID>open_previous()<CR>
|
||||
nnoremap <buffer><silent> <BS> :call <SID>back()<CR>
|
||||
nnoremap <buffer><silent> q :call <SID>close_blame_win()<CR>
|
||||
return bufnr('%')
|
||||
endfunction
|
||||
|
||||
function! s:openBlameShowWindow(fname) abort
|
||||
exe 'rightbelow vsplit git://blame:show/' . a:fname
|
||||
normal! "_dd
|
||||
setl nobuflisted
|
||||
setl nomodifiable
|
||||
setl scrollbind
|
||||
setl buftype=nofile
|
||||
setlocal bufhidden=wipe
|
||||
nnoremap <buffer><silent> q :bd!<CR>
|
||||
return bufnr('%')
|
||||
endfunction
|
||||
|
||||
function! s:close_blame_win() abort
|
||||
let s:blame_history = []
|
||||
call s:closeBlameShowWindow()
|
||||
q
|
||||
endfunction
|
||||
|
||||
function! s:closeBlameShowWindow() abort
|
||||
if bufexists(s:blame_show_buffer_nr)
|
||||
exe 'bd ' . s:blame_show_buffer_nr
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" revision
|
||||
" 1cca0b8676d664d2ea2f9b0756d41967fc8481fb 1 1 5
|
||||
" author Shidong Wang
|
||||
" author-mail <wsdjeg@outlook.com>
|
||||
" author-time 1578202864
|
||||
" author-tz +0800
|
||||
" committer Shidong Wang
|
||||
" committer-mail <wsdjeg@outlook.com>
|
||||
" committer-time 1578202864
|
||||
" committer-tz +0800
|
||||
" summary Add git blame support
|
||||
" filename autoload/git/blame.vim
|
||||
" let s:JOB = SpaceVim#api#import('job')
|
||||
function! s:parser(lines) abort
|
||||
let rst = []
|
||||
let obj = {}
|
||||
for line in a:lines
|
||||
if line =~# '^[a-zA-Z0-9]\{40}'
|
||||
call extend(obj, {'revision' : line[:39]})
|
||||
elseif line =~# '^summary'
|
||||
call extend(obj, {'summary' : line[8:]})
|
||||
elseif line =~# '^filename'
|
||||
call extend(obj, {'filename' : line[9:]})
|
||||
elseif line =~# '^previous'
|
||||
call extend(obj, {'previous' : line[9:48]})
|
||||
elseif line =~# '^committer-time'
|
||||
call extend(obj, {'time' : str2nr(line[15:])})
|
||||
elseif line =~# '^\t'
|
||||
call extend(obj, {'line' : line[1:]})
|
||||
if !empty(obj) && has_key(obj, 'summary') && has_key(obj, 'line')
|
||||
call add(rst, obj)
|
||||
endif
|
||||
let obj = {}
|
||||
endif
|
||||
endfor
|
||||
return rst
|
||||
endfunction
|
||||
|
||||
let s:blame_history = []
|
||||
|
||||
function! s:back() abort
|
||||
if empty(s:blame_history)
|
||||
echo 'No navigational history is found'
|
||||
return
|
||||
endif
|
||||
let [rev, fname] = remove(s:blame_history, -1)
|
||||
exe 'Git blame' rev fname
|
||||
endfunction
|
||||
|
||||
function! s:open_previous() abort
|
||||
let rst = get(b:, 'git_blame_info', [])
|
||||
if empty(rst)
|
||||
return
|
||||
endif
|
||||
let blame_info = rst[line('.') - 1]
|
||||
if has_key(blame_info, 'previous')
|
||||
call add(s:blame_history, [blame_info.revision, blame_info.filename])
|
||||
exe 'Git blame' blame_info.previous blame_info.filename
|
||||
else
|
||||
echo 'No related parent commit exists'
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! git#blame#complete(ArgLead, CmdLine, CursorPos)
|
||||
|
||||
return "%\n" . join(getcompletion(a:ArgLead, 'file'), "\n")
|
||||
|
||||
endfunction
|
||||
|
||||
72
bundle/git.vim/autoload/git/branch.vim
Normal file
72
bundle/git.vim/autoload/git/branch.vim
Normal file
@ -0,0 +1,72 @@
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
let s:STR = SpaceVim#api#import('data#string')
|
||||
|
||||
function! git#branch#run(args)
|
||||
if len(a:args) == 0
|
||||
call git#branch#manager#open()
|
||||
return
|
||||
else
|
||||
let cmd = ['git', 'branch'] + a:args
|
||||
endif
|
||||
call git#logger#info('git-branch cmd:' . string(cmd))
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_stderr' : function('s:on_stderr'),
|
||||
\ 'on_stdout' : function('s:on_stdout'),
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ }
|
||||
\ )
|
||||
|
||||
endfunction
|
||||
|
||||
function! s:on_stdout(id, data, event) abort
|
||||
for line in filter(a:data, '!empty(v:val)')
|
||||
exe 'Echo ' . line
|
||||
endfor
|
||||
endfunction
|
||||
|
||||
function! s:on_stderr(id, data, event) abort
|
||||
for line in filter(a:data, '!empty(v:val)')
|
||||
exe 'Echoerr ' . line
|
||||
endfor
|
||||
endfunction
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-branch exit data:' . string(a:data))
|
||||
if a:data ==# 0
|
||||
echo 'done!'
|
||||
else
|
||||
echo 'failed!'
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! git#branch#complete(ArgLead, CmdLine, CursorPos)
|
||||
|
||||
return "%\n" . join(getcompletion(a:ArgLead, 'file'), "\n")
|
||||
|
||||
endfunction
|
||||
|
||||
let s:branch = ''
|
||||
function! s:update_branch_name() abort
|
||||
let cmd = 'git rev-parse --abbrev-ref HEAD'
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_stdout' : function('s:on_stdout_show_branch'),
|
||||
\ }
|
||||
\ )
|
||||
endfunction
|
||||
function! s:on_stdout_show_branch(id, data, event) abort
|
||||
let b = s:STR.trim(join(a:data, ""))
|
||||
if !empty(b)
|
||||
let s:branch = b
|
||||
endif
|
||||
endfunction
|
||||
function! git#branch#current()
|
||||
if empty(s:branch)
|
||||
call s:update_branch_name()
|
||||
endif
|
||||
return s:branch
|
||||
endfunction
|
||||
|
||||
function! git#branch#detect()
|
||||
call s:update_branch_name()
|
||||
endfunction
|
||||
97
bundle/git.vim/autoload/git/branch/manager.vim
Normal file
97
bundle/git.vim/autoload/git/branch/manager.vim
Normal file
@ -0,0 +1,97 @@
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
let s:BUFFER = SpaceVim#api#import('vim#buffer')
|
||||
|
||||
function! git#branch#manager#open()
|
||||
call s:open_win()
|
||||
endfunction
|
||||
|
||||
let s:bufnr = 0
|
||||
function! s:open_win() abort
|
||||
if s:bufnr != 0 && bufexists(s:bufnr)
|
||||
exe 'bd ' . s:bufnr
|
||||
endif
|
||||
topleft vsplit __git_branch_manager__
|
||||
" @todo add win_getid api
|
||||
let s:winid = win_getid(winnr('#'))
|
||||
let lines = &columns * 30 / 100
|
||||
exe 'vertical resize ' . lines
|
||||
setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline nospell nonu norelativenumber winfixheight nomodifiable
|
||||
set filetype=SpaceVimGitBranchManager
|
||||
let s:bufnr = bufnr('%')
|
||||
call s:update()
|
||||
augroup git_branch_manager
|
||||
autocmd! * <buffer>
|
||||
autocmd WinEnter <buffer> call s:WinEnter()
|
||||
augroup END
|
||||
nnoremap <buffer><silent> <Enter> :call <SID>checkout_branch()<cr>
|
||||
endfunction
|
||||
function! s:WinEnter() abort
|
||||
let s:winid = win_getid(winnr('#'))
|
||||
endfunction
|
||||
function! s:checkout_branch() abort
|
||||
let line = getline('.')
|
||||
if line =~# '^\s\+\S\+'
|
||||
let branch = split(line)[0]
|
||||
exe 'Git checkout ' . branch
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! s:update() abort
|
||||
let s:branchs = []
|
||||
let cmd = ['git', 'branch', '--all']
|
||||
call git#logger#info('git-branch cmd:' . string(cmd))
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_stderr' : function('s:on_stderr'),
|
||||
\ 'on_stdout' : function('s:on_stdout'),
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ }
|
||||
\ )
|
||||
endfunction
|
||||
|
||||
function! s:update_buffer_context() abort
|
||||
let lines = []
|
||||
call add(lines, 'local')
|
||||
let remote = ''
|
||||
for branch in s:branchs
|
||||
if branch.remote != remote
|
||||
call add(lines, 'r:' . branch.remote)
|
||||
let remote = branch.remote
|
||||
endif
|
||||
call add(lines, ' ' . branch.name)
|
||||
endfor
|
||||
|
||||
call s:BUFFER.buf_set_lines(s:bufnr, 0 , -1, 0, lines)
|
||||
endfunction
|
||||
|
||||
function! s:on_stdout(id, data, event) abort
|
||||
for line in filter(a:data, '!empty(v:val)')
|
||||
call SpaceVim#logger#info('>>' . line)
|
||||
if stridx(line, 'remotes/') == -1
|
||||
let branch = {
|
||||
\ 'name': trim(line),
|
||||
\ 'remote': '',
|
||||
\ 'islocal': 1,
|
||||
\ }
|
||||
else
|
||||
let branch = {
|
||||
\ 'name': line[stridx(line, '/', 10) + 1 :],
|
||||
\ 'remote': split(line, '/')[1],
|
||||
\ 'islocal': 0,
|
||||
\ }
|
||||
endif
|
||||
call add(s:branchs, branch)
|
||||
endfor
|
||||
endfunction
|
||||
|
||||
function! s:on_stderr(id, data, event) abort
|
||||
for line in filter(a:data, '!empty(v:val)')
|
||||
exe 'Echoerr ' . line
|
||||
endfor
|
||||
endfunction
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-branch exit data:' . string(a:data))
|
||||
if a:data ==# 0
|
||||
call s:update_buffer_context()
|
||||
endif
|
||||
endfunction
|
||||
46
bundle/git.vim/autoload/git/checkout.vim
Normal file
46
bundle/git.vim/autoload/git/checkout.vim
Normal file
@ -0,0 +1,46 @@
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
|
||||
function! git#checkout#run(args)
|
||||
|
||||
let cmd = ['git', 'checkout'] + a:args
|
||||
call git#logger#info('git-checkout cmd:' . string(cmd))
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ }
|
||||
\ )
|
||||
|
||||
endfunction
|
||||
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-checkout exit data:' . string(a:data))
|
||||
if a:data ==# 0
|
||||
silent! checktime
|
||||
echo 'checkout done'
|
||||
call git#branch#detect()
|
||||
else
|
||||
echo 'failed!'
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! s:options() abort
|
||||
return join([
|
||||
\ '-m',
|
||||
\ '-b',
|
||||
\ ], "\n")
|
||||
endfunction
|
||||
|
||||
function! git#checkout#complete(ArgLead, CmdLine, CursorPos)
|
||||
if a:ArgLead =~# '^-'
|
||||
return s:options()
|
||||
endif
|
||||
let branchs = systemlist('git branch')
|
||||
if v:shell_error
|
||||
return ''
|
||||
else
|
||||
let branchs = join(map(filter(branchs, 'v:val !~ "^*"'), 'trim(v:val)'), "\n")
|
||||
return branchs
|
||||
endif
|
||||
|
||||
endfunction
|
||||
|
||||
128
bundle/git.vim/autoload/git/commit.vim
Normal file
128
bundle/git.vim/autoload/git/commit.vim
Normal file
@ -0,0 +1,128 @@
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
let s:BUFFER = SpaceVim#api#import('vim#buffer')
|
||||
|
||||
function! git#commit#run(...)
|
||||
if index(a:1, '-m') ==# -1
|
||||
let s:bufnr = s:openCommitBuffer()
|
||||
else
|
||||
let s:bufnr = -1
|
||||
endif
|
||||
let s:lines = []
|
||||
if empty(a:1)
|
||||
let cmd = ['git', '--no-pager', '-c',
|
||||
\ 'core.editor=cat', '-c',
|
||||
\ 'color.status=always',
|
||||
\ '-C',
|
||||
\ expand(getcwd(), ':p'),
|
||||
\ 'commit', '--edit']
|
||||
elseif index(a:1, '-m') != -1
|
||||
let cmd = ['git', '--no-pager', '-c',
|
||||
\ 'core.editor=cat', '-c',
|
||||
\ 'color.status=always',
|
||||
\ '-C',
|
||||
\ expand(getcwd(), ':p'),
|
||||
\ 'commit'] + a:1
|
||||
else
|
||||
let cmd = ['git', '--no-pager', '-c',
|
||||
\ 'core.editor=cat', '-c',
|
||||
\ 'color.status=always',
|
||||
\ '-C',
|
||||
\ expand(getcwd(), ':p'),
|
||||
\ 'commit',] + a:1
|
||||
endif
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_stderr' : function('s:on_stderr'),
|
||||
\ 'on_stdout' : function('s:on_stdout'),
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ }
|
||||
\ )
|
||||
endfunction
|
||||
|
||||
function! s:on_stdout(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-commit stdout:' . data)
|
||||
endfor
|
||||
let s:lines += a:data
|
||||
endfunction
|
||||
function! s:on_stderr(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-commit stderr:' . data)
|
||||
endfor
|
||||
" stderr should not be added to commit buffer
|
||||
" let s:lines += a:data
|
||||
endfunction
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-exit exit data:' . string(a:data))
|
||||
if s:bufnr == -1
|
||||
if a:data ==# 0
|
||||
echo 'commit done!'
|
||||
else
|
||||
echo 'commit failed!'
|
||||
endif
|
||||
else
|
||||
call s:BUFFER.buf_set_lines(s:bufnr, 0 , -1, 0, s:lines)
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! s:openCommitBuffer() abort
|
||||
10split git://commit
|
||||
normal! "_dd
|
||||
setlocal nobuflisted
|
||||
setlocal buftype=acwrite
|
||||
setlocal bufhidden=wipe
|
||||
setlocal noswapfile
|
||||
setlocal modifiable
|
||||
setf git-commit
|
||||
nnoremap <buffer><silent> q :bd!<CR>
|
||||
let b:git_commit_quitpre = 0
|
||||
|
||||
augroup git_commit_buffer
|
||||
autocmd! * <buffer>
|
||||
autocmd BufWriteCmd <buffer> call s:BufWriteCmd()
|
||||
autocmd QuitPre <buffer> call s:QuitPre()
|
||||
autocmd WinLeave <buffer> call s:WinLeave()
|
||||
autocmd WinEnter <buffer> let b:git_commit_quitpre = 0
|
||||
augroup END
|
||||
return bufnr('%')
|
||||
endfunction
|
||||
|
||||
" NOTE:
|
||||
" :w -- BufWriteCmd
|
||||
" <C-w>p -- WinLeave
|
||||
" :wq -- QuitPre -> BufWriteCmd -> WinLeave
|
||||
" fuck when run `:wq` the commit window will not be closed
|
||||
" @fixme what the fuck
|
||||
" :q -- QuitPre -> WinLeave
|
||||
function! s:BufWriteCmd() abort
|
||||
let commit_file = '.git\COMMIT_EDITMSG'
|
||||
call writefile(getline(1, '$'), commit_file)
|
||||
setlocal nomodified
|
||||
endfunction
|
||||
|
||||
function! s:QuitPre() abort
|
||||
let b:git_commit_quitpre = 1
|
||||
endfunction
|
||||
|
||||
function! s:WinLeave() abort
|
||||
if b:git_commit_quitpre == 1
|
||||
let cmd = ['git', 'commit', '-F', '-']
|
||||
let id = s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_exit' : function('s:on_commit_exit'),
|
||||
\ }
|
||||
\ )
|
||||
" line start with # should be ignored
|
||||
call s:JOB.send(id, filter(readfile('.git\COMMIT_EDITMSG'), 'v:val !~ "^\s*#"'))
|
||||
call s:JOB.chanclose(id, 'stdin')
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! s:on_commit_exit(id, data, event) abort
|
||||
call git#logger#info('git-commit exit data:' . string(a:data))
|
||||
if a:data ==# 0
|
||||
echo 'done!'
|
||||
else
|
||||
echo 'failed!'
|
||||
endif
|
||||
endfunction
|
||||
122
bundle/git.vim/autoload/git/config.vim
Normal file
122
bundle/git.vim/autoload/git/config.vim
Normal file
@ -0,0 +1,122 @@
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
let s:BUFFER = SpaceVim#api#import('vim#buffer')
|
||||
|
||||
function! git#config#run(argvs)
|
||||
|
||||
if empty(a:argvs)
|
||||
let cmd = ['git', 'config', '--list']
|
||||
else
|
||||
let cmd = ['git', 'config'] + a:argvs
|
||||
endif
|
||||
let s:lines = []
|
||||
call git#logger#info('git-config cmd:' . string(cmd))
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ 'on_stdout' : function('s:on_stdout'),
|
||||
\ }
|
||||
\ )
|
||||
|
||||
endfunction
|
||||
|
||||
function! s:on_stdout(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-config stdout:' . data)
|
||||
endfor
|
||||
let s:lines += a:data
|
||||
endfunction
|
||||
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-config exit data:' . string(a:data))
|
||||
if a:data ==# 0
|
||||
let s:bufnr = s:openConfigBuffer(len(s:lines))
|
||||
call s:BUFFER.buf_set_lines(s:bufnr, 0 , -1, 0, s:lines)
|
||||
else
|
||||
echo 'failed!'
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! s:openConfigBuffer(height) abort
|
||||
let h = a:height > 10 ? 10 : a:height
|
||||
exe h . 'split git://config'
|
||||
normal! "_dd
|
||||
setl nobuflisted
|
||||
setl nomodifiable
|
||||
setl nonumber norelativenumber
|
||||
setl buftype=nofile
|
||||
setf git-config
|
||||
nnoremap <buffer><silent> q :bd!<CR>
|
||||
return bufnr('%')
|
||||
endfunction
|
||||
|
||||
function! s:options() abort
|
||||
return join([
|
||||
\ '--global',
|
||||
\ '--user',
|
||||
\ ], "\n")
|
||||
endfunction
|
||||
|
||||
function! s:keys() abort
|
||||
return [
|
||||
\ 'http.sslcainfo',
|
||||
\ 'http.sslbackend',
|
||||
\ 'diff.astextplain.textconv',
|
||||
\ 'core.autocrlf',
|
||||
\ 'core.fscache',
|
||||
\ 'core.symlinks',
|
||||
\ 'credential.helper',
|
||||
\ 'user.name',
|
||||
\ 'user.email',
|
||||
\ 'user.signingkey',
|
||||
\ 'push.default',
|
||||
\ 'merge.tool',
|
||||
\ 'diff.tool',
|
||||
\ 'commit.tool',
|
||||
\ 'difftool.prompt',
|
||||
\ 'color.ui',
|
||||
\ 'color.branch',
|
||||
\ 'color.status',
|
||||
\ 'core.editor',
|
||||
\ 'core.excludesfile',
|
||||
\ 'core.autocrlf',
|
||||
\ 'core.filemode',
|
||||
\ 'core.safecrlf',
|
||||
\ 'core.ignorecase',
|
||||
\ 'mergetool.prompt',
|
||||
\ 'mergetool.vimdiff.cmd',
|
||||
\ 'http.postbuffer',
|
||||
\ 'core.repositoryformatversion',
|
||||
\ 'core.filemode',
|
||||
\ 'core.bare',
|
||||
\ 'core.logallrefupdates',
|
||||
\ 'core.symlinks',
|
||||
\ 'core.ignorecase',
|
||||
\ 'remote.origin.url',
|
||||
\ 'remote.origin.fetch',
|
||||
\ 'branch.master.remote',
|
||||
\ 'branch.master.merge',
|
||||
\ 'branch.dev.remote',
|
||||
\ 'branch.dev.merge',
|
||||
\ 'branch.develop.remote',
|
||||
\ 'branch.develop.merge',
|
||||
\ 'branch.notiapi.remote',
|
||||
\ 'branch.notiapi.merge',
|
||||
\ 'branch.rebase.remote',
|
||||
\ 'branch.rebase.merge']
|
||||
endfunction
|
||||
|
||||
function! git#config#complete(ArgLead, CmdLine, CursorPos)
|
||||
if a:ArgLead =~# '^-'
|
||||
return s:options()
|
||||
endif
|
||||
let str = a:CmdLine[:a:CursorPos-1]
|
||||
if str =~# '^Git\s\+config\s\+[^ ]*$' ||
|
||||
\ str =~# '^Git\s\+config\s\+--global\s\+[^ ]*$' ||
|
||||
\ str =~# '^Git\s\+config\s\+--user\s\+[^ ]*$'
|
||||
return join(s:keys(), "\n")
|
||||
else
|
||||
return ''
|
||||
endif
|
||||
|
||||
endfunction
|
||||
|
||||
68
bundle/git.vim/autoload/git/diff.vim
Normal file
68
bundle/git.vim/autoload/git/diff.vim
Normal file
@ -0,0 +1,68 @@
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
let s:BUFFER = SpaceVim#api#import('vim#buffer')
|
||||
|
||||
function! git#diff#run(...)
|
||||
if len(a:1) == 1 && a:1[0] ==# '%'
|
||||
let cmd = ['git', 'diff', expand('%')]
|
||||
else
|
||||
let cmd = ['git', 'diff'] + a:1
|
||||
endif
|
||||
let s:lines = []
|
||||
call git#logger#info('git-diff cmd:' . string(cmd))
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_stderr' : function('s:on_stderr'),
|
||||
\ 'on_stdout' : function('s:on_stdout'),
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ }
|
||||
\ )
|
||||
endfunction
|
||||
|
||||
function! s:on_stdout(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-diff stdout:' . data)
|
||||
endfor
|
||||
let s:lines += a:data
|
||||
endfunction
|
||||
function! s:on_stderr(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-diff stderr:' . data)
|
||||
endfor
|
||||
let s:lines += a:data
|
||||
endfunction
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-diff exit data:' . string(a:data))
|
||||
let s:bufnr = s:openDiffBuffer()
|
||||
call setbufvar(s:bufnr, 'modifiable', 1)
|
||||
call s:BUFFER.buf_set_lines(s:bufnr, 0 , -1, 0, s:lines)
|
||||
call setbufvar(s:bufnr, 'modifiable', 1)
|
||||
endfunction
|
||||
|
||||
|
||||
function! s:openDiffBuffer() abort
|
||||
10split git://diff
|
||||
normal! "_dd
|
||||
setl nobuflisted
|
||||
setl nomodifiable
|
||||
setl nonumber norelativenumber
|
||||
setl buftype=nofile
|
||||
setl bufhidden=wipe
|
||||
setf git-diff
|
||||
setl syntax=diff
|
||||
nnoremap <buffer><silent> q :call <SID>close_diff_window()<CR>
|
||||
return bufnr('%')
|
||||
endfunction
|
||||
|
||||
function! git#diff#complete(ArgLead, CmdLine, CursorPos)
|
||||
|
||||
return "%\n" . join(getcompletion(a:ArgLead, 'file'), "\n")
|
||||
|
||||
endfunction
|
||||
|
||||
function! s:close_diff_window() abort
|
||||
if winnr('$') > 1
|
||||
close
|
||||
else
|
||||
bd!
|
||||
endif
|
||||
endfunction
|
||||
47
bundle/git.vim/autoload/git/fetch.vim
Normal file
47
bundle/git.vim/autoload/git/fetch.vim
Normal file
@ -0,0 +1,47 @@
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
|
||||
function! git#fetch#run(args)
|
||||
|
||||
let cmd = ['git', 'fetch'] + a:args
|
||||
call git#logger#info('git-fetch cmd:' . string(cmd))
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ }
|
||||
\ )
|
||||
|
||||
endfunction
|
||||
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-fetch exit data:' . string(a:data))
|
||||
if a:data ==# 0
|
||||
echo 'fetch done!'
|
||||
else
|
||||
echo 'fetch failed!'
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! git#fetch#complete(ArgLead, CmdLine, CursorPos)
|
||||
|
||||
if a:ArgLead =~# '^-'
|
||||
return s:options()
|
||||
endif
|
||||
let str = a:CmdLine[:a:CursorPos-1]
|
||||
if str =~# '^Git\s\+fetch\s\+[^ ]*$'
|
||||
return join(s:remotes(), "\n")
|
||||
else
|
||||
return ''
|
||||
endif
|
||||
|
||||
endfunction
|
||||
|
||||
function! s:remotes() abort
|
||||
return map(systemlist('git remote'), 'trim(v:val)')
|
||||
endfunction
|
||||
|
||||
function! s:options() abort
|
||||
return join([
|
||||
\ '--all',
|
||||
\ '--multiple',
|
||||
\ ], "\n")
|
||||
endfunction
|
||||
125
bundle/git.vim/autoload/git/log.vim
Normal file
125
bundle/git.vim/autoload/git/log.vim
Normal file
@ -0,0 +1,125 @@
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
let s:BUFFER = SpaceVim#api#import('vim#buffer')
|
||||
|
||||
let g:git_log_pretty = "tformat:%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ad)%Creset"
|
||||
|
||||
function! git#log#run(...)
|
||||
if len(a:1) == 1 && a:1[0] ==# '%'
|
||||
let cmd = ['git', 'log', '--graph', '--date=relative', '--pretty=' . g:git_log_pretty, expand('%')]
|
||||
else
|
||||
let cmd = ['git', 'log', '--graph', '--date=relative', '--pretty=' . g:git_log_pretty] + a:1
|
||||
endif
|
||||
let s:bufnr = s:openLogBuffer()
|
||||
let s:lines = []
|
||||
call git#logger#info('git-log cmd:' . string(cmd))
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_stderr' : function('s:on_stderr'),
|
||||
\ 'on_stdout' : function('s:on_stdout'),
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ }
|
||||
\ )
|
||||
endfunction
|
||||
|
||||
function! s:on_stdout(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-log stdout:' . data)
|
||||
endfor
|
||||
let s:lines += filter(a:data, '!empty(v:val)')
|
||||
endfunction
|
||||
function! s:on_stderr(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-log stderr:' . data)
|
||||
endfor
|
||||
let s:lines += a:data
|
||||
endfunction
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-log exit data:' . string(a:data))
|
||||
call s:BUFFER.buf_set_lines(s:bufnr, 0 , -1, 0, s:lines)
|
||||
endfunction
|
||||
|
||||
function! s:openLogBuffer() abort
|
||||
let bp = bufnr('%')
|
||||
edit git://log
|
||||
normal! "_dd
|
||||
setl nobuflisted
|
||||
setl nomodifiable
|
||||
setl nonumber norelativenumber
|
||||
setl buftype=nofile
|
||||
setl bufhidden=wipe
|
||||
setf git-log
|
||||
nnoremap <buffer><silent> <Cr> :call <SID>show_commit()<CR>
|
||||
nnoremap <buffer><silent> q :call <SID>close_log_win()<CR>
|
||||
return bufnr('%')
|
||||
endfunction
|
||||
|
||||
function! git#log#complete(ArgLead, CmdLine, CursorPos)
|
||||
|
||||
return "%\n" . join(getcompletion(a:ArgLead, 'file'), "\n")
|
||||
|
||||
endfunction
|
||||
|
||||
let s:show_commit_buffer = -1
|
||||
function! s:show_commit() abort
|
||||
let commit = matchstr(getline('.'), '\(^*\s\+\)\@<=[a-z0-9A-Z]*')
|
||||
if empty(commit)
|
||||
return
|
||||
endif
|
||||
if !bufexists(s:show_commit_buffer)
|
||||
let s:show_commit_buffer = s:openShowCommitBuffer()
|
||||
endif
|
||||
let cmd = ['git', 'show', commit]
|
||||
let s:show_lines = []
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_stderr' : function('s:on_show_stderr'),
|
||||
\ 'on_stdout' : function('s:on_show_stdout'),
|
||||
\ 'on_exit' : function('s:on_show_exit'),
|
||||
\ }
|
||||
\ )
|
||||
endfunction
|
||||
|
||||
function! s:on_show_stdout(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-show stdout:' . data)
|
||||
endfor
|
||||
let s:show_lines += filter(a:data, '!empty(v:val)')
|
||||
endfunction
|
||||
function! s:on_show_stderr(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-show stderr:' . data)
|
||||
endfor
|
||||
let s:show_lines += filter(a:data, '!empty(v:val)')
|
||||
endfunction
|
||||
function! s:on_show_exit(id, data, event) abort
|
||||
call git#logger#info('git-show exit data:' . string(a:data))
|
||||
call s:BUFFER.buf_set_lines(s:show_commit_buffer, 0 , -1, 0, s:show_lines)
|
||||
endfunction
|
||||
function! s:openShowCommitBuffer() abort
|
||||
rightbelow vsplit git://show_commit
|
||||
normal! "_dd
|
||||
setl nobuflisted
|
||||
setl nomodifiable
|
||||
setl nonumber norelativenumber
|
||||
setl buftype=nofile
|
||||
setl bufhidden=wipe
|
||||
setf git-diff
|
||||
setl syntax=diff
|
||||
nnoremap <buffer><silent> q :q<CR>
|
||||
return bufnr('%')
|
||||
endfunction
|
||||
|
||||
function! s:close_log_win() abort
|
||||
call s:closeShowCommitWindow()
|
||||
try
|
||||
bp
|
||||
catch /^Vim\%((\a\+)\)\=:E85/
|
||||
bd
|
||||
endtry
|
||||
endfunction
|
||||
|
||||
function! s:closeShowCommitWindow() abort
|
||||
if bufexists(s:show_commit_buffer)
|
||||
exe 'bd ' . s:show_commit_buffer
|
||||
endif
|
||||
endfunction
|
||||
35
bundle/git.vim/autoload/git/logger.vim
Normal file
35
bundle/git.vim/autoload/git/logger.vim
Normal file
@ -0,0 +1,35 @@
|
||||
let s:LOG = SpaceVim#api#import('logger')
|
||||
|
||||
call s:LOG.set_name('git.vim')
|
||||
call s:LOG.set_level(1)
|
||||
call s:LOG.set_silent(1)
|
||||
call s:LOG.set_verbose(1)
|
||||
|
||||
function! git#logger#info(msg)
|
||||
|
||||
call s:LOG.info(a:msg)
|
||||
|
||||
endfunction
|
||||
|
||||
|
||||
function! git#logger#view()
|
||||
let info = "### git.vim runtime log :\n\n"
|
||||
let info .= "```log\n"
|
||||
|
||||
let info .= s:LOG.view(s:LOG.level)
|
||||
|
||||
let info .= "\n```\n"
|
||||
tabnew +setl\ nobuflisted
|
||||
nnoremap <buffer><silent> q :bd!<CR>
|
||||
for msg in split(info, "\n")
|
||||
call append(line('$'), msg)
|
||||
endfor
|
||||
normal! "_dd
|
||||
setl nomodifiable
|
||||
setl buftype=nofile
|
||||
setl filetype=markdown
|
||||
endfunction
|
||||
|
||||
function! git#logger#clear() abort
|
||||
call s:LOG.clear(1)
|
||||
endfunction
|
||||
135
bundle/git.vim/autoload/git/merge.vim
Normal file
135
bundle/git.vim/autoload/git/merge.vim
Normal file
@ -0,0 +1,135 @@
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
|
||||
function! git#merge#run(args)
|
||||
if len(a:args) == 0
|
||||
finish
|
||||
else
|
||||
let cmd = ['git', 'merge'] + a:args
|
||||
endif
|
||||
call git#logger#info('git-merge cmd:' . string(cmd))
|
||||
let s:conflict_files = []
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_stderr' : function('s:on_stderr'),
|
||||
\ 'on_stdout' : function('s:on_stdout'),
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ }
|
||||
\ )
|
||||
|
||||
endfunction
|
||||
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-merge exit data:' . string(a:data))
|
||||
if a:data ==# 0
|
||||
echo 'merged done!'
|
||||
else
|
||||
call s:list_conflict_files()
|
||||
echo 'merged failed!'
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! s:on_stdout(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-merge stdout:' . data)
|
||||
if data =~# '^CONFLICT'
|
||||
" CONFLICT (content): Merge conflict in test.txt
|
||||
let file = data[38:]
|
||||
call add(s:conflict_files, file)
|
||||
endif
|
||||
endfor
|
||||
endfunction
|
||||
|
||||
function! s:on_stderr(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-merge stderr:' . data)
|
||||
endfor
|
||||
" stderr should not be added to commit buffer
|
||||
" let s:lines += a:data
|
||||
endfunction
|
||||
|
||||
function! s:list_conflict_files() abort
|
||||
if !empty(s:conflict_files)
|
||||
let rst = []
|
||||
for file in s:conflict_files
|
||||
call add(rst, {
|
||||
\ 'filename' : fnamemodify(file, ':p'),
|
||||
\ })
|
||||
endfor
|
||||
call setqflist([], 'r', {'title': ' ' . len(rst) . ' items',
|
||||
\ 'items' : rst
|
||||
\ })
|
||||
botright copen
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" usage: git merge [<options>] [<commit>...]
|
||||
" or: git merge --abort
|
||||
" or: git merge --continue
|
||||
"
|
||||
" -n do not show a diffstat at the end of the merge
|
||||
" --stat show a diffstat at the end of the merge
|
||||
" --summary (synonym to --stat)
|
||||
" --log[=<n>] add (at most <n>) entries from shortlog to merge commit message
|
||||
" --squash create a single commit instead of doing a merge
|
||||
" --commit perform a commit if the merge succeeds (default)
|
||||
" -e, --edit edit message before committing
|
||||
" --cleanup <mode> how to strip spaces and #comments from message
|
||||
" --ff allow fast-forward (default)
|
||||
" --ff-only abort if fast-forward is not possible
|
||||
" --rerere-autoupdate update the index with reused conflict resolution if possible
|
||||
" --verify-signatures verify that the named commit has a valid GPG signature
|
||||
" -s, --strategy <strategy>
|
||||
" merge strategy to use
|
||||
" -X, --strategy-option <option=value>
|
||||
" option for selected merge strategy
|
||||
" -m, --message <message>
|
||||
" merge commit message (for a non-fast-forward merge)
|
||||
" -F, --file <path> read message from file
|
||||
" -v, --verbose be more verbose
|
||||
" -q, --quiet be more quiet
|
||||
" --abort abort the current in-progress merge
|
||||
" --quit --abort but leave index and working tree alone
|
||||
" --continue continue the current in-progress merge
|
||||
" --allow-unrelated-histories
|
||||
" allow merging unrelated histories
|
||||
" --progress force progress reporting
|
||||
" -S, --gpg-sign[=<key-id>]
|
||||
" GPG sign commit
|
||||
" --overwrite-ignore update ignored files (default)
|
||||
" --signoff add Signed-off-by:
|
||||
" --no-verify bypass pre-merge-commit and commit-msg hooks
|
||||
|
||||
|
||||
function! s:args_with_two() abort
|
||||
return join([
|
||||
\ '--stat',
|
||||
\ '--edit',
|
||||
\ '--ff',
|
||||
\ '--ff-only',
|
||||
\ '--abort',
|
||||
\ ], "\n")
|
||||
endfunction
|
||||
|
||||
function! s:args_with_one() abort
|
||||
return join([
|
||||
\ '-m',
|
||||
\ '-e',
|
||||
\ ], "\n")
|
||||
|
||||
endfunction
|
||||
|
||||
function! git#merge#complete(ArgLead, CmdLine, CursorPos)
|
||||
if a:ArgLead =~# '^--'
|
||||
return s:args_with_two()
|
||||
elseif a:ArgLead =~# '^-'
|
||||
return s:args_with_one()
|
||||
endif
|
||||
|
||||
return join(s:unmerged_branchs(), "\n")
|
||||
|
||||
endfunction
|
||||
|
||||
function! s:unmerged_branchs() abort
|
||||
return map(systemlist('git branch --no-merged'), 'trim(v:val)')
|
||||
endfunction
|
||||
|
||||
84
bundle/git.vim/autoload/git/pull.vim
Normal file
84
bundle/git.vim/autoload/git/pull.vim
Normal file
@ -0,0 +1,84 @@
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
|
||||
function! git#pull#run(args)
|
||||
let cmd = ['git', 'pull'] + a:args
|
||||
call git#logger#info('git-pull cmd:' . string(cmd))
|
||||
let s:conflict_files = []
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_stderr' : function('s:on_stderr'),
|
||||
\ 'on_stdout' : function('s:on_stdout'),
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ }
|
||||
\ )
|
||||
|
||||
endfunction
|
||||
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-pull exit data:' . string(a:data))
|
||||
if a:data ==# 0
|
||||
echo 'pulled done!'
|
||||
else
|
||||
call s:list_conflict_files()
|
||||
echo 'pulled failed!'
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! s:on_stdout(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-pull stdout:' . data)
|
||||
if data =~# '^CONFLICT'
|
||||
" CONFLICT (content): Merge conflict in test.txt
|
||||
let file = data[38:]
|
||||
call add(s:conflict_files, file)
|
||||
endif
|
||||
endfor
|
||||
endfunction
|
||||
|
||||
function! s:on_stderr(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-pull stderr:' . data)
|
||||
endfor
|
||||
" stderr should not be added to commit buffer
|
||||
" let s:lines += a:data
|
||||
endfunction
|
||||
|
||||
function! s:list_conflict_files() abort
|
||||
if !empty(s:conflict_files)
|
||||
let rst = []
|
||||
for file in s:conflict_files
|
||||
call add(rst, {
|
||||
\ 'filename' : fnamemodify(file, ':p'),
|
||||
\ })
|
||||
endfor
|
||||
call setqflist([], 'r', {'title': ' ' . len(rst) . ' conflict files',
|
||||
\ 'items' : rst
|
||||
\ })
|
||||
botright copen
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! s:args_with_two() abort
|
||||
return join([
|
||||
\ '--all',
|
||||
\ ], "\n")
|
||||
endfunction
|
||||
|
||||
function! s:args_with_one() abort
|
||||
return join([
|
||||
\ '-a',
|
||||
\ '-f',
|
||||
\ ], "\n")
|
||||
|
||||
endfunction
|
||||
|
||||
function! git#pull#complete(ArgLead, CmdLine, CursorPos)
|
||||
if a:ArgLead =~# '^--'
|
||||
return s:args_with_two()
|
||||
elseif a:ArgLead =~# '^-'
|
||||
return s:args_with_one()
|
||||
endif
|
||||
|
||||
return ''
|
||||
|
||||
endfunction
|
||||
79
bundle/git.vim/autoload/git/push.vim
Normal file
79
bundle/git.vim/autoload/git/push.vim
Normal file
@ -0,0 +1,79 @@
|
||||
"=============================================================================
|
||||
" push.vim --- push command for git.vim
|
||||
" Copyright (c) 2016-2019 Wang Shidong & Contributors
|
||||
" Author: Wang Shidong < wsdjeg@outlook.com >
|
||||
" License: GPLv3
|
||||
"=============================================================================
|
||||
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
let s:NOTI =SpaceVim#api#import('notification')
|
||||
|
||||
function! git#push#run(...)
|
||||
|
||||
let cmd = ['git', 'push']
|
||||
if len(a:1) > 0
|
||||
let cmd += a:1
|
||||
endif
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_stdout' : function('s:on_stdout'),
|
||||
\ 'on_stderr' : function('s:on_stderr'),
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ }
|
||||
\ )
|
||||
|
||||
endfunction
|
||||
|
||||
function! s:on_exit(...) abort
|
||||
let data = get(a:000, 2)
|
||||
if data != 0
|
||||
echo 'failed!'
|
||||
else
|
||||
echo 'done!'
|
||||
endif
|
||||
endfunction
|
||||
|
||||
|
||||
function! s:on_stdout(id, data, event) abort
|
||||
for line in filter(a:data, '!empty(v:val)')
|
||||
call s:NOTI.notification(line, 'Normal')
|
||||
endfor
|
||||
endfunction
|
||||
|
||||
function! s:on_stderr(id, data, event) abort
|
||||
for line in filter(a:data, '!empty(v:val)')
|
||||
call s:NOTI.notification(line, 'WarningMsg')
|
||||
endfor
|
||||
endfunction
|
||||
|
||||
function! s:options() abort
|
||||
return [
|
||||
\ '-u',
|
||||
\ ]
|
||||
endfunction
|
||||
|
||||
function! git#push#complete(ArgLead, CmdLine, CursorPos)
|
||||
let str = a:CmdLine[:a:CursorPos-1]
|
||||
if str =~# '^Git\s\+push\s\+-$'
|
||||
return join(s:options(), "\n")
|
||||
elseif str =~# '^Git\s\+push\s\+[^ ]*$' || str =~# '^Git\s\+push\s\+-u\s\+[^ ]*$'
|
||||
return join(s:remotes(), "\n")
|
||||
else
|
||||
let remote = matchstr(str, '\(Git\s\+push\s\+\)\@<=[^ ]*')
|
||||
return s:remote_branch(remote)
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! s:remotes() abort
|
||||
return map(systemlist('git remote'), 'trim(v:val)')
|
||||
endfunction
|
||||
|
||||
function! s:remote_branch(remote) abort
|
||||
let branchs = systemlist('git branch -a')
|
||||
if v:shell_error
|
||||
return ''
|
||||
else
|
||||
let branchs = join(map(filter(branchs, 'v:val =~ "\s*remotes/" . a:remote . "/[^ ]*$"'), 'trim(v:val)[len(a:remote) + 9:]'), "\n")
|
||||
return branchs
|
||||
endif
|
||||
endfunction
|
||||
105
bundle/git.vim/autoload/git/rebase.vim
Normal file
105
bundle/git.vim/autoload/git/rebase.vim
Normal file
@ -0,0 +1,105 @@
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
let s:BUFFER = SpaceVim#api#import('vim#buffer')
|
||||
|
||||
function! git#rebase#run(...) abort
|
||||
let s:bufnr = s:openRebaseCommitBuffer()
|
||||
let s:lines = []
|
||||
if !empty(a:1)
|
||||
let cmd = ['git', '--no-pager', '-c',
|
||||
\ 'core.editor=cat', '-c',
|
||||
\ 'color.status=always',
|
||||
\ '-C',
|
||||
\ expand(getcwd(), ':p'),
|
||||
\ 'rebase'] + a:1
|
||||
else
|
||||
finish
|
||||
endif
|
||||
call git#logger#info('git-rebase cmd:' . string(cmd))
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_stderr' : function('s:on_stderr'),
|
||||
\ 'on_stdout' : function('s:on_stdout'),
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ }
|
||||
\ )
|
||||
endfunction
|
||||
|
||||
function! s:on_stdout(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-rebase stdout:' . data)
|
||||
endfor
|
||||
let s:lines += a:data
|
||||
endfunction
|
||||
function! s:on_stderr(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-rebase stderr:' . data)
|
||||
endfor
|
||||
" stderr should not be added to commit buffer
|
||||
" let s:lines += a:data
|
||||
endfunction
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-rebase exit data:' . string(a:data))
|
||||
call s:BUFFER.buf_set_lines(s:bufnr, 0 , -1, 0, s:lines)
|
||||
endfunction
|
||||
|
||||
function! s:openRebaseCommitBuffer() abort
|
||||
10split git://rebase
|
||||
normal! "_dd
|
||||
setlocal nobuflisted
|
||||
setlocal buftype=acwrite
|
||||
setlocal bufhidden=wipe
|
||||
setlocal noswapfile
|
||||
setlocal modifiable
|
||||
setf git-rebase
|
||||
nnoremap <buffer><silent> q :bd!<CR>
|
||||
let b:git_rebase_quitpre = 0
|
||||
|
||||
augroup git_commit_buffer
|
||||
autocmd! * <buffer>
|
||||
autocmd BufWriteCmd <buffer> call s:BufWriteCmd()
|
||||
autocmd QuitPre <buffer> call s:QuitPre()
|
||||
autocmd WinLeave <buffer> call s:WinLeave()
|
||||
autocmd WinEnter <buffer> let b:git_rebase_quitpre = 0
|
||||
augroup END
|
||||
return bufnr('%')
|
||||
endfunction
|
||||
|
||||
" NOTE:
|
||||
" :w -- BufWriteCmd
|
||||
" <C-w>p -- WinLeave
|
||||
" :wq -- QuitPre -> BufWriteCmd -> WinLeave
|
||||
" fuck when run `:wq` the commit window will not be closed
|
||||
" @fixme what the fuck
|
||||
" :q -- QuitPre -> WinLeave
|
||||
function! s:BufWriteCmd() abort
|
||||
let commit_file = '.git\COMMIT_EDITMSG'
|
||||
call writefile(getline(1, '$'), commit_file)
|
||||
setlocal nomodified
|
||||
endfunction
|
||||
|
||||
function! s:QuitPre() abort
|
||||
let b:git_rebase_quitpre = 1
|
||||
endfunction
|
||||
|
||||
function! s:WinLeave() abort
|
||||
if b:git_rebase_quitpre == 1
|
||||
let cmd = ['git', 'rebase', '--continue']
|
||||
call git#logger#info('git-rebase cmd:' . string(cmd))
|
||||
let id = s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_exit' : function('s:on_rebase_continue'),
|
||||
\ }
|
||||
\ )
|
||||
" line start with # should be ignored
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! s:on_rebase_continue(id, data, event) abort
|
||||
call git#logger#info('git-rebase exit data:' . string(a:data))
|
||||
if a:data ==# 0
|
||||
echo 'done!'
|
||||
else
|
||||
echo 'failed!'
|
||||
endif
|
||||
endfunction
|
||||
|
||||
72
bundle/git.vim/autoload/git/reflog.vim
Normal file
72
bundle/git.vim/autoload/git/reflog.vim
Normal file
@ -0,0 +1,72 @@
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
let s:BUFFER = SpaceVim#api#import('vim#buffer')
|
||||
|
||||
function! git#reflog#run(args)
|
||||
let cmd = ['git', 'reflog'] + a:args
|
||||
let s:bufnr = s:openRefLogBuffer()
|
||||
let s:lines = []
|
||||
call git#logger#info('git-reflog cmd:' . string(cmd))
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_stderr' : function('s:on_stderr'),
|
||||
\ 'on_stdout' : function('s:on_stdout'),
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ }
|
||||
\ )
|
||||
endfunction
|
||||
|
||||
function! s:on_stdout(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-reflog stdout:' . data)
|
||||
endfor
|
||||
let s:lines += filter(a:data, '!empty(v:val)')
|
||||
endfunction
|
||||
function! s:on_stderr(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-reflog stderr:' . data)
|
||||
endfor
|
||||
let s:lines += a:data
|
||||
endfunction
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-reflog exit data:' . string(a:data))
|
||||
call s:BUFFER.buf_set_lines(s:bufnr, 0 , -1, 0, s:lines)
|
||||
endfunction
|
||||
|
||||
function! s:openRefLogBuffer() abort
|
||||
let bp = bufnr('%')
|
||||
edit git://reflog
|
||||
normal! "_dd
|
||||
setl nobuflisted
|
||||
setl nomodifiable
|
||||
setl nonumber norelativenumber
|
||||
setl buftype=nofile
|
||||
setl bufhidden=wipe
|
||||
setf git-reflog
|
||||
exe 'nnoremap <buffer><silent> q :b' . bp . '<Cr>'
|
||||
return bufnr('%')
|
||||
endfunction
|
||||
|
||||
function! s:subcommands() abort
|
||||
return ['show', 'expire', 'delete', 'exists']
|
||||
endfunction
|
||||
|
||||
function! s:show_options() abort
|
||||
return []
|
||||
endfunction
|
||||
|
||||
function! s:expire_options() abort
|
||||
return ['--all', '--single-worktree']
|
||||
endfunction
|
||||
|
||||
function! git#reflog#complete(ArgLead, CmdLine, CursorPos)
|
||||
let str = a:CmdLine[:a:CursorPos-1]
|
||||
if str =~# '^Git\s\+reflog\s\+[^ ]*$'
|
||||
return join(s:subcommands(), "\n")
|
||||
elseif str =~# '^Git\s\+reflog\s\+show\s\+-'
|
||||
return join(s:show_options(), "\n")
|
||||
elseif str =~# '^Git\s\+reflog\s\+expire\s\+-'
|
||||
return join(s:expire_options(), "\n")
|
||||
else
|
||||
return ''
|
||||
endif
|
||||
endfunction
|
||||
37
bundle/git.vim/autoload/git/reset.vim
Normal file
37
bundle/git.vim/autoload/git/reset.vim
Normal file
@ -0,0 +1,37 @@
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
|
||||
|
||||
function! git#reset#run(args)
|
||||
|
||||
if len(a:args) == 1 && a:args[0] ==# '%'
|
||||
let cmd = ['git', 'reset', 'HEAD', expand('%')]
|
||||
else
|
||||
let cmd = ['git', 'reset'] + a:args
|
||||
endif
|
||||
call git#logger#info('git-reset cmd:' . string(cmd))
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ }
|
||||
\ )
|
||||
|
||||
endfunction
|
||||
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-reset exit data:' . string(a:data))
|
||||
if a:data ==# 0
|
||||
if exists(':GitGutter')
|
||||
GitGutter
|
||||
endif
|
||||
echo 'done!'
|
||||
else
|
||||
echo 'failed!'
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! git#reset#complete(ArgLead, CmdLine, CursorPos)
|
||||
|
||||
return "%\n" . join(getcompletion(a:ArgLead, 'file'), "\n")
|
||||
|
||||
endfunction
|
||||
|
||||
143
bundle/git.vim/autoload/git/stash.vim
Normal file
143
bundle/git.vim/autoload/git/stash.vim
Normal file
@ -0,0 +1,143 @@
|
||||
""
|
||||
" @section git-stash, stash
|
||||
" @parentsection commands
|
||||
" This commands is to manage git stash.
|
||||
" >
|
||||
" :Git stash list
|
||||
" <
|
||||
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
let s:NOTI =SpaceVim#api#import('notification')
|
||||
let s:BUFFER = SpaceVim#api#import('vim#buffer')
|
||||
|
||||
|
||||
let s:stash_show_bufnr = -1
|
||||
|
||||
function! git#stash#run(args)
|
||||
|
||||
let cmd = ['git', 'stash'] + a:args
|
||||
let subcmd = get(a:args, 0, '')
|
||||
if !empty(subcmd) && index(['drop', 'show'], subcmd) > -1
|
||||
let subcmd = subcmd . '_'
|
||||
else
|
||||
let subcmd = ''
|
||||
endif
|
||||
|
||||
call git#logger#info('git-stash cmd:' . string(cmd))
|
||||
let s:lines = []
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_stderr' : function('s:on_' . subcmd . 'stderr'),
|
||||
\ 'on_stdout' : function('s:on_' . subcmd . 'stdout'),
|
||||
\ 'on_exit' : function('s:on_' . subcmd . 'exit'),
|
||||
\ }
|
||||
\ )
|
||||
endfunction
|
||||
|
||||
function! s:on_stdout(id, data, event) abort
|
||||
for line in filter(a:data, '!empty(v:val)')
|
||||
call git#logger#info('git-stash stdout:' . line)
|
||||
call s:NOTI.notification(line, 'Normal')
|
||||
endfor
|
||||
endfunction
|
||||
|
||||
function! s:on_stderr(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-stash stderr:' . data)
|
||||
endfor
|
||||
endfunction
|
||||
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-stash exit data:' . string(a:data))
|
||||
if a:data ==# 0
|
||||
" echo 'done!'
|
||||
else
|
||||
" echo 'failed!'
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! s:on_drop_stdout(id, data, event) abort
|
||||
for line in filter(a:data, '!empty(v:val)')
|
||||
call git#logger#info('git-stash stdout:' . line)
|
||||
call s:NOTI.notification(line, 'Normal')
|
||||
endfor
|
||||
endfunction
|
||||
|
||||
function! s:on_drop_stderr(id, data, event) abort
|
||||
for line in filter(a:data, '!empty(v:val)')
|
||||
call git#logger#info('git-stash stdout:' . line)
|
||||
call s:NOTI.notification(line, 'WarningMsg')
|
||||
endfor
|
||||
endfunction
|
||||
|
||||
function! s:on_drop_exit(id, data, event) abort
|
||||
call git#logger#info('git-stash exit data:' . string(a:data))
|
||||
if a:data ==# 0
|
||||
" echo 'done!'
|
||||
else
|
||||
" echo 'failed!'
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! s:on_show_stdout(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-stash stdout:' . data)
|
||||
endfor
|
||||
let s:lines += a:data
|
||||
endfunction
|
||||
|
||||
function! s:on_show_stderr(id, data, event) abort
|
||||
for line in filter(a:data, '!empty(v:val)')
|
||||
call git#logger#info('git-stash stdout:' . line)
|
||||
call s:NOTI.notification(line, 'WarningMsg')
|
||||
endfor
|
||||
endfunction
|
||||
|
||||
function! s:on_show_exit(id, data, event) abort
|
||||
call git#logger#info('git-stash exit data:' . string(a:data))
|
||||
if a:data ==# 0
|
||||
if !bufexists(s:stash_show_bufnr)
|
||||
let s:stash_show_bufnr = s:openStashShowBuffer()
|
||||
endif
|
||||
call s:BUFFER.buf_set_lines(s:stash_show_bufnr, 0 , -1, 0, s:lines)
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! s:openStashShowBuffer() abort
|
||||
edit git://blame
|
||||
normal! "_dd
|
||||
setl nobuflisted
|
||||
setl nomodifiable
|
||||
setl nonumber norelativenumber
|
||||
setl buftype=nofile
|
||||
setf git-diff
|
||||
setl syntax=diff
|
||||
nnoremap <buffer><silent> q :bd!<CR>
|
||||
return bufnr('%')
|
||||
endfunction
|
||||
|
||||
function! s:sub_commands() abort
|
||||
return join([
|
||||
\ 'list',
|
||||
\ 'show',
|
||||
\ 'drop',
|
||||
\ 'pop', 'apply',
|
||||
\ 'branch',
|
||||
\ 'clear',
|
||||
\ 'save',
|
||||
\ 'push',
|
||||
\ ],
|
||||
\ "\n")
|
||||
endfunction
|
||||
|
||||
function! git#stash#complete(ArgLead, CmdLine, CursorPos)
|
||||
|
||||
let str = a:CmdLine[:a:CursorPos-1]
|
||||
if str =~# '^Git\s\+stash\s\+[a-z]\=$'
|
||||
return s:sub_commands()
|
||||
else
|
||||
return ''
|
||||
endif
|
||||
|
||||
endfunction
|
||||
|
||||
56
bundle/git.vim/autoload/git/status.vim
Normal file
56
bundle/git.vim/autoload/git/status.vim
Normal file
@ -0,0 +1,56 @@
|
||||
let s:JOB = SpaceVim#api#import('job')
|
||||
let s:BUFFER = SpaceVim#api#import('vim#buffer')
|
||||
|
||||
function! git#status#run(...)
|
||||
let s:bufnr = s:openStatusBuffer()
|
||||
let cmd = ['git', 'status', '.']
|
||||
let s:lines = []
|
||||
call git#logger#info('git-status cmd:' . string(cmd))
|
||||
call s:JOB.start(cmd,
|
||||
\ {
|
||||
\ 'on_stderr' : function('s:on_stderr'),
|
||||
\ 'on_stdout' : function('s:on_stdout'),
|
||||
\ 'on_exit' : function('s:on_exit'),
|
||||
\ }
|
||||
\ )
|
||||
endfunction
|
||||
|
||||
function! s:on_stdout(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-status stdout:' . data)
|
||||
endfor
|
||||
let s:lines += a:data
|
||||
endfunction
|
||||
function! s:on_stderr(id, data, event) abort
|
||||
for data in a:data
|
||||
call git#logger#info('git-status stderr:' . data)
|
||||
endfor
|
||||
let s:lines += a:data
|
||||
endfunction
|
||||
function! s:on_exit(id, data, event) abort
|
||||
call git#logger#info('git-status exit data:' . string(a:data))
|
||||
call s:BUFFER.buf_set_lines(s:bufnr, 0 , -1, 0, s:lines)
|
||||
endfunction
|
||||
|
||||
|
||||
function! s:openStatusBuffer() abort
|
||||
10split git://status
|
||||
normal! "_dd
|
||||
setl nobuflisted
|
||||
setl nomodifiable
|
||||
setl nonumber norelativenumber
|
||||
setl buftype=nofile
|
||||
setl bufhidden=wipe
|
||||
setf git-status
|
||||
nnoremap <buffer><silent> q :call <SID>close_status_window()<CR>
|
||||
" https://github.com/vim/vim/commit/a8eee21e75324d199acb1663cb5009e03014a13a
|
||||
return bufnr('%')
|
||||
endfunction
|
||||
|
||||
function! s:close_status_window() abort
|
||||
if winnr('$') > 1
|
||||
close
|
||||
else
|
||||
bd!
|
||||
endif
|
||||
endfunction
|
||||
41
bundle/git.vim/doc/git.txt
Normal file
41
bundle/git.vim/doc/git.txt
Normal file
@ -0,0 +1,41 @@
|
||||
*git.txt* Git support in vim
|
||||
Wang Shidong *git*
|
||||
|
||||
==============================================================================
|
||||
CONTENTS *git-contents*
|
||||
1. Introduction..................................................|git-intro|
|
||||
2. Commands...................................................|git-commands|
|
||||
1. git-add.....................................................|git-add|
|
||||
2. git-stash.................................................|git-stash|
|
||||
|
||||
==============================================================================
|
||||
INTRODUCTION *git-intro*
|
||||
|
||||
git.vim is a simple plugin for using git in vim and neovim. This plugin
|
||||
requires SpaceVim API and |job| support.
|
||||
|
||||
==============================================================================
|
||||
COMMANDS *git-commands*
|
||||
|
||||
:Git *:Git*
|
||||
Run git command asynchronously
|
||||
|
||||
==============================================================================
|
||||
GIT-ADD *git-add*
|
||||
|
||||
This commands is to add file contents to the index. For example, add current
|
||||
file to the index.
|
||||
>
|
||||
:Git add %
|
||||
<
|
||||
|
||||
==============================================================================
|
||||
GIT-STASH *git-stash*
|
||||
|
||||
This commands is to manage git stash.
|
||||
>
|
||||
:Git stash list
|
||||
<
|
||||
|
||||
|
||||
vim:tw=78:ts=8:ft=help:norl:
|
||||
15
bundle/git.vim/plugin/git.vim
Normal file
15
bundle/git.vim/plugin/git.vim
Normal file
@ -0,0 +1,15 @@
|
||||
"=============================================================================
|
||||
" git.vim --- git plugin for spacevim
|
||||
" Copyright (c) 2016-2019 Wang Shidong & Contributors
|
||||
" Author: Wang Shidong < wsdjeg@outlook.com >
|
||||
" URL: https://spacevim.org
|
||||
" License: GPLv3
|
||||
"=============================================================================
|
||||
|
||||
let g:loaded_git = 1
|
||||
|
||||
""
|
||||
" Run git command asynchronously
|
||||
command! -nargs=+ -complete=custom,git#complete Git call git#run(<f-args>)
|
||||
|
||||
call SpaceVim#plugins#projectmanager#reg_callback(function('git#branch#detect'))
|
||||
9
bundle/git.vim/syntax/git-blame.vim
Normal file
9
bundle/git.vim/syntax/git-blame.vim
Normal file
@ -0,0 +1,9 @@
|
||||
if exists('b:current_syntax')
|
||||
finish
|
||||
endif
|
||||
let b:current_syntax = 'git-blame'
|
||||
syntax case ignore
|
||||
syn match GitBlameTime /[^ ]*\s\+[^ ]*\s\+[^ ]*\s\+\d\+:\d\+:\d\+$/
|
||||
|
||||
hi def link GitBlameTime Statement
|
||||
|
||||
9
bundle/git.vim/syntax/git-commit.vim
Normal file
9
bundle/git.vim/syntax/git-commit.vim
Normal file
@ -0,0 +1,9 @@
|
||||
if exists('b:current_syntax')
|
||||
finish
|
||||
endif
|
||||
let b:current_syntax = 'git-commit'
|
||||
syntax case ignore
|
||||
syn match GitCommitIgnore /^\s*#.*/
|
||||
|
||||
hi def link GitCommitIgnore Comment
|
||||
|
||||
8
bundle/git.vim/syntax/git-config.vim
Normal file
8
bundle/git.vim/syntax/git-config.vim
Normal file
@ -0,0 +1,8 @@
|
||||
if exists('b:current_syntax')
|
||||
finish
|
||||
endif
|
||||
let b:current_syntax = 'git-config'
|
||||
syntax case ignore
|
||||
syn match GitConfigKey /.*\(=\)\@=/
|
||||
|
||||
hi def link GitConfigKey Statement
|
||||
12
bundle/git.vim/syntax/git-log.vim
Normal file
12
bundle/git.vim/syntax/git-log.vim
Normal file
@ -0,0 +1,12 @@
|
||||
if exists('b:current_syntax')
|
||||
finish
|
||||
endif
|
||||
let b:current_syntax = 'git-log'
|
||||
syntax case ignore
|
||||
syn match GitLogCommitHash /^[*|\\ \/]\+\zs[a-z0-9]\+/
|
||||
syn match GitLogCommitBranchLog /\(^*\s\+[a-z0-9A-Z]*\s\+-\s\+\)\@<=([^)]*)/
|
||||
syn match GitLogCommitAuthorDate /([^(]*)$/
|
||||
|
||||
hi def link GitLogCommitHash Statement
|
||||
hi def link GitLogCommitBranchLog Comment
|
||||
hi def link GitLogCommitAuthorDate Comment
|
||||
11
bundle/git.vim/syntax/git-rebase.vim
Normal file
11
bundle/git.vim/syntax/git-rebase.vim
Normal file
@ -0,0 +1,11 @@
|
||||
if exists('b:current_syntax')
|
||||
finish
|
||||
endif
|
||||
let b:current_syntax = 'git-rebase'
|
||||
syntax case ignore
|
||||
syn match GitRebaseIgnore /^\s*#.*/
|
||||
syn match GitRebaseKeyword /^pick\s/
|
||||
|
||||
hi def link GitRebaseIgnore Comment
|
||||
hi def link GitRebaseKeyword Statement
|
||||
|
||||
9
bundle/git.vim/syntax/git-reflog.vim
Normal file
9
bundle/git.vim/syntax/git-reflog.vim
Normal file
@ -0,0 +1,9 @@
|
||||
if exists('b:current_syntax')
|
||||
finish
|
||||
endif
|
||||
let b:current_syntax = 'git-reflog'
|
||||
syntax case ignore
|
||||
syn match GitLogCommitHash /^[a-z0-9A-Z]*/
|
||||
|
||||
hi def link GitLogCommitHash Statement
|
||||
|
||||
Loading…
Reference in New Issue
Block a user