Update 2024-12-23 00:29 OpenBSD/amd64-t14
This commit is contained in:
parent
e27a96f17e
commit
fa50579054
24
.vim/pack/plugins/start/vim-fugitive/CONTRIBUTING.markdown
Normal file
24
.vim/pack/plugins/start/vim-fugitive/CONTRIBUTING.markdown
Normal file
@ -0,0 +1,24 @@
|
||||
Before reporting a bug, you should try stripping down your Vim configuration
|
||||
and removing other plugins. The sad truth about VimScript is that it is
|
||||
fraught with incompatibilities waiting to happen. I'm happy to work around
|
||||
them where I can, but it's up to you to isolate the conflict.
|
||||
|
||||
Fugitive is particularly prone to regressions due to Git version issues,
|
||||
platform issues, and interactions with other plugins. I end up bisecting a
|
||||
lot more than other projects, and thus I'm especially meticulous here about
|
||||
maintaining a clean, readable, history. Squash and force push any requested
|
||||
changes to a pull request. And if your [commit message
|
||||
sucks](https://commit.style), I'm not going to accept it. Period.
|
||||
|
||||
If your contribution involves adding a configuration option, you are going to
|
||||
need a very compelling justification for it. Options add a maintenance
|
||||
burden, support burden, and documentation bloat, and oftentimes can be
|
||||
achieved much more simply with a custom map or autocommand. If your option
|
||||
controls an underlying Git command, ask yourself why Git itself does not offer
|
||||
such configuration.
|
||||
|
||||
Beyond that, don't be shy about asking before patching. What takes you hours
|
||||
might take me minutes simply because I have both domain knowledge and a
|
||||
perverse knowledge of VimScript so vast that many would consider it a symptom
|
||||
of mental illness. On the flip side, some ideas I'll reject no matter how
|
||||
good the implementation is. "Send a patch" is an edge case answer in my book.
|
137
.vim/pack/plugins/start/vim-fugitive/README.markdown
Normal file
137
.vim/pack/plugins/start/vim-fugitive/README.markdown
Normal file
@ -0,0 +1,137 @@
|
||||
# fugitive.vim
|
||||
|
||||
Fugitive is the premier Vim plugin for Git. Or maybe it's the premier Git
|
||||
plugin for Vim? Either way, it's "so awesome, it should be illegal". That's
|
||||
why it's called Fugitive.
|
||||
|
||||
The crown jewel of Fugitive is `:Git` (or just `:G`), which calls any
|
||||
arbitrary Git command. If you know how to use Git at the command line, you
|
||||
know how to use `:Git`. It's vaguely akin to `:!git` but with numerous
|
||||
improvements:
|
||||
|
||||
* The default behavior is to directly echo the command's output. Quiet
|
||||
commands like `:Git add` avoid the dreaded "Press ENTER or type command to
|
||||
continue" prompt.
|
||||
* `:Git commit`, `:Git rebase -i`, and other commands that invoke an editor do
|
||||
their editing in the current Vim instance.
|
||||
* `:Git diff`, `:Git log`, and other verbose, paginated commands have their
|
||||
output loaded into a temporary buffer. Force this behavior for any command
|
||||
with `:Git --paginate` or `:Git -p`.
|
||||
* `:Git blame` uses a temporary buffer with maps for additional triage. Press
|
||||
enter on a line to view the commit where the line changed, or `g?` to see
|
||||
other available maps. Omit the filename argument and the currently edited
|
||||
file will be blamed in a vertical, scroll-bound split.
|
||||
* `:Git mergetool` and `:Git difftool` load their changesets into the quickfix
|
||||
list.
|
||||
* Called with no arguments, `:Git` opens a summary window with dirty files and
|
||||
unpushed and unpulled commits. Press `g?` to bring up a list of maps for
|
||||
numerous operations including diffing, staging, committing, rebasing, and
|
||||
stashing. (This is the successor to the old `:Gstatus`.)
|
||||
* This command (along with all other commands) always uses the current
|
||||
buffer's repository, so you don't need to worry about the current working
|
||||
directory.
|
||||
|
||||
Additional commands are provided for higher level operations:
|
||||
|
||||
* View any blob, tree, commit, or tag in the repository with `:Gedit` (and
|
||||
`:Gsplit`, etc.). For example, `:Gedit HEAD~3:%` loads the current file as
|
||||
it existed 3 commits ago.
|
||||
* `:Gdiffsplit` (or `:Gvdiffsplit`) brings up the staged version of the file
|
||||
side by side with the working tree version. Use Vim's diff handling
|
||||
capabilities to apply changes to the staged version, and write that buffer
|
||||
to stage the changes. You can also give an arbitrary `:Gedit` argument to
|
||||
diff against older versions of the file.
|
||||
* `:Gread` is a variant of `git checkout -- filename` that operates on the
|
||||
buffer rather than the file itself. This means you can use `u` to undo it
|
||||
and you never get any warnings about the file changing outside Vim.
|
||||
* `:Gwrite` writes to both the work tree and index versions of a file, making
|
||||
it like `git add` when called from a work tree file and like `git checkout`
|
||||
when called from the index or a blob in history.
|
||||
* `:Ggrep` is `:grep` for `git grep`. `:Glgrep` is `:lgrep` for the same.
|
||||
* `:GMove` does a `git mv` on the current file and changes the buffer name to
|
||||
match. `:GRename` does the same with a destination filename relative to the
|
||||
current file's directory.
|
||||
* `:GDelete` does a `git rm` on the current file and simultaneously deletes
|
||||
the buffer. `:GRemove` does the same but leaves the (now empty) buffer
|
||||
open.
|
||||
* `:GBrowse` to open the current file on the web front-end of your favorite
|
||||
hosting provider, with optional line range (try it in visual mode). Plugins
|
||||
are available for popular providers such as [GitHub][rhubarb.vim],
|
||||
[GitLab][fugitive-gitlab.vim], [Bitbucket][fubitive.vim],
|
||||
[Gitee][fugitive-gitee.vim], [Pagure][pagure],
|
||||
[Phabricator][vim-phabricator], [Azure DevOps][fugitive-azure-devops.vim],
|
||||
and [sourcehut][srht.vim].
|
||||
|
||||
[rhubarb.vim]: https://github.com/tpope/vim-rhubarb
|
||||
[fugitive-gitlab.vim]: https://github.com/shumphrey/fugitive-gitlab.vim
|
||||
[fubitive.vim]: https://github.com/tommcdo/vim-fubitive
|
||||
[fugitive-gitee.vim]: https://github.com/linuxsuren/fugitive-gitee.vim
|
||||
[pagure]: https://github.com/FrostyX/vim-fugitive-pagure
|
||||
[vim-phabricator]: https://github.com/jparise/vim-phabricator
|
||||
[fugitive-azure-devops.vim]: https://github.com/cedarbaum/fugitive-azure-devops.vim
|
||||
[srht.vim]: https://git.sr.ht/~willdurand/srht.vim
|
||||
|
||||
Add `%{FugitiveStatusline()}` to `'statusline'` to get an indicator
|
||||
with the current branch in your statusline.
|
||||
|
||||
For more information, see `:help fugitive`.
|
||||
|
||||
## Screencasts
|
||||
|
||||
* [A complement to command line git](http://vimcasts.org/e/31)
|
||||
* [Working with the git index](http://vimcasts.org/e/32)
|
||||
* [Resolving merge conflicts with vimdiff](http://vimcasts.org/e/33)
|
||||
* [Browsing the git object database](http://vimcasts.org/e/34)
|
||||
* [Exploring the history of a git repository](http://vimcasts.org/e/35)
|
||||
|
||||
## Installation
|
||||
|
||||
Install using your favorite package manager, or use Vim's built-in package
|
||||
support:
|
||||
|
||||
mkdir -p ~/.vim/pack/tpope/start
|
||||
cd ~/.vim/pack/tpope/start
|
||||
git clone https://tpope.io/vim/fugitive.git
|
||||
vim -u NONE -c "helptags fugitive/doc" -c q
|
||||
|
||||
## FAQ
|
||||
|
||||
> What happened to the dispatch.vim backed asynchronous `:Gpush` and
|
||||
> `:Gfetch`?
|
||||
|
||||
This behavior was divisive, confusing, and complicated inputting passwords, so
|
||||
it was removed. Use `:Git! push` to use Fugitive's own asynchronous
|
||||
execution, or retroactively make `:Git push` asynchronous by pressing
|
||||
`CTRL-D`.
|
||||
|
||||
> Why am I getting `core.worktree is required when using an external Git dir`?
|
||||
|
||||
Git generally sets `core.worktree` for you automatically when necessary, but
|
||||
if you're doing something weird, or using a third-party tool that does
|
||||
something weird, you may need to set it manually:
|
||||
|
||||
git config core.worktree "$PWD"
|
||||
|
||||
This may be necessary even when simple `git` commands seem to work fine
|
||||
without it.
|
||||
|
||||
> So I have a symlink and...
|
||||
|
||||
Stop. Just stop. If Git won't deal with your symlink, then Fugitive won't
|
||||
either. Consider using a [plugin that resolves
|
||||
symlinks](https://github.com/aymericbeaumet/symlink.vim), or even better,
|
||||
using fewer symlinks.
|
||||
|
||||
## Self-Promotion
|
||||
|
||||
Like fugitive.vim? Follow the repository on
|
||||
[GitHub](https://github.com/tpope/vim-fugitive) and vote for it on
|
||||
[vim.org](http://www.vim.org/scripts/script.php?script_id=2975). And if
|
||||
you're feeling especially charitable, follow [tpope](http://tpo.pe/) on
|
||||
[Twitter](http://twitter.com/tpope) and
|
||||
[GitHub](https://github.com/tpope).
|
||||
|
||||
## License
|
||||
|
||||
Copyright (c) Tim Pope. Distributed under the same terms as Vim itself.
|
||||
See `:help license`.
|
8430
.vim/pack/plugins/start/vim-fugitive/autoload/fugitive.vim
Normal file
8430
.vim/pack/plugins/start/vim-fugitive/autoload/fugitive.vim
Normal file
File diff suppressed because it is too large
Load Diff
744
.vim/pack/plugins/start/vim-fugitive/doc/fugitive.txt
Normal file
744
.vim/pack/plugins/start/vim-fugitive/doc/fugitive.txt
Normal file
@ -0,0 +1,744 @@
|
||||
*fugitive.txt* A Git wrapper so awesome, it should be illegal
|
||||
|
||||
Author: Tim Pope <http://tpo.pe/>
|
||||
License: Same terms as Vim itself (see |license|)
|
||||
|
||||
This plugin is only available if 'compatible' is not set.
|
||||
|
||||
INTRODUCTION *fugitive*
|
||||
|
||||
Whenever you edit a file from a Git repository, a set of commands is defined
|
||||
that serve as a gateway to Git.
|
||||
|
||||
COMMANDS *fugitive-commands*
|
||||
|
||||
These commands are local to the buffers in which they work (generally, buffers
|
||||
that are part of Git repositories).
|
||||
|
||||
*fugitive-:G*
|
||||
:G [args] Same as :Git, but two characters shorter.
|
||||
|
||||
*fugitive-summary*
|
||||
:Git With no arguments, bring up a summary window vaguely
|
||||
akin to git-status. If a summary window is already
|
||||
open for the current repository, it is focused
|
||||
instead. Press g? or see |fugitive-maps| for usage.
|
||||
|
||||
*:Git*
|
||||
:Git {args} Run an arbitrary git command and display any output.
|
||||
On UNIX this uses a pty and on other platforms it uses
|
||||
a pipe, which will cause some behavior differences
|
||||
such as the absence of progress bars. Any file the
|
||||
command edits (for example, a commit message) will be
|
||||
loaded into a split window. Closing that window will
|
||||
resume running the command. A few Git subcommands
|
||||
have different behavior; these are documented below.
|
||||
|
||||
*:Git!*
|
||||
:Git! {args} Run an arbitrary git command in the background and
|
||||
stream the output to the preview window. Requires a
|
||||
Vim with |setbufline()|. Press CTRL-D during an
|
||||
interactive :Git invocation to switch to this mode
|
||||
retroactively.
|
||||
|
||||
*:Git_--paginate* *:Git_-p*
|
||||
:Git --paginate {args} Run an arbitrary git command, capture output to a temp
|
||||
:Git -p {args} file, and |:split| that temp file. Pass ++curwin as
|
||||
the first argument to |:edit| the temp file instead.
|
||||
A temp file is always used for commands like diff and
|
||||
log that typically uses a pager, and for any command
|
||||
that has the pager.<cmd> Git configuration option set.
|
||||
|
||||
:{range}Git! --paginate {args}
|
||||
:{range}Git! -p {args} Run an arbitrary git command, and insert the output
|
||||
after {range} in the current buffer.
|
||||
|
||||
*:Git_blame*
|
||||
:Git blame [flags] Run git-blame [flags] on the current file and open the
|
||||
results in a scroll-bound vertical split. The
|
||||
following maps, which work on the cursor line commit
|
||||
where sensible, are provided:
|
||||
|
||||
g? show this help
|
||||
A resize to end of author column
|
||||
C resize to end of commit column
|
||||
D resize to end of date/time column
|
||||
gq close blame, then |:Gedit| to return to work
|
||||
tree version
|
||||
<CR> close blame, and jump to patch that added line
|
||||
(or directly to blob for boundary commit)
|
||||
o jump to patch or blob in horizontal split
|
||||
O jump to patch or blob in new tab
|
||||
p jump to patch or blob in preview window
|
||||
- reblame at commit
|
||||
|
||||
The maps |fugitive_P| and |fugitive_~| are also
|
||||
supported to reblame on a parent commit, but this is
|
||||
inherently fragile, as the line being blamed will no
|
||||
longer exist. The preferred alternative is to use
|
||||
<CR> to open up the commit, select the corresponding
|
||||
`-` line that you care about, and press <CR> twice
|
||||
more to reblame at that line. Viewing the commit also
|
||||
gives you additional context as to why the line
|
||||
changed.
|
||||
|
||||
*g:fugitive_dynamic_colors*
|
||||
In the GUI or a 256 color terminal, commit hashes will
|
||||
be highlighted in different colors. To disable this:
|
||||
>
|
||||
let g:fugitive_dynamic_colors = 0
|
||||
<
|
||||
:[range]Git blame [...] If a range is given, just that part of the file will
|
||||
:Git blame [...] {file} be blamed, and a horizontal split without
|
||||
scrollbinding is used. You can also give an arbitrary
|
||||
filename.
|
||||
|
||||
*:Git_difftool*
|
||||
:Git[!] difftool [args] Invoke `git diff [args]` and load the changes into the
|
||||
quickfix list. Each changed hunk gets a separate
|
||||
quickfix entry unless you pass an option like
|
||||
--name-only or --name-status. Jumps to the first
|
||||
change unless [!] is given.
|
||||
|
||||
:Git difftool -y [args] Invoke `git diff [args]`, open each changed file in a
|
||||
new tab, and invoke |:Gdiffsplit!| against the
|
||||
appropriate commit.
|
||||
|
||||
*:Git_mergetool*
|
||||
:Git mergetool [args] Like |:Git_difftool|, but target merge conflicts.
|
||||
|
||||
Wrappers for Vim built-ins ~
|
||||
|
||||
These all directly map onto a built-in Vim command, and generally have names
|
||||
that prepend "G" to the command they are wrapping. For example, :Ggrep is G
|
||||
plus |:grep|.
|
||||
|
||||
*:Ggrep* *:Git_grep*
|
||||
:Ggrep[!] [args] An approximation of |:grep|[!] with git-grep as
|
||||
:Git[!] grep -O [args] 'grepprg'.
|
||||
|
||||
:Ggrep[!] --quiet [args]
|
||||
:Ggrep[!] -q [args] Like |:Ggrep|, but instead of displaying output, open
|
||||
the quickfix list.
|
||||
|
||||
*:Glgrep*
|
||||
:Glgrep[!] [args] :Ggrep but for |:lgrep|.
|
||||
:0Git[!] grep -O [args]
|
||||
|
||||
*:Gclog*
|
||||
:Gclog[!] [args] Use git-log [args] to load the commit history into the
|
||||
|quickfix| list. Jumps to the first commit unless [!]
|
||||
is given. This command wraps |:cfile|.
|
||||
|
||||
The quickfix list can be awkward for many use cases
|
||||
and exhibits extremely poor performance with larger
|
||||
data sets. Consider using |:Git| log --oneline
|
||||
instead.
|
||||
|
||||
:{range}Gclog[!] [args] Use git-log -L to load previous revisions of the given
|
||||
range of the current file into the |quickfix| list.
|
||||
The cursor is positioned on the first line of the
|
||||
first diff hunk for each commit. Use :0Gclog to
|
||||
target the entire file.
|
||||
|
||||
*:Gllog*
|
||||
:Gllog [args] Like |:Gclog|, but use the location list instead of the
|
||||
|quickfix| list.
|
||||
|
||||
*:Gcd*
|
||||
:Gcd [directory] |:cd| relative to the repository.
|
||||
|
||||
*:Glcd*
|
||||
:Glcd [directory] |:lcd| relative to the repository.
|
||||
|
||||
*:Gedit* *fugitive-:Ge*
|
||||
:Gedit [object] |:edit| a |fugitive-object|.
|
||||
|
||||
*:Gsplit*
|
||||
:Gsplit [object] |:split| a |fugitive-object|.
|
||||
|
||||
*:Gvsplit*
|
||||
:Gvsplit [object] |:vsplit| a |fugitive-object|.
|
||||
|
||||
*:Gtabedit*
|
||||
:Gtabedit [object] |:tabedit| a |fugitive-object|.
|
||||
|
||||
*:Gpedit*
|
||||
:Gpedit [object] |:pedit| a |fugitive-object|.
|
||||
|
||||
*:Gdrop*
|
||||
:Gdrop [object] |:drop| a |fugitive-object|.
|
||||
|
||||
*:Gread* *fugitive-:Gr*
|
||||
:Gread [object] Empty the buffer and |:read| a |fugitive-object|.
|
||||
When the argument is omitted, this is similar to
|
||||
git-checkout on a work tree file or git-add on a stage
|
||||
file, but without writing anything to disk.
|
||||
|
||||
:{range}Gread [object] |:read| in a |fugitive-object| after {range}.
|
||||
|
||||
*:Gwrite* *fugitive-:Gw*
|
||||
:Gwrite Write to the current file's path and stage the results.
|
||||
When run in a work tree file, it is effectively git
|
||||
add. Elsewhere, it is effectively git-checkout. A
|
||||
great deal of effort is expended to behave sensibly
|
||||
when the work tree or index version of the file is
|
||||
open in another buffer.
|
||||
|
||||
:Gwrite {path} You can give |:Gwrite| an explicit path of where in
|
||||
the work tree to write. You can also give a path like
|
||||
:0:foo.txt or :0:% to write to just that stage in
|
||||
the index.
|
||||
|
||||
*:Gwq*
|
||||
:Gwq [path] Like |:Gwrite| followed by |:quit| if the write
|
||||
succeeded.
|
||||
|
||||
:Gwq! [path] Like |:Gwrite|! followed by |:quit|! if the write
|
||||
succeeded.
|
||||
|
||||
*:Gdiffsplit*
|
||||
:Gdiffsplit [object] Perform a |vimdiff| against the given file, or if a
|
||||
commit is given, the current file in that commit.
|
||||
With no argument, the version in the index or work
|
||||
tree is used, and the work tree version is always
|
||||
placed to the right or bottom, depending on available
|
||||
width. Use Vim's |do| and |dp| to stage and unstage
|
||||
changes.
|
||||
|
||||
*:Gdiffsplit!*
|
||||
:Gdiffsplit! Diff against any and all direct ancestors, retaining
|
||||
focus on the current window. During a merge conflict,
|
||||
this is a three-way diff against the "ours" and
|
||||
"theirs" ancestors. Additional d2o and d3o maps are
|
||||
provided to obtain the hunk from the "ours" or
|
||||
"theirs" ancestor, respectively.
|
||||
|
||||
:Gdiffsplit! {object} Like |:Gdiffsplit|, but retain focus on the current
|
||||
window.
|
||||
|
||||
*:Gvdiffsplit*
|
||||
:Gvdiffsplit [object] Like |:Gdiffsplit|, but always split vertically.
|
||||
|
||||
*:Ghdiffsplit*
|
||||
:Gdiffsplit ++novertical [object]
|
||||
:Ghdiffsplit [object] Like |:Gdiffsplit|, but with "vertical" removed from
|
||||
'diffopt'. The split will still be vertical if
|
||||
combined with |:vertical|.
|
||||
|
||||
Other commands ~
|
||||
|
||||
These do not directly correspond to any built-in Vim command, and have a
|
||||
capital letter after the "G" to convey this. For example, the file move
|
||||
operation has nothing to do with the |:move| built-in, so it is named :GMove,
|
||||
not :Gmove.
|
||||
|
||||
*:GMove*
|
||||
:GMove {destination} Wrapper around git-mv that renames the buffer
|
||||
afterward. Add a ! to pass -f.
|
||||
|
||||
*:GRename*
|
||||
:GRename {destination} Like |:GMove| but operates relative to the parent
|
||||
directory of the current file.
|
||||
|
||||
*:GDelete*
|
||||
:GDelete Wrapper around git-rm that deletes the buffer
|
||||
afterward. When invoked in an index file, --cached is
|
||||
passed. Add a ! to pass -f and forcefully discard the
|
||||
buffer.
|
||||
|
||||
*:GRemove* *:GUnlink*
|
||||
:GRemove Like |:GDelete|, but keep the (now empty) buffer around.
|
||||
:GUnlink
|
||||
|
||||
*:GBrowse*
|
||||
:GBrowse Open the current file, blob, tree, commit, or tag
|
||||
in your browser at the upstream hosting provider.
|
||||
Upstream providers can be added by installing an
|
||||
appropriate Vim plugin. For example, GitHub can be
|
||||
supported by installing rhubarb.vim, available at
|
||||
<https://github.com/tpope/vim-rhubarb>.
|
||||
|
||||
:GBrowse {object} Like :GBrowse, but for a given |fugitive-object|.
|
||||
|
||||
:{range}GBrowse [args] Appends an anchor to the URL that emphasizes the
|
||||
selected lines. This also forces the URL to include a
|
||||
commit rather than a branch name so it remains valid
|
||||
if the file changes. You can give a range of "0" to
|
||||
force this behavior without including an anchor.
|
||||
|
||||
:GBrowse [...]@{remote} Force using the given remote rather than the remote
|
||||
for the current branch. The remote is used to
|
||||
determine which upstream repository to link to.
|
||||
|
||||
:GBrowse {url} Open an arbitrary URL in your browser.
|
||||
|
||||
:[range]GBrowse! [args] Like :GBrowse, but put the URL on the clipboard rather
|
||||
than opening it.
|
||||
|
||||
MAPS *fugitive-maps*
|
||||
|
||||
These maps are available in both the |fugitive-summary| buffer and Fugitive
|
||||
object buffers, although not all maps make sense in all buffers. Mappings
|
||||
that operate on the file or hunk under the cursor are generally available in
|
||||
visual mode to operate on multiple files or partial hunks.
|
||||
|
||||
*fugitive-staging-maps*
|
||||
Staging/unstaging maps ~
|
||||
|
||||
*fugitive_s*
|
||||
s Stage (add) the file or hunk under the cursor.
|
||||
|
||||
*fugitive_u*
|
||||
u Unstage (reset) the file or hunk under the cursor.
|
||||
|
||||
*fugitive_-*
|
||||
- Stage or unstage the file or hunk under the cursor.
|
||||
|
||||
*fugitive_U*
|
||||
U Unstage everything.
|
||||
|
||||
*fugitive_X*
|
||||
X Discard the change under the cursor. This uses
|
||||
`checkout` or `clean` under the hood. A command is
|
||||
echoed that shows how to undo the change. Consult
|
||||
`:messages` to see it again. During a merge conflict,
|
||||
use 2X to call `checkout --ours` or 3X to call
|
||||
`checkout --theirs` .
|
||||
|
||||
*fugitive_=*
|
||||
= Toggle an inline diff of the file under the cursor.
|
||||
|
||||
*fugitive_>*
|
||||
> Insert an inline diff of the file under the cursor.
|
||||
|
||||
*fugitive_<*
|
||||
< Remove the inline diff of the file under the cursor.
|
||||
|
||||
*fugitive_gI*
|
||||
gI Open .git/info/exclude in a split and add the file
|
||||
under the cursor. Use a count to open .gitignore.
|
||||
|
||||
*fugitive_I*
|
||||
I Invoke |:Git| add --patch or reset --patch on the file
|
||||
P under the cursor. On untracked files, this instead
|
||||
calls |:Git| add --intent-to-add.
|
||||
|
||||
*fugitive_d*
|
||||
Diff maps ~
|
||||
*fugitive_dp*
|
||||
dp Invoke |:Git| diff on the file under the cursor.
|
||||
Deprecated in favor of inline diffs.
|
||||
|
||||
*fugitive_dd*
|
||||
dd Perform a |:Gdiffsplit| on the file under the cursor.
|
||||
|
||||
*fugitive_dv*
|
||||
dv Perform a |:Gvdiffsplit| on the file under the cursor.
|
||||
|
||||
*fugitive_ds* *fugitive_dh*
|
||||
ds Perform a |:Ghdiffsplit| on the file under the cursor.
|
||||
dh
|
||||
|
||||
*fugitive_dq*
|
||||
dq Close all but the currently focused diff buffer, and
|
||||
invoke |:diffoff|!.
|
||||
|
||||
*fugitive_d?*
|
||||
d? Show this help.
|
||||
|
||||
*fugitive-navigation-maps*
|
||||
Navigation maps ~
|
||||
|
||||
*fugitive_<CR>*
|
||||
<CR> Open the file or |fugitive-object| under the cursor.
|
||||
In a blob, this and similar maps jump to the patch
|
||||
from the diff where this was added, or where it was
|
||||
removed if a count was given. If the line is still in
|
||||
the work tree version, passing a count takes you to
|
||||
it.
|
||||
|
||||
*fugitive_o*
|
||||
o Open the file or |fugitive-object| under the cursor in
|
||||
a new split.
|
||||
|
||||
*fugitive_gO*
|
||||
gO Open the file or |fugitive-object| under the cursor in
|
||||
a new vertical split.
|
||||
|
||||
*fugitive_O*
|
||||
O Open the file or |fugitive-object| under the cursor in
|
||||
a new tab.
|
||||
|
||||
*fugitive_p*
|
||||
p Open the file or |fugitive-object| under the cursor in
|
||||
a preview window. In the status buffer, 1p is
|
||||
required to bypass the legacy usage instructions.
|
||||
|
||||
*fugitive_~*
|
||||
~ Open the current file in the [count]th first ancestor.
|
||||
|
||||
*fugitive_P*
|
||||
P Open the current file in the [count]th parent.
|
||||
Experimental: In the "Unpushed" section of the status
|
||||
buffer, this will populate the command line with a
|
||||
":Git push" command for the commit under the cursor.
|
||||
|
||||
*fugitive_C*
|
||||
C Open the commit containing the current file.
|
||||
|
||||
*fugitive_CTRL-P* *fugitive_(*
|
||||
( Jump to the previous file, hunk, or revision.
|
||||
|
||||
*fugitive_CTRL-N* *fugitive_)*
|
||||
) Jump to the next file, hunk, or revision.
|
||||
|
||||
*fugitive_[c*
|
||||
[c Jump to previous hunk, expanding inline diffs
|
||||
automatically. (This shadows the Vim built-in |[c|
|
||||
that provides a similar operation in |diff| mode.)
|
||||
|
||||
*fugitive_]c*
|
||||
]c Jump to next hunk, expanding inline diffs
|
||||
automatically. (This shadows the Vim built-in |]c|
|
||||
that provides a similar operation in |diff| mode.)
|
||||
|
||||
*fugitive_[/* *fugitive_[m*
|
||||
[/ Jump to previous file, collapsing inline diffs
|
||||
[m automatically. (Mnemonic: "/" appears in filenames,
|
||||
"m" appears in "filenames".)
|
||||
|
||||
*fugitive_]/* *fugitive_]m*
|
||||
]/ Jump to next file, collapsing inline diffs
|
||||
]m automatically. (Mnemonic: "/" appears in filenames,
|
||||
"m" appears in "filenames".)
|
||||
|
||||
*fugitive_i*
|
||||
i Jump to the next file or hunk, expanding inline diffs
|
||||
automatically.
|
||||
|
||||
*fugitive_[[*
|
||||
[[ Jump [count] sections backward.
|
||||
|
||||
*fugitive_]]*
|
||||
]] Jump [count] sections forward.
|
||||
|
||||
*fugitive_[]*
|
||||
[] Jump [count] section ends backward.
|
||||
|
||||
*fugitive_][*
|
||||
][ Jump [count] section ends forward.
|
||||
|
||||
*fugitive_star*
|
||||
* On the first column of a + or - diff line, search for
|
||||
the corresponding - or + line. Otherwise, defer to
|
||||
built-in |star|.
|
||||
|
||||
*fugitive_#*
|
||||
# Same as "*", but search backward.
|
||||
|
||||
*fugitive_gu*
|
||||
gu Jump to file [count] in the "Untracked" or "Unstaged"
|
||||
section.
|
||||
|
||||
*fugitive_gU*
|
||||
gU Jump to file [count] in the "Unstaged" section.
|
||||
|
||||
*fugitive_gs*
|
||||
gs Jump to file [count] in the "Staged" section.
|
||||
|
||||
*fugitive_gp*
|
||||
gp Jump to file [count] in the "Unpushed" section.
|
||||
|
||||
*fugitive_gP*
|
||||
gP Jump to file [count] in the "Unpulled" section.
|
||||
|
||||
*fugitive_gr*
|
||||
gr Jump to file [count] in the "Rebasing" section.
|
||||
|
||||
*fugitive_gi*
|
||||
gi Open .git/info/exclude in a split. Use a count to
|
||||
open .gitignore.
|
||||
|
||||
*fugitive_c*
|
||||
Commit maps ~
|
||||
|
||||
cc Create a commit.
|
||||
|
||||
ca Amend the last commit and edit the message.
|
||||
|
||||
ce Amend the last commit without editing the message.
|
||||
|
||||
cw Reword the last commit.
|
||||
|
||||
cvc Create a commit with -v.
|
||||
|
||||
cva Amend the last commit with -v
|
||||
|
||||
cf Create a `fixup!` commit for the commit under the
|
||||
cursor.
|
||||
|
||||
cF Create a `fixup!` commit for the commit under the
|
||||
cursor and immediately rebase it.
|
||||
|
||||
cs Create a `squash!` commit for the commit under the
|
||||
cursor.
|
||||
|
||||
cS Create a `squash!` commit for the commit under the
|
||||
cursor and immediately rebase it.
|
||||
|
||||
cA Create a `squash!` commit for the commit under the
|
||||
cursor and edit the message.
|
||||
|
||||
c<Space> Populate command line with ":Git commit ".
|
||||
|
||||
*fugitive_cr*
|
||||
crc Revert the commit under the cursor.
|
||||
|
||||
crn Revert the commit under the cursor in the index and
|
||||
work tree, but do not actually commit the changes.
|
||||
|
||||
cr<Space> Populate command line with ":Git revert ".
|
||||
|
||||
*fugitive_cm*
|
||||
cm<Space> Populate command line with ":Git merge ".
|
||||
|
||||
c? Show this help.
|
||||
|
||||
*fugitive_cb*
|
||||
*fugitive_co*
|
||||
Checkout/branch maps ~
|
||||
|
||||
coo Check out the commit under the cursor.
|
||||
|
||||
cb<Space> Populate command line with ":Git branch ".
|
||||
|
||||
co<Space> Populate command line with ":Git checkout ".
|
||||
|
||||
cb? Show this help.
|
||||
co?
|
||||
|
||||
*fugitive_cz*
|
||||
Stash maps ~
|
||||
|
||||
czz Push stash. Pass a [count] of 1 to add
|
||||
`--include-untracked` or 2 to add `--all`.
|
||||
|
||||
czw Push stash of the work-tree. Like `czz` with
|
||||
`--keep-index`.
|
||||
|
||||
czs Push stash of the stage. Does not accept a count.
|
||||
|
||||
czA Apply topmost stash, or stash@{count}.
|
||||
|
||||
cza Apply topmost stash, or stash@{count}, preserving the
|
||||
index.
|
||||
|
||||
czP Pop topmost stash, or stash@{count}.
|
||||
|
||||
czp Pop topmost stash, or stash@{count}, preserving the
|
||||
index.
|
||||
|
||||
cz<Space> Populate command line with ":Git stash ".
|
||||
|
||||
cz? Show this help.
|
||||
|
||||
*fugitive_r*
|
||||
Rebase maps ~
|
||||
|
||||
ri Perform an interactive rebase. Uses ancestor of
|
||||
u commit under cursor as upstream if available.
|
||||
|
||||
rf Perform an autosquash rebase without editing the todo
|
||||
list. Uses ancestor of commit under cursor as
|
||||
upstream if available.
|
||||
|
||||
ru Perform an interactive rebase against @{upstream}.
|
||||
|
||||
rp Perform an interactive rebase against @{push}.
|
||||
|
||||
rr Continue the current rebase.
|
||||
|
||||
rs Skip the current commit and continue the current
|
||||
rebase.
|
||||
|
||||
ra Abort the current rebase.
|
||||
|
||||
re Edit the current rebase todo list.
|
||||
|
||||
rw Perform an interactive rebase with the commit under
|
||||
the cursor set to `reword`.
|
||||
|
||||
rm Perform an interactive rebase with the commit under
|
||||
the cursor set to `edit`.
|
||||
|
||||
rd Perform an interactive rebase with the commit under
|
||||
the cursor set to `drop`.
|
||||
|
||||
r<Space> Populate command line with ":Git rebase ".
|
||||
|
||||
r? Show this help.
|
||||
|
||||
*fugitive-misc-maps*
|
||||
Miscellaneous maps ~
|
||||
|
||||
*fugitive_gq* *fugitive_q*
|
||||
gq Close the status buffer.
|
||||
|
||||
*fugitive_.*
|
||||
. Start a |:| command line with the file under the
|
||||
cursor prepopulated.
|
||||
|
||||
*fugitive_g?*
|
||||
g? Show help for |fugitive-maps|.
|
||||
|
||||
*fugitive-global-maps*
|
||||
Global maps ~
|
||||
|
||||
*fugitive_c_CTRL-R_CTRL-G*
|
||||
<C-R><C-G> On the command line, recall the path to the current
|
||||
|fugitive-object| (that is, a representation of the
|
||||
object recognized by |:Gedit|).
|
||||
|
||||
*fugitive_y_CTRL-G*
|
||||
["x]y<C-G> Yank the path to the current |fugitive-object|.
|
||||
|
||||
*g:fugitive_no_maps*
|
||||
Global maps can be disabled with the g:fugitive_no_maps option.
|
||||
>
|
||||
let g:fugitive_no_maps = 1
|
||||
<
|
||||
SPECIFYING OBJECTS *fugitive-object* *fugitive-revision*
|
||||
|
||||
Fugitive objects are either work tree files or Git revisions as defined in the
|
||||
"SPECIFYING REVISIONS" section in the git-rev-parse man page, with expansions
|
||||
inspired by |cmdline-special| layered on top. For commands that accept an
|
||||
optional object, the default is the file in the index for work tree files and
|
||||
the work tree file for everything else. Example objects follow.
|
||||
|
||||
Object Meaning ~
|
||||
@ The commit referenced by @ aka HEAD
|
||||
master The commit referenced by master
|
||||
master^ The parent of the commit referenced by master
|
||||
master...other The merge base of master and other
|
||||
master: The tree referenced by master
|
||||
./master The file named master in the working directory
|
||||
:(top)master The file named master in the work tree
|
||||
Makefile The file named Makefile in the work tree
|
||||
@^:Makefile The file named Makefile in the parent of HEAD
|
||||
:Makefile The file named Makefile in the index (writable)
|
||||
@~2:% The current file in the grandparent of HEAD
|
||||
:% The current file in the index
|
||||
:1:% The current file's common ancestor during a conflict
|
||||
:2:# The alternate file in the target branch during a conflict
|
||||
:3:#5 The file from buffer #5 in the merged branch during a conflict
|
||||
! The commit owning the current file
|
||||
!:Makefile The file named Makefile in the commit owning the current file
|
||||
!3^2 The second parent of the commit owning buffer #3
|
||||
.git/config The repo config file
|
||||
: The |fugitive-summary| buffer
|
||||
- A temp file containing the last |:Git| invocation's output
|
||||
<cfile> The file or commit under the cursor
|
||||
|
||||
STATUSLINE *fugitive-statusline*
|
||||
|
||||
*FugitiveStatusline()* *fugitive#statusline()*
|
||||
Add %{FugitiveStatusline()} to your statusline to get an indicator including
|
||||
the current branch and the currently edited file's commit. If you don't have
|
||||
a statusline, this one matches the default when 'ruler' is set:
|
||||
>
|
||||
set statusline=%<%f\ %h%m%r%{FugitiveStatusline()}%=%-14.(%l,%c%V%)\ %P
|
||||
<
|
||||
AUTOCOMMANDS *fugitive-autocommands*
|
||||
|
||||
A handful of |User| |autocommands| are provided to allow extending and
|
||||
overriding Fugitive behaviors. Example usage:
|
||||
>
|
||||
autocmd User FugitiveBlob,FugitiveStageBlob call s:BlobOverrides()
|
||||
<
|
||||
*User_FugitiveTag*
|
||||
FugitiveTag After loading a tag object.
|
||||
|
||||
*User_FugitiveCommit*
|
||||
FugitiveCommit After loading a commit object.
|
||||
|
||||
*User_FugitiveTree*
|
||||
FugitiveTree After loading a tree (directory) object.
|
||||
|
||||
*User_FugitiveBlob*
|
||||
FugitiveBlob After loading a committed blob (file) object.
|
||||
|
||||
*User_FugitiveObject*
|
||||
FugitiveObject After loading any of the 4 above buffer types.
|
||||
|
||||
*User_FugitiveStageBlob*
|
||||
FugitiveStageBlob After loading a staged blob (file) object. These
|
||||
buffers are 'modifiable' and oftentimes don't want the
|
||||
same behavior as the other buffer types.
|
||||
|
||||
*User_FugitiveIndex*
|
||||
FugitiveIndex After loading the |fugitive-summary| buffer.
|
||||
|
||||
*User_FugitivePager*
|
||||
FugitivePager After loading a temp file created by a command like
|
||||
:Git --paginate or :Git blame.
|
||||
|
||||
*User_FugitiveEditor*
|
||||
FugitiveEditor After a :Git command (e.g., :Git commit) edits a file
|
||||
(e.g., the commit message).
|
||||
|
||||
*User_FugitiveChanged*
|
||||
FugitiveChanged After any event which can potentially change the
|
||||
repository, for example, any invocation of |:Git|.
|
||||
Originally intended for expiring caches, but can have
|
||||
other uses.
|
||||
|
||||
API *fugitive-api*
|
||||
|
||||
Officially supported functions are documented inline in plugin/fugitive.vim.
|
||||
|
||||
DEPRECATIONS *fugitive-deprecated*
|
||||
|
||||
The following commands are deprecated in favor of replacements that adhere to
|
||||
a new naming scheme. Remember that |:Git| can be shortened to |:G|, so
|
||||
replacements using it are just one space character longer than the legacy
|
||||
version.
|
||||
|
||||
*:Gremove* Superseded by |:GRemove|.
|
||||
*:Gdelete* Superseded by |:GDelete|.
|
||||
*:Gmove* Superseded by |:GMove|.
|
||||
*:Grename* Superseded by |:GRename|.
|
||||
*:Gbrowse* Superseded by |:GBrowse|.
|
||||
*:Gdiff* Superseded by |:Gdiffsplit|
|
||||
*:Gsdiff* Superseded by |:Ghdiffsplit|
|
||||
*:Gvdiff* Superseded by |:Gvdiffsplit| or |:vert| |:Gdiffsplit|.
|
||||
*:Gblame* Superseded by |:Git_blame|.
|
||||
*:Gcommit* Superseded by |:Git| commit.
|
||||
*:Gmerge* Superseded by |:Git| merge and |:Git_mergetool|.
|
||||
*:Gpull* Superseded by |:Git| pull.
|
||||
*:Grebase* Superseded by |:Git| rebase.
|
||||
*:Grevert* Superseded by |:Git| revert.
|
||||
*:Gpush* Superseded by |:Git| push.
|
||||
*:Gfetch* Superseded by |:Git| fetch.
|
||||
*:Glog* Superseded by |:Gclog|.
|
||||
*:Gstatus* Superseded by |:Git| (with no arguments).
|
||||
*:Gsplit!* Superseded by |:Git_--paginate|.
|
||||
*:Gvsplit!* Superseded by :vert Git --paginate.
|
||||
*:Gtabsplit!* Superseded by :tab Git --paginate.
|
||||
*:Gpedit!* Superseded by :Git! --paginate.
|
||||
|
||||
*User_Fugitive*
|
||||
Fugitive used to support `:autocmd User Fugitive` to run an autocommand after
|
||||
loading any buffer belonging to a Git repository, but this has been phased
|
||||
out. Instead, one can leverage regular autocommand events like |BufNewFile|
|
||||
and |BufReadPost|, and check !empty(FugitiveGitDir()) to confirm Fugitive has
|
||||
found a repository. See also |fugitive-autocommands| for other, more
|
||||
selective events.
|
||||
|
||||
ABOUT *fugitive-about*
|
||||
|
||||
Grab the latest version or report a bug on GitHub:
|
||||
|
||||
https://github.com/tpope/vim-fugitive
|
||||
|
||||
vim:tw=78:et:ft=help:norl:
|
@ -0,0 +1 @@
|
||||
autocmd BufReadPost *.fugitiveblame setfiletype fugitiveblame
|
@ -0,0 +1,6 @@
|
||||
if exists("b:did_ftplugin") || !exists("*FugitiveGitDir")
|
||||
finish
|
||||
endif
|
||||
let b:did_ftplugin = 1
|
||||
|
||||
call fugitive#BlameFileType()
|
754
.vim/pack/plugins/start/vim-fugitive/plugin/fugitive.vim
Normal file
754
.vim/pack/plugins/start/vim-fugitive/plugin/fugitive.vim
Normal file
@ -0,0 +1,754 @@
|
||||
" fugitive.vim - A Git wrapper so awesome, it should be illegal
|
||||
" Maintainer: Tim Pope <http://tpo.pe/>
|
||||
" Version: 3.7
|
||||
" GetLatestVimScripts: 2975 1 :AutoInstall: fugitive.vim
|
||||
|
||||
if exists('g:loaded_fugitive')
|
||||
finish
|
||||
endif
|
||||
let g:loaded_fugitive = 1
|
||||
|
||||
let s:bad_git_dir = '/$\|^fugitive:'
|
||||
|
||||
" FugitiveGitDir() returns the detected Git dir for the given buffer number,
|
||||
" or the current buffer if no argument is passed. This will be an empty
|
||||
" string if no Git dir was found. Use !empty(FugitiveGitDir()) to check if
|
||||
" Fugitive is active in the current buffer. Do not rely on this for direct
|
||||
" filesystem access; use FugitiveFind('.git/whatever') instead.
|
||||
function! FugitiveGitDir(...) abort
|
||||
if v:version < 704
|
||||
return ''
|
||||
elseif !a:0 || type(a:1) == type(0) && a:1 < 0 || a:1 is# get(v:, 'true', -1)
|
||||
if exists('g:fugitive_event')
|
||||
return g:fugitive_event
|
||||
endif
|
||||
let dir = get(b:, 'git_dir', '')
|
||||
if empty(dir) && (empty(bufname('')) && &filetype !=# 'netrw' || &buftype =~# '^\%(nofile\|acwrite\|quickfix\|terminal\|prompt\)$')
|
||||
return FugitiveExtractGitDir(getcwd())
|
||||
elseif (!exists('b:git_dir') || b:git_dir =~# s:bad_git_dir) && &buftype =~# '^\%(nowrite\)\=$'
|
||||
let b:git_dir = FugitiveExtractGitDir(bufnr(''))
|
||||
return b:git_dir
|
||||
endif
|
||||
return dir =~# s:bad_git_dir ? '' : dir
|
||||
elseif type(a:1) == type(0) && a:1 isnot# 0
|
||||
if a:1 == bufnr('') && (!exists('b:git_dir') || b:git_dir =~# s:bad_git_dir) && &buftype =~# '^\%(nowrite\)\=$'
|
||||
let b:git_dir = FugitiveExtractGitDir(a:1)
|
||||
endif
|
||||
let dir = getbufvar(a:1, 'git_dir')
|
||||
return dir =~# s:bad_git_dir ? '' : dir
|
||||
elseif type(a:1) == type('')
|
||||
return substitute(s:Slash(a:1), '/$', '', '')
|
||||
elseif type(a:1) == type({})
|
||||
return get(a:1, 'fugitive_dir', get(a:1, 'git_dir', ''))
|
||||
else
|
||||
return ''
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" FugitiveReal() takes a fugitive:// URL and returns the corresponding path in
|
||||
" the work tree. This may be useful to get a cleaner path for inclusion in
|
||||
" the statusline, for example. Note that the file and its parent directories
|
||||
" are not guaranteed to exist.
|
||||
"
|
||||
" This is intended as an abstract API to be used on any "virtual" path. For a
|
||||
" buffer named foo://bar, check for a function named FooReal(), and if it
|
||||
" exists, call FooReal("foo://bar").
|
||||
function! FugitiveReal(...) abort
|
||||
let file = a:0 ? a:1 : @%
|
||||
if type(file) ==# type({})
|
||||
let dir = FugitiveGitDir(file)
|
||||
let tree = s:Tree(dir)
|
||||
return s:VimSlash(empty(tree) ? dir : tree)
|
||||
elseif file =~# '^\a\a\+:' || a:0 > 1
|
||||
return call('fugitive#Real', [file] + a:000[1:-1])
|
||||
elseif file =~# '^/\|^\a:\|^$'
|
||||
return file
|
||||
else
|
||||
return fnamemodify(file, ':p' . (file =~# '[\/]$' ? '' : ':s?[\/]$??'))
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" FugitiveFind() takes a Fugitive object and returns the appropriate Vim
|
||||
" buffer name. You can use this to generate Fugitive URLs ("HEAD:README") or
|
||||
" to get the absolute path to a file in the Git dir (".git/HEAD"), the common
|
||||
" dir (".git/config"), or the work tree (":(top)Makefile").
|
||||
"
|
||||
" An optional second argument provides the Git dir, or the buffer number of a
|
||||
" buffer with a Git dir. The default is the current buffer.
|
||||
function! FugitiveFind(...) abort
|
||||
if a:0 && (type(a:1) ==# type({}) || type(a:1) ==# type(0))
|
||||
return call('fugitive#Find', a:000[1:-1] + [FugitiveGitDir(a:1)])
|
||||
else
|
||||
return fugitive#Find(a:0 ? a:1 : bufnr(''), FugitiveGitDir(a:0 > 1 ? a:2 : -1))
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" FugitiveParse() takes a fugitive:// URL and returns a 2 element list
|
||||
" containing an object name ("commit:file") and the Git dir. It's effectively
|
||||
" the inverse of FugitiveFind().
|
||||
function! FugitiveParse(...) abort
|
||||
let path = s:Slash(a:0 ? a:1 : @%)
|
||||
if path !~# '^fugitive://'
|
||||
return ['', '']
|
||||
endif
|
||||
let [rev, dir] = fugitive#Parse(path)
|
||||
if !empty(dir)
|
||||
return [rev, dir]
|
||||
endif
|
||||
throw 'fugitive: invalid Fugitive URL ' . path
|
||||
endfunction
|
||||
|
||||
" FugitiveGitVersion() queries the version of Git in use. Pass up to 3
|
||||
" arguments to return a Boolean of whether a certain minimum version is
|
||||
" available (FugitiveGitVersion(2,3,4) checks for 2.3.4 or higher) or no
|
||||
" arguments to get a raw string.
|
||||
function! FugitiveGitVersion(...) abort
|
||||
return call('fugitive#GitVersion', a:000)
|
||||
endfunction
|
||||
|
||||
" FugitiveResult() returns an object encapsulating the result of the most
|
||||
" recent :Git command. Will be empty if no result is available. During a
|
||||
" User FugitiveChanged event, this is guaranteed to correspond to the :Git
|
||||
" command that triggered the event, or be empty if :Git was not the trigger.
|
||||
" Pass in the name of a temp buffer to get the result object for that command
|
||||
" instead. Contains the following keys:
|
||||
"
|
||||
" * "args": List of command arguments, starting with the subcommand. Will be
|
||||
" empty for usages like :Git --help.
|
||||
" * "git_dir": Git dir of the relevant repository.
|
||||
" * "exit_status": The integer exit code of the process.
|
||||
" * "flags": Flags passed directly to Git, like -c and --help.
|
||||
" * "file": Path to file containing command output. Not guaranteed to exist,
|
||||
" so verify with filereadable() before trying to access it.
|
||||
function! FugitiveResult(...) abort
|
||||
return call('fugitive#Result', a:000)
|
||||
endfunction
|
||||
|
||||
" FugitiveExecute() runs Git with a list of arguments and returns a dictionary
|
||||
" with the following keys:
|
||||
"
|
||||
" * "exit_status": The integer exit code of the process.
|
||||
" * "stdout": The stdout produced by the process, as a list of lines.
|
||||
" * "stderr": The stdout produced by the process, as a list of lines.
|
||||
"
|
||||
" An optional second argument provides the Git dir, or the buffer number of a
|
||||
" buffer with a Git dir. The default is the current buffer.
|
||||
"
|
||||
" An optional final argument is a callback Funcref, for asynchronous
|
||||
" execution.
|
||||
function! FugitiveExecute(args, ...) abort
|
||||
return call('fugitive#Execute', [a:args] + a:000)
|
||||
endfunction
|
||||
|
||||
" FugitiveShellCommand() turns an array of arguments into a Git command string
|
||||
" which can be executed with functions like system() and commands like :!.
|
||||
" Integer arguments will be treated as buffer numbers, and the appropriate
|
||||
" relative path inserted in their place.
|
||||
"
|
||||
" An optional second argument provides the Git dir, or the buffer number of a
|
||||
" buffer with a Git dir. The default is the current buffer.
|
||||
function! FugitiveShellCommand(...) abort
|
||||
return call('fugitive#ShellCommand', a:000)
|
||||
endfunction
|
||||
|
||||
" FugitiveConfig() get returns an opaque structure that can be passed to other
|
||||
" FugitiveConfig functions in lieu of a Git directory. This can be faster
|
||||
" when performing multiple config queries. Do not rely on the internal
|
||||
" structure of the return value as it is not guaranteed. If you want a full
|
||||
" dictionary of every config value, use FugitiveConfigGetRegexp('.*').
|
||||
"
|
||||
" An optional argument provides the Git dir, or the buffer number of a
|
||||
" buffer with a Git dir. The default is the current buffer. Pass a blank
|
||||
" string to limit to the global config.
|
||||
function! FugitiveConfig(...) abort
|
||||
return call('fugitive#Config', a:000)
|
||||
endfunction
|
||||
|
||||
" FugitiveConfigGet() retrieves a Git configuration value. An optional second
|
||||
" argument can be either the object returned by FugitiveConfig(), or a Git
|
||||
" dir or buffer number to be passed along to FugitiveConfig().
|
||||
function! FugitiveConfigGet(name, ...) abort
|
||||
return get(call('FugitiveConfigGetAll', [a:name] + (a:0 ? [a:1] : [])), -1, get(a:, 2, ''))
|
||||
endfunction
|
||||
|
||||
" FugitiveConfigGetAll() is like FugitiveConfigGet() but returns a list of
|
||||
" all values.
|
||||
function! FugitiveConfigGetAll(name, ...) abort
|
||||
return call('fugitive#ConfigGetAll', [a:name] + a:000)
|
||||
endfunction
|
||||
|
||||
" FugitiveConfigGetRegexp() retrieves a dictionary of all configuration values
|
||||
" with a key matching the given pattern. Like git config --get-regexp, but
|
||||
" using a Vim regexp. Second argument has same semantics as
|
||||
" FugitiveConfigGet().
|
||||
function! FugitiveConfigGetRegexp(pattern, ...) abort
|
||||
return call('fugitive#ConfigGetRegexp', [a:pattern] + a:000)
|
||||
endfunction
|
||||
|
||||
" FugitiveRemoteUrl() retrieves the remote URL for the given remote name,
|
||||
" defaulting to the current branch's remote or "origin" if no argument is
|
||||
" given. Similar to `git remote get-url`, but also attempts to resolve HTTP
|
||||
" redirects and SSH host aliases.
|
||||
"
|
||||
" An optional second argument provides the Git dir, or the buffer number of a
|
||||
" buffer with a Git dir. The default is the current buffer.
|
||||
function! FugitiveRemoteUrl(...) abort
|
||||
return call('fugitive#RemoteUrl', a:000)
|
||||
endfunction
|
||||
|
||||
" FugitiveRemote() returns a data structure parsed from the remote URL.
|
||||
" For example, for remote URL "https://me@example.com:1234/repo.git", the
|
||||
" returned dictionary will contain the following:
|
||||
"
|
||||
" * "scheme": "https"
|
||||
" * "authority": "user@example.com:1234"
|
||||
" * "path": "/repo.git" (for SSH URLs this may be a relative path)
|
||||
" * "pathname": "/repo.git" (always coerced to absolute path)
|
||||
" * "host": "example.com:1234"
|
||||
" * "hostname": "example.com"
|
||||
" * "port": "1234"
|
||||
" * "user": "me"
|
||||
" * "path": "/repo.git"
|
||||
" * "url": "https://me@example.com:1234/repo.git"
|
||||
function! FugitiveRemote(...) abort
|
||||
return call('fugitive#Remote', a:000)
|
||||
endfunction
|
||||
|
||||
" FugitiveDidChange() triggers a FugitiveChanged event and reloads the summary
|
||||
" buffer for the current or given buffer number's repository. You can also
|
||||
" give the result of a FugitiveExecute() and that context will be made
|
||||
" available inside the FugitiveChanged() event.
|
||||
"
|
||||
" Passing the special argument 0 (the number zero) softly expires summary
|
||||
" buffers for all repositories. This can be used after a call to system()
|
||||
" with unclear implications.
|
||||
function! FugitiveDidChange(...) abort
|
||||
return call('fugitive#DidChange', a:000)
|
||||
endfunction
|
||||
|
||||
" FugitiveHead() retrieves the name of the current branch. If the current HEAD
|
||||
" is detached, FugitiveHead() will return the empty string, unless the
|
||||
" optional argument is given, in which case the hash of the current commit
|
||||
" will be truncated to the given number of characters.
|
||||
"
|
||||
" An optional second argument provides the Git dir, or the buffer number of a
|
||||
" buffer with a Git dir. The default is the current buffer.
|
||||
function! FugitiveHead(...) abort
|
||||
if a:0 && (type(a:1) ==# type({}) || type(a:1) ==# type('') && a:1 !~# '^\d\+$')
|
||||
let dir = FugitiveGitDir(a:1)
|
||||
let arg = get(a:, 2, 0)
|
||||
elseif a:0 > 1
|
||||
let dir = FugitiveGitDir(a:2)
|
||||
let arg = a:1
|
||||
else
|
||||
let dir = FugitiveGitDir()
|
||||
let arg = get(a:, 1, 0)
|
||||
endif
|
||||
if empty(dir)
|
||||
return ''
|
||||
endif
|
||||
return fugitive#Head(arg, dir)
|
||||
endfunction
|
||||
|
||||
function! FugitivePath(...) abort
|
||||
if a:0 > 2 && type(a:1) ==# type({})
|
||||
return fugitive#Path(a:2, a:3, FugitiveGitDir(a:1))
|
||||
elseif a:0 && type(a:1) ==# type({})
|
||||
return FugitiveReal(a:0 > 1 ? a:2 : @%)
|
||||
elseif a:0 > 1
|
||||
return fugitive#Path(a:1, a:2, FugitiveGitDir(a:0 > 2 ? a:3 : -1))
|
||||
else
|
||||
return FugitiveReal(a:0 ? a:1 : @%)
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! FugitiveStatusline(...) abort
|
||||
if empty(FugitiveGitDir(bufnr('')))
|
||||
return ''
|
||||
endif
|
||||
return fugitive#Statusline()
|
||||
endfunction
|
||||
|
||||
let s:resolved_git_dirs = {}
|
||||
function! FugitiveActualDir(...) abort
|
||||
let dir = call('FugitiveGitDir', a:000)
|
||||
if empty(dir)
|
||||
return ''
|
||||
endif
|
||||
if !has_key(s:resolved_git_dirs, dir)
|
||||
let s:resolved_git_dirs[dir] = s:ResolveGitDir(dir)
|
||||
endif
|
||||
return empty(s:resolved_git_dirs[dir]) ? dir : s:resolved_git_dirs[dir]
|
||||
endfunction
|
||||
|
||||
let s:commondirs = {}
|
||||
function! FugitiveCommonDir(...) abort
|
||||
let dir = call('FugitiveActualDir', a:000)
|
||||
if empty(dir)
|
||||
return ''
|
||||
endif
|
||||
if has_key(s:commondirs, dir)
|
||||
return s:commondirs[dir]
|
||||
endif
|
||||
if getfsize(dir . '/HEAD') >= 10
|
||||
let cdir = get(s:ReadFile(dir . '/commondir', 1), 0, '')
|
||||
if cdir =~# '^/\|^\a:/'
|
||||
let s:commondirs[dir] = s:Slash(FugitiveVimPath(cdir))
|
||||
elseif len(cdir)
|
||||
let s:commondirs[dir] = simplify(dir . '/' . cdir)
|
||||
else
|
||||
let s:commondirs[dir] = dir
|
||||
endif
|
||||
else
|
||||
let s:commondirs[dir] = dir
|
||||
endif
|
||||
return s:commondirs[dir]
|
||||
endfunction
|
||||
|
||||
function! FugitiveWorkTree(...) abort
|
||||
let tree = s:Tree(FugitiveGitDir(a:0 ? a:1 : -1))
|
||||
if tree isnot# 0 || a:0 > 1
|
||||
return tree
|
||||
else
|
||||
return ''
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! FugitiveIsGitDir(...) abort
|
||||
if !a:0 || type(a:1) !=# type('')
|
||||
return !empty(call('FugitiveGitDir', a:000))
|
||||
endif
|
||||
let path = substitute(a:1, '[\/]$', '', '') . '/'
|
||||
return len(path) && getfsize(path.'HEAD') > 10 && (
|
||||
\ isdirectory(path.'objects') && isdirectory(path.'refs') ||
|
||||
\ getftype(path.'commondir') ==# 'file')
|
||||
endfunction
|
||||
|
||||
function! s:ReadFile(path, line_count) abort
|
||||
if v:version < 800 && !filereadable(a:path)
|
||||
return []
|
||||
endif
|
||||
try
|
||||
return readfile(a:path, 'b', a:line_count)
|
||||
catch
|
||||
return []
|
||||
endtry
|
||||
endfunction
|
||||
|
||||
let s:worktree_for_dir = {}
|
||||
let s:dir_for_worktree = {}
|
||||
function! s:Tree(path) abort
|
||||
if a:path =~# '/\.git$'
|
||||
return len(a:path) ==# 5 ? '/' : a:path[0:-6]
|
||||
elseif a:path ==# ''
|
||||
return ''
|
||||
endif
|
||||
let dir = FugitiveActualDir(a:path)
|
||||
if !has_key(s:worktree_for_dir, dir)
|
||||
let s:worktree_for_dir[dir] = ''
|
||||
let ext_wtc_pat = 'v:val =~# "^\\s*worktreeConfig *= *\\%(true\\|yes\\|on\\|1\\) *$"'
|
||||
let config = s:ReadFile(dir . '/config', 50)
|
||||
if len(config)
|
||||
let ext_wtc_config = filter(copy(config), ext_wtc_pat)
|
||||
if len(ext_wtc_config) == 1 && filereadable(dir . '/config.worktree')
|
||||
let config += s:ReadFile(dir . '/config.worktree', 50)
|
||||
endif
|
||||
else
|
||||
let worktree = fnamemodify(FugitiveVimPath(get(s:ReadFile(dir . '/gitdir', 1), '0', '')), ':h')
|
||||
if worktree ==# '.'
|
||||
unlet! worktree
|
||||
endif
|
||||
if len(filter(s:ReadFile(FugitiveCommonDir(dir) . '/config', 50), ext_wtc_pat))
|
||||
let config = s:ReadFile(dir . '/config.worktree', 50)
|
||||
endif
|
||||
endif
|
||||
if len(config)
|
||||
let wt_config = filter(copy(config), 'v:val =~# "^\\s*worktree *="')
|
||||
if len(wt_config)
|
||||
let worktree = FugitiveVimPath(matchstr(wt_config[0], '= *\zs.*'))
|
||||
elseif !exists('worktree')
|
||||
call filter(config,'v:val =~# "^\\s*bare *= *true *$"')
|
||||
if empty(config)
|
||||
let s:worktree_for_dir[dir] = 0
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
if exists('worktree')
|
||||
let s:worktree_for_dir[dir] = s:Slash(resolve(worktree))
|
||||
let s:dir_for_worktree[s:worktree_for_dir[dir]] = dir
|
||||
endif
|
||||
endif
|
||||
if s:worktree_for_dir[dir] =~# '^\.'
|
||||
return simplify(dir . '/' . s:worktree_for_dir[dir])
|
||||
else
|
||||
return s:worktree_for_dir[dir]
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! s:CeilingDirectories() abort
|
||||
if !exists('s:ceiling_directories')
|
||||
let s:ceiling_directories = []
|
||||
let resolve = 1
|
||||
for dir in split($GIT_CEILING_DIRECTORIES, has('win32') ? ';' : ':', 1)
|
||||
if empty(dir)
|
||||
let resolve = 0
|
||||
elseif resolve
|
||||
call add(s:ceiling_directories, s:Slash(resolve(dir)))
|
||||
else
|
||||
call add(s:ceiling_directories, s:Slash(dir))
|
||||
endif
|
||||
endfor
|
||||
endif
|
||||
return s:ceiling_directories + get(g:, 'ceiling_directories', [s:Slash(fnamemodify(expand('~'), ':h'))])
|
||||
endfunction
|
||||
|
||||
function! s:ResolveGitDir(git_dir) abort
|
||||
let type = getftype(a:git_dir)
|
||||
if type ==# 'dir' && FugitiveIsGitDir(a:git_dir)
|
||||
return a:git_dir
|
||||
elseif type ==# 'link' && FugitiveIsGitDir(a:git_dir)
|
||||
return resolve(a:git_dir)
|
||||
elseif type !=# ''
|
||||
let line = get(s:ReadFile(a:git_dir, 1), 0, '')
|
||||
let file_dir = s:Slash(FugitiveVimPath(matchstr(line, '^gitdir: \zs.*')))
|
||||
if file_dir !~# '^/\|^\a:\|^$' && a:git_dir =~# '/\.git$' && FugitiveIsGitDir(a:git_dir[0:-5] . file_dir)
|
||||
return simplify(a:git_dir[0:-5] . file_dir)
|
||||
elseif file_dir =~# '^/\|^\a:' && FugitiveIsGitDir(file_dir)
|
||||
return file_dir
|
||||
endif
|
||||
endif
|
||||
return ''
|
||||
endfunction
|
||||
|
||||
function! FugitiveExtractGitDir(path) abort
|
||||
if type(a:path) ==# type({})
|
||||
return get(a:path, 'fugitive_dir', get(a:path, 'git_dir', ''))
|
||||
elseif type(a:path) == type(0)
|
||||
let path = s:Slash(a:path > 0 ? bufname(a:path) : bufname(''))
|
||||
if getbufvar(a:path, '&filetype') ==# 'netrw'
|
||||
let path = s:Slash(getbufvar(a:path, 'netrw_curdir', path))
|
||||
endif
|
||||
else
|
||||
let path = s:Slash(a:path)
|
||||
endif
|
||||
if path =~# '^fugitive://'
|
||||
return fugitive#Parse(path)[1]
|
||||
elseif empty(path)
|
||||
return ''
|
||||
endif
|
||||
let pre = substitute(matchstr(path, '^\a\a\+\ze:'), '^.', '\u&', '')
|
||||
if len(pre) && exists('*' . pre . 'Real')
|
||||
let path = {pre}Real(path)
|
||||
endif
|
||||
let root = s:Slash(fnamemodify(path, ':p:h'))
|
||||
let previous = ""
|
||||
let env_git_dir = len($GIT_DIR) ? s:Slash(simplify(fnamemodify(FugitiveVimPath($GIT_DIR), ':p:s?[\/]$??'))) : ''
|
||||
call s:Tree(env_git_dir)
|
||||
let ceiling_directories = s:CeilingDirectories()
|
||||
while root !=# previous && root !~# '^$\|^//[^/]*$'
|
||||
if index(ceiling_directories, root) >= 0
|
||||
break
|
||||
endif
|
||||
if root ==# $GIT_WORK_TREE && FugitiveIsGitDir(env_git_dir)
|
||||
return env_git_dir
|
||||
elseif has_key(s:dir_for_worktree, root)
|
||||
return s:dir_for_worktree[root]
|
||||
endif
|
||||
let dir = substitute(root, '[\/]$', '', '') . '/.git'
|
||||
let resolved = s:ResolveGitDir(dir)
|
||||
if !empty(resolved)
|
||||
let s:resolved_git_dirs[dir] = resolved
|
||||
return dir is# resolved || s:Tree(resolved) is# 0 ? dir : resolved
|
||||
elseif FugitiveIsGitDir(root)
|
||||
let s:resolved_git_dirs[root] = root
|
||||
return root
|
||||
endif
|
||||
let previous = root
|
||||
let root = fnamemodify(root, ':h')
|
||||
endwhile
|
||||
return ''
|
||||
endfunction
|
||||
|
||||
function! FugitiveDetect(...) abort
|
||||
if v:version < 704
|
||||
return ''
|
||||
endif
|
||||
if exists('b:git_dir') && b:git_dir =~# '^$\|' . s:bad_git_dir
|
||||
unlet b:git_dir
|
||||
endif
|
||||
if !exists('b:git_dir')
|
||||
let b:git_dir = FugitiveExtractGitDir(a:0 ? a:1 : bufnr(''))
|
||||
endif
|
||||
return ''
|
||||
endfunction
|
||||
|
||||
function! FugitiveGitPath(path) abort
|
||||
return s:Slash(a:path)
|
||||
endfunction
|
||||
|
||||
if exists('+shellslash')
|
||||
|
||||
function! s:Slash(path) abort
|
||||
return tr(a:path, '\', '/')
|
||||
endfunction
|
||||
|
||||
function! s:VimSlash(path) abort
|
||||
return tr(a:path, '\/', &shellslash ? '//' : '\\')
|
||||
endfunction
|
||||
|
||||
function FugitiveVimPath(path) abort
|
||||
return tr(a:path, '\/', &shellslash ? '//' : '\\')
|
||||
endfunction
|
||||
|
||||
else
|
||||
|
||||
function! s:Slash(path) abort
|
||||
return a:path
|
||||
endfunction
|
||||
|
||||
function! s:VimSlash(path) abort
|
||||
return a:path
|
||||
endfunction
|
||||
|
||||
if has('win32unix') && filereadable('/git-bash.exe')
|
||||
function! FugitiveVimPath(path) abort
|
||||
return substitute(a:path, '^\(\a\):', '/\l\1', '')
|
||||
endfunction
|
||||
else
|
||||
function! FugitiveVimPath(path) abort
|
||||
return a:path
|
||||
endfunction
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
function! s:ProjectionistDetect() abort
|
||||
let file = s:Slash(get(g:, 'projectionist_file', ''))
|
||||
let dir = FugitiveExtractGitDir(file)
|
||||
let base = matchstr(file, '^fugitive://.\{-\}//\x\+')
|
||||
if empty(base)
|
||||
let base = s:Tree(dir)
|
||||
endif
|
||||
if !empty(base)
|
||||
if exists('+shellslash') && !&shellslash
|
||||
let base = tr(base, '/', '\')
|
||||
endif
|
||||
let file = FugitiveFind('.git/info/projections.json', dir)
|
||||
if filereadable(file)
|
||||
call projectionist#append(base, file)
|
||||
endif
|
||||
endif
|
||||
endfunction
|
||||
|
||||
let s:addr_other = has('patch-8.1.560') || has('nvim-0.5.0') ? '-addr=other' : ''
|
||||
let s:addr_tabs = has('patch-7.4.542') ? '-addr=tabs' : ''
|
||||
let s:addr_wins = has('patch-7.4.542') ? '-addr=windows' : ''
|
||||
|
||||
if exists(':G') != 2
|
||||
command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#Complete G exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)
|
||||
endif
|
||||
command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#Complete Git exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)
|
||||
|
||||
if exists(':Gstatus') != 2 && get(g:, 'fugitive_legacy_commands', 0)
|
||||
exe 'command! -bang -bar -range=-1' s:addr_other 'Gstatus exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
\ '|echohl WarningMSG|echomsg ":Gstatus is deprecated in favor of :Git (with no arguments)"|echohl NONE'
|
||||
endif
|
||||
|
||||
for s:cmd in ['Commit', 'Revert', 'Merge', 'Rebase', 'Pull', 'Push', 'Fetch', 'Blame']
|
||||
if exists(':G' . tolower(s:cmd)) != 2 && get(g:, 'fugitive_legacy_commands', 0)
|
||||
exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#' . s:cmd . 'Complete G' . tolower(s:cmd)
|
||||
\ 'echohl WarningMSG|echomsg ":G' . tolower(s:cmd) . ' is deprecated in favor of :Git ' . tolower(s:cmd) . '"|echohl NONE|'
|
||||
\ 'exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "' . tolower(s:cmd) . ' " . <q-args>)'
|
||||
endif
|
||||
endfor
|
||||
unlet s:cmd
|
||||
|
||||
exe "command! -bar -bang -nargs=? -complete=customlist,fugitive#CdComplete Gcd exe fugitive#Cd(<q-args>, 0)"
|
||||
exe "command! -bar -bang -nargs=? -complete=customlist,fugitive#CdComplete Glcd exe fugitive#Cd(<q-args>, 1)"
|
||||
|
||||
exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Ggrep exe fugitive#GrepCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Glgrep exe fugitive#GrepCommand(0, <count> > 0 ? <count> : 0, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
|
||||
exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Gclog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "c")'
|
||||
exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete GcLog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "c")'
|
||||
exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Gllog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "l")'
|
||||
exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete GlLog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "l")'
|
||||
|
||||
exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Ge exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gedit exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gpedit exe fugitive#Open("pedit", <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#EditComplete Gsplit exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "split" : "edit"), <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#EditComplete Gvsplit exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "vsplit" : "edit!"), <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -range=-1' s:addr_tabs '-complete=customlist,fugitive#EditComplete Gtabedit exe fugitive#Open((<count> >= 0 ? <count> : "")."tabedit", <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gdrop exe fugitive#DropCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
|
||||
if exists(':Gr') != 2
|
||||
exe 'command! -bar -bang -nargs=* -range=-1 -complete=customlist,fugitive#ReadComplete Gr exe fugitive#ReadCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
endif
|
||||
exe 'command! -bar -bang -nargs=* -range=-1 -complete=customlist,fugitive#ReadComplete Gread exe fugitive#ReadCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
|
||||
exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gdiffsplit exe fugitive#Diffsplit(1, <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Ghdiffsplit exe fugitive#Diffsplit(0, <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gvdiffsplit exe fugitive#Diffsplit(0, <bang>0, "vertical <mods>", <q-args>)'
|
||||
|
||||
exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gw exe fugitive#WriteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwrite exe fugitive#WriteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwq exe fugitive#WqCommand( <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
|
||||
exe 'command! -bar -bang -nargs=0 GRemove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=0 GUnlink exe fugitive#UnlinkCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=0 GDelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#CompleteObject GMove exe fugitive#MoveCommand( <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#RenameComplete GRename exe fugitive#RenameCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
if exists(':Gremove') != 2 && get(g:, 'fugitive_legacy_commands', 0)
|
||||
exe 'command! -bar -bang -nargs=0 Gremove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
\ '|echohl WarningMSG|echomsg ":Gremove is deprecated in favor of :GRemove"|echohl NONE'
|
||||
elseif exists(':Gremove') != 2 && !exists('g:fugitive_legacy_commands')
|
||||
exe 'command! -bar -bang -nargs=0 Gremove echoerr ":Gremove has been removed in favor of :GRemove"'
|
||||
endif
|
||||
if exists(':Gdelete') != 2 && get(g:, 'fugitive_legacy_commands', 0)
|
||||
exe 'command! -bar -bang -nargs=0 Gdelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
\ '|echohl WarningMSG|echomsg ":Gdelete is deprecated in favor of :GDelete"|echohl NONE'
|
||||
elseif exists(':Gdelete') != 2 && !exists('g:fugitive_legacy_commands')
|
||||
exe 'command! -bar -bang -nargs=0 Gdelete echoerr ":Gdelete has been removed in favor of :GDelete"'
|
||||
endif
|
||||
if exists(':Gmove') != 2 && get(g:, 'fugitive_legacy_commands', 0)
|
||||
exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#CompleteObject Gmove exe fugitive#MoveCommand( <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
\ '|echohl WarningMSG|echomsg ":Gmove is deprecated in favor of :GMove"|echohl NONE'
|
||||
elseif exists(':Gmove') != 2 && !exists('g:fugitive_legacy_commands')
|
||||
exe 'command! -bar -bang -nargs=? -complete=customlist,fugitive#CompleteObject Gmove'
|
||||
\ 'echoerr ":Gmove has been removed in favor of :GMove"'
|
||||
endif
|
||||
if exists(':Grename') != 2 && get(g:, 'fugitive_legacy_commands', 0)
|
||||
exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#RenameComplete Grename exe fugitive#RenameCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
\ '|echohl WarningMSG|echomsg ":Grename is deprecated in favor of :GRename"|echohl NONE'
|
||||
elseif exists(':Grename') != 2 && !exists('g:fugitive_legacy_commands')
|
||||
exe 'command! -bar -bang -nargs=? -complete=customlist,fugitive#RenameComplete Grename'
|
||||
\ 'echoerr ":Grename has been removed in favor of :GRename"'
|
||||
endif
|
||||
|
||||
exe 'command! -bar -bang -range=-1 -nargs=* -complete=customlist,fugitive#CompleteObject GBrowse exe fugitive#BrowseCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
if exists(':Gbrowse') != 2 && get(g:, 'fugitive_legacy_commands', 0)
|
||||
exe 'command! -bar -bang -range=-1 -nargs=* -complete=customlist,fugitive#CompleteObject Gbrowse exe fugitive#BrowseCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
|
||||
\ '|if <bang>1|redraw!|endif|echohl WarningMSG|echomsg ":Gbrowse is deprecated in favor of :GBrowse"|echohl NONE'
|
||||
elseif exists(':Gbrowse') != 2 && !exists('g:fugitive_legacy_commands')
|
||||
exe 'command! -bar -bang -range=-1 -nargs=* -complete=customlist,fugitive#CompleteObject Gbrowse'
|
||||
\ 'echoerr ":Gbrowse has been removed in favor of :GBrowse"'
|
||||
endif
|
||||
|
||||
if v:version < 704
|
||||
finish
|
||||
endif
|
||||
|
||||
let g:io_fugitive = {
|
||||
\ 'simplify': function('fugitive#simplify'),
|
||||
\ 'resolve': function('fugitive#resolve'),
|
||||
\ 'getftime': function('fugitive#getftime'),
|
||||
\ 'getfsize': function('fugitive#getfsize'),
|
||||
\ 'getftype': function('fugitive#getftype'),
|
||||
\ 'filereadable': function('fugitive#filereadable'),
|
||||
\ 'filewritable': function('fugitive#filewritable'),
|
||||
\ 'isdirectory': function('fugitive#isdirectory'),
|
||||
\ 'getfperm': function('fugitive#getfperm'),
|
||||
\ 'setfperm': function('fugitive#setfperm'),
|
||||
\ 'readfile': function('fugitive#readfile'),
|
||||
\ 'writefile': function('fugitive#writefile'),
|
||||
\ 'glob': function('fugitive#glob'),
|
||||
\ 'delete': function('fugitive#delete'),
|
||||
\ 'Real': function('FugitiveReal')}
|
||||
|
||||
augroup fugitive
|
||||
autocmd!
|
||||
|
||||
autocmd BufNewFile,BufReadPost *
|
||||
\ if exists('b:git_dir') && b:git_dir =~# '^$\|' . s:bad_git_dir |
|
||||
\ unlet b:git_dir |
|
||||
\ endif
|
||||
autocmd FileType netrw
|
||||
\ if exists('b:git_dir') && b:git_dir =~# '^$\|' . s:bad_git_dir |
|
||||
\ unlet b:git_dir |
|
||||
\ endif
|
||||
autocmd BufFilePost * unlet! b:git_dir
|
||||
|
||||
autocmd FileType git
|
||||
\ call fugitive#MapCfile()
|
||||
autocmd FileType gitcommit
|
||||
\ call fugitive#MapCfile('fugitive#MessageCfile()')
|
||||
autocmd FileType git,gitcommit
|
||||
\ if &foldtext ==# 'foldtext()' |
|
||||
\ setlocal foldtext=fugitive#Foldtext() |
|
||||
\ endif
|
||||
autocmd FileType fugitive
|
||||
\ call fugitive#MapCfile('fugitive#PorcelainCfile()')
|
||||
autocmd FileType gitrebase
|
||||
\ let &l:include = '^\%(pick\|squash\|edit\|reword\|fixup\|drop\|[pserfd]\)\>' |
|
||||
\ if &l:includeexpr !~# 'Fugitive' |
|
||||
\ let &l:includeexpr = 'v:fname =~# ''^\x\{4,\}$'' && len(FugitiveGitDir()) ? FugitiveFind(v:fname) : ' .
|
||||
\ (len(&l:includeexpr) ? &l:includeexpr : 'v:fname') |
|
||||
\ endif |
|
||||
\ let b:undo_ftplugin = get(b:, 'undo_ftplugin', 'exe') . '|setl inex= inc='
|
||||
|
||||
autocmd BufReadCmd index{,.lock} nested
|
||||
\ if FugitiveIsGitDir(expand('<amatch>:p:h')) |
|
||||
\ let b:git_dir = s:Slash(expand('<amatch>:p:h')) |
|
||||
\ exe fugitive#BufReadStatus(v:cmdbang) |
|
||||
\ echohl WarningMSG |
|
||||
\ echo "fugitive: Direct editing of .git/" . expand('%:t') . " is deprecated" |
|
||||
\ echohl NONE |
|
||||
\ elseif filereadable(expand('<amatch>')) |
|
||||
\ silent doautocmd BufReadPre |
|
||||
\ keepalt noautocmd read <amatch> |
|
||||
\ silent 1delete_ |
|
||||
\ silent doautocmd BufReadPost |
|
||||
\ else |
|
||||
\ silent doautocmd BufNewFile |
|
||||
\ endif
|
||||
|
||||
autocmd BufReadCmd fugitive://* nested exe fugitive#BufReadCmd() |
|
||||
\ if &path =~# '^\.\%(,\|$\)' |
|
||||
\ let &l:path = substitute(&path, '^\.,\=', '', '') |
|
||||
\ endif
|
||||
autocmd BufWriteCmd fugitive://* nested exe fugitive#BufWriteCmd()
|
||||
autocmd FileReadCmd fugitive://* nested exe fugitive#FileReadCmd()
|
||||
autocmd FileWriteCmd fugitive://* nested exe fugitive#FileWriteCmd()
|
||||
if exists('##SourceCmd')
|
||||
autocmd SourceCmd fugitive://* nested exe fugitive#SourceCmd()
|
||||
endif
|
||||
|
||||
autocmd User Flags call Hoist('buffer', function('FugitiveStatusline'))
|
||||
|
||||
autocmd User ProjectionistDetect call s:ProjectionistDetect()
|
||||
augroup END
|
||||
|
||||
nmap <script><silent> <Plug>fugitive:y<C-G> :<C-U>call setreg(v:register, fugitive#Object(@%))<CR>
|
||||
nmap <script> <Plug>fugitive: <Nop>
|
||||
|
||||
if get(g:, 'fugitive_no_maps')
|
||||
finish
|
||||
endif
|
||||
|
||||
function! s:Map(mode, lhs, rhs, flags) abort
|
||||
let flags = a:flags . (a:rhs =~# '<Plug>' ? '' : '<script>') . '<nowait>'
|
||||
let head = a:lhs
|
||||
let tail = ''
|
||||
let keys = get(g:, a:mode.'remap', {})
|
||||
if len(keys) && type(keys) == type({})
|
||||
while !empty(head)
|
||||
if has_key(keys, head)
|
||||
let head = keys[head]
|
||||
if empty(head)
|
||||
return
|
||||
endif
|
||||
break
|
||||
endif
|
||||
let tail = matchstr(head, '<[^<>]*>$\|.$') . tail
|
||||
let head = substitute(head, '<[^<>]*>$\|.$', '', '')
|
||||
endwhile
|
||||
endif
|
||||
if empty(mapcheck(head.tail, a:mode))
|
||||
exe a:mode.'map' flags head.tail a:rhs
|
||||
endif
|
||||
endfunction
|
||||
|
||||
call s:Map('c', '<C-R><C-G>', 'fnameescape(fugitive#Object(@%))', '<expr>')
|
||||
call s:Map('n', 'y<C-G>', ':<C-U>call setreg(v:register, fugitive#Object(@%))<CR>', '<silent>')
|
57
.vim/pack/plugins/start/vim-fugitive/syntax/fugitive.vim
Normal file
57
.vim/pack/plugins/start/vim-fugitive/syntax/fugitive.vim
Normal file
@ -0,0 +1,57 @@
|
||||
if exists("b:current_syntax")
|
||||
finish
|
||||
endif
|
||||
|
||||
syn sync fromstart
|
||||
syn spell notoplevel
|
||||
|
||||
syn include @fugitiveDiff syntax/diff.vim
|
||||
|
||||
syn match fugitiveHeader /^[A-Z][a-z][^:]*:/
|
||||
syn match fugitiveHeader /^Head:/ nextgroup=fugitiveHash,fugitiveSymbolicRef skipwhite
|
||||
syn match fugitiveHeader /^Pull:\|^Rebase:\|^Merge:\|^Push:/ nextgroup=fugitiveSymbolicRef skipwhite
|
||||
syn match fugitiveHelpHeader /^Help:/ nextgroup=fugitiveHelpTag skipwhite
|
||||
syn match fugitiveHelpTag /\S\+/ contained
|
||||
|
||||
syn region fugitiveSection start=/^\%(.*(\d\++\=)$\)\@=/ contains=fugitiveHeading end=/^$/ fold
|
||||
syn cluster fugitiveSection contains=fugitiveSection
|
||||
syn match fugitiveHeading /^[A-Z][a-z][^:]*\ze (\d\++\=)$/ contains=fugitivePreposition contained nextgroup=fugitiveCount skipwhite
|
||||
syn match fugitiveCount /(\d\++\=)/hs=s+1,he=e-1 contained
|
||||
syn match fugitivePreposition /\<\%([io]nto\|from\|to\|Rebasing\%( detached\)\=\)\>/ transparent contained nextgroup=fugitiveHash,fugitiveSymbolicRef skipwhite
|
||||
|
||||
syn match fugitiveInstruction /^\l\l\+\>/ contained containedin=@fugitiveSection nextgroup=fugitiveHash skipwhite
|
||||
syn match fugitiveDone /^done\>/ contained containedin=@fugitiveSection nextgroup=fugitiveHash skipwhite
|
||||
syn match fugitiveStop /^stop\>/ contained containedin=@fugitiveSection nextgroup=fugitiveHash skipwhite
|
||||
syn match fugitiveModifier /^[MADRCU?]\{1,2} / contained containedin=@fugitiveSection
|
||||
syn match fugitiveSymbolicRef /\.\@!\%(\.\.\@!\|[^[:space:][:cntrl:]\:.]\)\+\.\@<!/ contained
|
||||
syn match fugitiveHash /^\x\{4,\}\S\@!/ contained containedin=@fugitiveSection
|
||||
syn match fugitiveHash /\S\@<!\x\{4,\}\S\@!/ contained
|
||||
|
||||
syn region fugitiveHunk start=/^\%(@@\+ -\)\@=/ end=/^\%([A-Za-z?@]\|$\)\@=/ contains=diffLine,diffRemoved,diffAdded,diffNoEOL containedin=@fugitiveSection fold
|
||||
|
||||
for s:section in ['Untracked', 'Unstaged', 'Staged']
|
||||
exe 'syn region fugitive' . s:section . 'Section start=/^\%(' . s:section . ' .*(\d\++\=)$\)\@=/ contains=fugitive' . s:section . 'Heading end=/^$/ fold'
|
||||
exe 'syn match fugitive' . s:section . 'Modifier /^[MADRCU?] / contained containedin=fugitive' . s:section . 'Section'
|
||||
exe 'syn cluster fugitiveSection add=fugitive' . s:section . 'Section'
|
||||
exe 'syn match fugitive' . s:section . 'Heading /^[A-Z][a-z][^:]*\ze (\d\++\=)$/ contains=fugitivePreposition contained nextgroup=fugitiveCount skipwhite'
|
||||
endfor
|
||||
unlet s:section
|
||||
|
||||
hi def link fugitiveHelpHeader fugitiveHeader
|
||||
hi def link fugitiveHeader Label
|
||||
hi def link fugitiveHelpTag Tag
|
||||
hi def link fugitiveHeading PreProc
|
||||
hi def link fugitiveUntrackedHeading PreCondit
|
||||
hi def link fugitiveUnstagedHeading Macro
|
||||
hi def link fugitiveStagedHeading Include
|
||||
hi def link fugitiveModifier Type
|
||||
hi def link fugitiveUntrackedModifier StorageClass
|
||||
hi def link fugitiveUnstagedModifier Structure
|
||||
hi def link fugitiveStagedModifier Typedef
|
||||
hi def link fugitiveInstruction Type
|
||||
hi def link fugitiveStop Function
|
||||
hi def link fugitiveHash Identifier
|
||||
hi def link fugitiveSymbolicRef Function
|
||||
hi def link fugitiveCount Number
|
||||
|
||||
let b:current_syntax = "fugitive"
|
@ -0,0 +1,7 @@
|
||||
if exists("b:current_syntax") || !exists("*FugitiveGitDir")
|
||||
finish
|
||||
endif
|
||||
|
||||
call fugitive#BlameSyntax()
|
||||
|
||||
let b:current_syntax = "fugitiveblame"
|
@ -33,6 +33,7 @@ set diffopt=internal
|
||||
set diffopt+=filler,context:20
|
||||
set diffopt+=iwhite,iblank
|
||||
set diffopt+=algorithm:histogram
|
||||
set diffopt+=vertical
|
||||
set diffexpr=
|
||||
|
||||
filetype plugin indent on " load plugins based on filetype
|
||||
|
Loading…
Reference in New Issue
Block a user