improve Gadd with current file

Author: chemzqm

autoload/easygit.vim

@@ -5,6 +5,7 @@
 " Version: 0.2.1
 " Last Modified: Dec 18, 2016
 " ============================================================================
+let s:nomodeline = (v:version > 703 || (v:version == 703 && has('patch442'))) ? '<nomodeline>' : ''
 let s:is_win = has("win32") || has('win64')
 
 " Extract git directory by path
@@ -31,8 +32,8 @@ function! s:FindGitdir(path)
     return substitute(root, '\r\?\n', '', '') . '/.git'
   else
     let dir = finddir('.git', expand(a:path).';')
-    if dir | return fnamemodify(dir, ':p:h') | endif
-    return ''
+    if empty(dir) | return '' | endif
+    return fnamemodify(dir, ':p:h')
   endif
 endfunction
 
@@ -617,14 +618,18 @@ endfunction
 
 " Run git add with files in smartRoot
 function! easygit#add(...) abort
-  if a:0 == 0 | return | endif
   let root = easygit#smartRoot()
   if empty(root) | return | endif
   let cwd = getcwd()
   execute 'lcd ' . root
-  let args = join(map(copy(a:000), 'shellescape(v:val)'), ' ')
-  let command = 'git add ' . join(a:000, ' ')
+  if empty(a:000)
+    let l:args = expand('%')
+  else
+    let l:args = join(map(copy(a:000), 'shellescape(v:val)'), ' ')
+  endif
+  let command = 'git add ' . l:args
   call s:system(command)
+  call s:ResetGutter(bufnr('%'))
   execute 'lcd ' . cwd
 endfunction
 
@@ -634,13 +639,40 @@ function! easygit#status()
   if empty(root) | return | endif
   let cwd = getcwd()
   execute 'lcd ' . root
-  call s:execute('git status --long -b', {
+  call s:execute('git --no-pager status --long -b', {
         \ 'edit': 'edit',
         \ 'title': '__easygit_status__',
         \})
   execute 'lcd ' . cwd
 endfunction
 
+function! easygit#read(args)
+  let root = easygit#smartRoot()
+  if empty(root) | return | endif
+  let old_cwd = getcwd()
+  execute 'lcd ' . root
+  if empty(a:args)
+    let path = expand('%')
+  else
+    let path = a:args
+  endif
+  if empty(path) | return | endif
+  let output = system('git --no-pager show :'.path)
+  if v:shell_error && output !=# ""
+    echohl Error | echon output | echohl None
+    return -1
+  endif
+  execute 'edit ' . path
+  execute '%d'
+  let eol = s:is_win ? '\v\n' : '\v\r?\n'
+  let list = split(output, eol)
+  if len(list)
+    call setline(1, list[0])
+    silent! call append(1, list[1:])
+  endif
+  execute 'lcd ' . old_cwd
+endfunction
+
 function! easygit#merge(args)
   if a:0 == 0 | return | endif
   let root = easygit#smartRoot()
@@ -678,7 +710,7 @@ function! s:execute(cmd, option) abort
   let edit = get(a:option, 'edit', 'edit')
   let pipe = get(a:option, 'pipe', 0)
   let bnr = bufnr('%')
-  if edit !~# 'keepalt'
+  if edit !~# 'keepalt' && !get(a:option, 'nokeep', 0)
     let edit = 'keepalt ' . edit
   endif
   if pipe
@@ -789,4 +821,10 @@ function! s:escape(str)
   endif
   return a:str
 endfunction
+
+function! s:ResetGutter(bufnr)
+  if exists('*gitgutter#process_buffer')
+    call gitgutter#process_buffer(a:bufnr, 1)
+  endif
+endfunction
 " vim:set et sw=2 ts=2 tw=78:

doc/easygit.txt

@@ -192,8 +192,9 @@ All commands are disabed by default to avoid conflict, you have to use
 		added for git rm. If no files specified, current file is used,
 		{files} would also be removed from vim's buffer list.
 
-:Gadd {files}...				*:Gadd*
-		Run git add with {files}
+:Gadd [{files}]...				*:Gadd*
+		Run git add with {files}, use current file when no argument
+		provided.
 
 :Gstatus 					*:Gstatus*
 		Show git status in a temporary buffer
@@ -214,6 +215,12 @@ All commands are disabed by default to avoid conflict, you have to use
 :Grevert {args}					*:Grevert*
 		Run git revert with {args}
 
+:Gread [{file}]
+		a variant of git checkout -- filename that operates on the
+		buffer rather than the filename. This means you can use u to
+		undo it and you never get any warnings about the file changing
+		outside Vim.
+
 ==============================================================================
 VARIABLES 				*easygit-variables*
 
@@ -386,6 +393,8 @@ CHANGELOG				*easygit-changelog*
 
 	- Use $GIT_DIR or `git rev-parse --show-toplevel` to find git root
 	  directory by default.
+	- Add :Gread command
+	- :Gadd works with current file by default
 
 
 0.5.1   2017-06-14

plugin/easygit.vim

@@ -155,12 +155,13 @@ if get(g:, 'easygit_enable_command', 0)
   command! -nargs=* -complete=custom,easygit#listRemotes Gpush      :call easygit#dispatch('push', <q-args>)
   command! -nargs=* -complete=custom,easygit#listRemotes Gfetch     :call easygit#dispatch('fetch', <q-args>)
   command! -nargs=* -complete=custom,easygit#listRemotes Gpull      :call easygit#dispatch('pull', <q-args>)
-  command! -nargs=+ -complete=custom,easygit#completeAdd Gadd       :call easygit#add(<f-args>)
+  command! -nargs=* -complete=custom,easygit#completeAdd Gadd       :call easygit#add(<f-args>)
   command! -nargs=+ -complete=custom,s:CompleteBranch    Gmerge     :call easygit#merge(<q-args>)
   command! -nargs=+ -complete=custom,s:GitFiles          Ggrep      :call easygit#grep(<q-args>)
   command! -nargs=+ -complete=customlist,easygit#completeRevert    Grevert    :call easygit#revert(<q-args>)
   command! -nargs=+ -complete=customlist,easygit#completeReset     Greset     :call easygit#reset(<q-args>)
   command! -nargs=+ -complete=customlist,easygit#completeCommit    Gcommit    :call easygit#commit(<q-args>)
+  command! -nargs=? -complete=custom,easygit#completeAdd           Gread      :call easygit#read(<q-args>)
 endif
 
 " enable auto lcd