Merge pull request #2464 from TamaMcGlinn/master

Add support for flog with git status summary
This commit is contained in:
Christian Brabandt 2021-11-26 10:27:33 +01:00 committed by GitHub
commit 65a4d4dd43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions

View File

@ -66,7 +66,7 @@ For a better look, those sections can be colored differently, depending on vario
* Tiny core written with extensibility in mind ([open/closed principle][8]). * Tiny core written with extensibility in mind ([open/closed principle][8]).
* Integrates with a variety of plugins, including: [vim-bufferline][6], * Integrates with a variety of plugins, including: [vim-bufferline][6],
[fugitive][4], [unite][9], [ctrlp][10], [minibufexpl][15], [gundo][16], [fugitive][4], [flog][62], [unite][9], [ctrlp][10], [minibufexpl][15], [gundo][16],
[undotree][17], [nerdtree][18], [tagbar][19], [vim-gitgutter][29], [undotree][17], [nerdtree][18], [tagbar][19], [vim-gitgutter][29],
[vim-signify][30], [quickfixsigns][39], [syntastic][5], [eclim][34], [vim-signify][30], [quickfixsigns][39], [syntastic][5], [eclim][34],
[lawrencium][21], [virtualenv][31], [tmuxline][35], [taboo.vim][37], [lawrencium][21], [virtualenv][31], [tmuxline][35], [taboo.vim][37],
@ -169,6 +169,9 @@ vim-airline integrates with a variety of plugins out of the box. These extensio
#### [vimagit][50] #### [vimagit][50]
![vim-airline-vimagit-demo](https://cloud.githubusercontent.com/assets/533068/22107273/2ea85ba0-de4d-11e6-9fa8-331103b88df4.gif) ![vim-airline-vimagit-demo](https://cloud.githubusercontent.com/assets/533068/22107273/2ea85ba0-de4d-11e6-9fa8-331103b88df4.gif)
#### [flog][62]
![vim-flog-airline-demo](https://user-images.githubusercontent.com/5008897/120819897-4e820280-c554-11eb-963e-6c08a1bbae09.png)
#### [virtualenv][31] #### [virtualenv][31]
![image](https://f.cloud.github.com/assets/390964/1022566/cf81f830-0d98-11e3-904f-cf4fe3ce201e.png) ![image](https://f.cloud.github.com/assets/390964/1022566/cf81f830-0d98-11e3-904f-cf4fe3ce201e.png)
@ -365,3 +368,4 @@ If you are interested in becoming a maintainer (we always welcome more maintaine
[59]: https://github.com/neoclide/coc-git [59]: https://github.com/neoclide/coc-git
[60]: https://github.com/cdelledonne/vim-cmake [60]: https://github.com/cdelledonne/vim-cmake
[61]: http://github.com/lambdalisue/battery.vim/ [61]: http://github.com/lambdalisue/battery.vim/
[62]: http://github.com/rbong/vim-flog/

View File

@ -26,6 +26,7 @@ let s:filetype_overrides = {
\ 'coc-explorer': [ 'CoC Explorer', '' ], \ 'coc-explorer': [ 'CoC Explorer', '' ],
\ 'defx': ['defx', '%{b:defx.paths[0]}'], \ 'defx': ['defx', '%{b:defx.paths[0]}'],
\ 'fugitive': ['fugitive', '%{airline#util#wrap(airline#extensions#branch#get_head(),80)}'], \ 'fugitive': ['fugitive', '%{airline#util#wrap(airline#extensions#branch#get_head(),80)}'],
\ 'floggraph': [ 'Flog', '%{get(b:, "flog_status_summary", "")}' ],
\ 'gundo': [ 'Gundo', '' ], \ 'gundo': [ 'Gundo', '' ],
\ 'help': [ 'Help', '%f' ], \ 'help': [ 'Help', '%f' ],
\ 'minibufexpl': [ 'MiniBufExplorer', '' ], \ 'minibufexpl': [ 'MiniBufExplorer', '' ],

View File

@ -231,6 +231,7 @@ values):
\ 'coc-explorer': [ 'CoC Explorer', '' ], \ 'coc-explorer': [ 'CoC Explorer', '' ],
\ 'defx': ['defx', '%{b:defx.paths[0]}'], \ 'defx': ['defx', '%{b:defx.paths[0]}'],
\ 'fugitive': ['fugitive', '%{airline#util#wrap(airline#extensions#branch#get_head(),80)}'], \ 'fugitive': ['fugitive', '%{airline#util#wrap(airline#extensions#branch#get_head(),80)}'],
\ 'floggraph': [ 'Flog', '%{get(b:, "flog_status_summary", "")}' ],
\ 'gundo': [ 'Gundo', '' ], \ 'gundo': [ 'Gundo', '' ],
\ 'help': [ 'Help', '%f' ], \ 'help': [ 'Help', '%f' ],
\ 'minibufexpl': [ 'MiniBufExplorer', '' ], \ 'minibufexpl': [ 'MiniBufExplorer', '' ],
@ -606,6 +607,13 @@ characters.
let g:airline#extensions#branch#vcs_checks = ['untracked', 'dirty'] let g:airline#extensions#branch#vcs_checks = ['untracked', 'dirty']
< <
------------------------------------- *airline-flog*
vim-flog <https://github.com/rbong/vim-flog>
If vim-flog is installed, vim-airline will display the branch name
together with a status summary in the git log graph buffer;
either 'no changes' or the number of added/removed/modified files.
------------------------------------- *airline-bufferline* ------------------------------------- *airline-bufferline*
vim-bufferline <https://github.com/bling/vim-bufferline> vim-bufferline <https://github.com/bling/vim-bufferline>