From 1eeb3e35ffb8cbf67a8be09f23345948ea9ef002 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Sat, 18 Mar 2017 21:20:10 +0800
Subject: [PATCH] Improve git layer

close #306
---
 autoload/SpaceVim.vim                      |  3 -
 autoload/SpaceVim/layers/git.vim           | 69 +++++++++++++++++-----
 config/plugins/vim-leader-guide.vim        |  8 ---
 config/plugins_before/vim-leader-guide.vim |  4 --
 4 files changed, 53 insertions(+), 31 deletions(-)
 delete mode 100644 config/plugins/vim-leader-guide.vim
 delete mode 100644 config/plugins_before/vim-leader-guide.vim

diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim
index 0318feefc..ba921ccce 100644
--- a/autoload/SpaceVim.vim
+++ b/autoload/SpaceVim.vim
@@ -413,9 +413,6 @@ function! SpaceVim#end() abort
   let g:leaderGuide_max_size = 15
   let g:leaderGuide_submode_mappings = 
         \ { '<C-C>': 'win_close', '<PageDown>': 'page_down', '<PageUp>': 'page_up'}
-  let g:_spacevim_mappings.g = {'name' : 'git function',
-        \ 'd' : ['Gita diff', 'git diff'],
-        \ }
   call SpaceVim#plugins#load()
 endfunction
 
diff --git a/autoload/SpaceVim/layers/git.vim b/autoload/SpaceVim/layers/git.vim
index d16df70fa..5d3266dde 100644
--- a/autoload/SpaceVim/layers/git.vim
+++ b/autoload/SpaceVim/layers/git.vim
@@ -1,26 +1,63 @@
 function! SpaceVim#layers#git#plugins() abort
-    return [
-                \ ['cohama/agit.vim',                        { 'on_cmd':['Agit','AgitFile']}],
-                \ ['gregsexton/gitv',                        { 'on_cmd':['Gitv']}],
-                \ ['junegunn/gv.vim',               { 'on_cmd' : 'GV'}],
-                \ ['lambdalisue/vim-gita',          {'on_cmd': 'Gita'}],
-                \ ['tpope/vim-fugitive'],
-                \ ]
+  let plugins = [
+        \ ['cohama/agit.vim',      { 'on_cmd' : ['Agit','AgitFile']}],
+        \ ['gregsexton/gitv',      { 'on_cmd' : ['Gitv']}],
+        \ ['junegunn/gv.vim',      { 'on_cmd' : 'GV'}],
+        \ ['tpope/vim-fugitive',   { 'merged' : 0}],
+        \ ]
+  if has('patch-8.0.0027') || has('nvim')
+    call add(plugins, ['lambdalisue/gina.vim', { 'on_cmd' : 'Gina'}])
+  else
+    call add(plugins, ['lambdalisue/vim-gita', { 'on_cmd' : 'Gita'}])
+  endif
+  return plugins
 endfunction
 
 
 function! SpaceVim#layers#git#config() abort
-    nnoremap <silent> <Leader>gs :Gita status<CR>
+  if has('patch-8.0.0027') || has('nvim')
+    nnoremap <silent> <Leader>gd :Gina diff<CR>
+    nnoremap <silent> <Leader>gs :Gina status<CR>
+    nnoremap <silent> <Leader>gc :Gina commit<CR>
+    nnoremap <silent> <Leader>gb :Gina blame<CR>
+    nnoremap <silent> <Leader>gp :Gina push<CR>
+    nnoremap <silent> <Leader>ga :Gina add %<CR>
+    nnoremap <silent> <Leader>gA :Gina add .<CR>
+    let g:_spacevim_mappings.g = {'name' : 'git function',
+          \ 'd' : ['Gina diff', 'git diff'],
+          \ 's' : ['Gina status', 'git status'],
+          \ 'c' : ['Gina commit', 'git commit'],
+          \ 'b' : ['Gina blame', 'git blame'],
+          \ 'p' : ['Gina push', 'git push'],
+          \ 'a' : ['Gina add %', 'git add current buffer'],
+          \ 'A' : ['Gina add .', 'git add all files'],
+          \ }
+  else
     nnoremap <silent> <Leader>gd :Gita diff<CR>
+    nnoremap <silent> <Leader>gs :Gita status<CR>
     nnoremap <silent> <Leader>gc :Gita commit<CR>
     nnoremap <silent> <Leader>gb :Gita blame<CR>
     nnoremap <silent> <Leader>gp :Gita push<CR>
-    nmap <leader>hj <plug>(signify-next-hunk)
-    nmap <leader>hk <plug>(signify-prev-hunk)
-    nmap <leader>hJ 9999<leader>gj
-    nmap <leader>hK 9999<leader>gk
-    augroup spacevim_layer_git
-        autocmd!
-        autocmd FileType diff nnoremap <buffer><silent> q :bd!<CR>
-    augroup END
+    nnoremap <silent> <Leader>ga :Gita add %<CR>
+    nnoremap <silent> <Leader>gA :Gita add .<CR>
+    let g:_spacevim_mappings.g = {'name' : 'git function',
+          \ 'd' : ['Gita diff', 'git diff'],
+          \ 's' : ['Gita status', 'git status'],
+          \ 'c' : ['Gita commit', 'git commit'],
+          \ 'b' : ['Gita blame', 'git blame'],
+          \ 'p' : ['Gita push', 'git push'],
+          \ 'a' : ['Gita add %', 'git add current buffer'],
+          \ 'A' : ['Gita add .', 'git add all files'],
+          \ }
+  endif
+  nmap <leader>hj <plug>(signify-next-hunk)
+  nmap <leader>hk <plug>(signify-prev-hunk)
+  nmap <leader>hJ 9999<leader>gj
+  nmap <leader>hK 9999<leader>gk
+  augroup spacevim_layer_git
+    autocmd!
+    autocmd FileType diff nnoremap <buffer><silent> q :bd!<CR>
+  augroup END
 endfunction
+
+" vim:set et sw=2 cc=80:
diff --git a/config/plugins/vim-leader-guide.vim b/config/plugins/vim-leader-guide.vim
deleted file mode 100644
index ae99a21b5..000000000
--- a/config/plugins/vim-leader-guide.vim
+++ /dev/null
@@ -1,8 +0,0 @@
-let g:leaderGuide_max_size = 15
-let g:leaderGuide_submode_mappings = 
-            \ { '<C-C>': 'win_close', '<PageDown>': 'page_down', '<PageUp>': 'page_up'}
-let g:_spacevim_mappings.g = {'name' : 'git function',
-            \ 'd' : ['Gita diff', 'git diff'],
-            \ }
-call leaderGuide#register_prefix_descriptions("\\", 'g:_spacevim_mappings')
-call leaderGuide#register_prefix_descriptions("[unite]", 'g:_spacevim_unite_mappings')
diff --git a/config/plugins_before/vim-leader-guide.vim b/config/plugins_before/vim-leader-guide.vim
deleted file mode 100644
index 6f02ce82d..000000000
--- a/config/plugins_before/vim-leader-guide.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-if g:spacevim_realtime_leader_guide
-    nnoremap <silent><nowait> <leader> :<c-u>LeaderGuide get(g:, 'mapleader', '\')<CR>
-    vnoremap <silent> <leader> :<c-u>LeaderGuideVisual get(g:, 'mapleader', '\')<CR>
-endif