m-vim_plugins/vim-gitgutter
1
0
Fork 0
mirror of https://github.com/airblade/vim-gitgutter.git synced 2025-11-10 12:33:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix staging of hunks coming after deleted lines.

Browse Source 
Previously vim-gitgutter generated context-free patches and applied
those to the index.  However when staging a hunk situated after any
deleted lines, the line numbers on the patch were out by the number
of lines deleted, and without any context git would apply the patch
to the wrong part of the file in the index.

This commit ensure patches are generated with 1 line of context,
allowing git to adjust the line numbers appropriately and apply the
patch to the right location.

More lines of context would help git more to adjust line numbers; but
the more context we have the more we group together hunks we would
like to treat separately.
This commit is contained in:
Andy Stewart
2014-10-16 11:50:20 +02:00
parent 1e8201963c
commit e5eb9e6ecf
3 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
autoload/gitgutter.vim
View File

@@ -19,7 +19,7 @@ function! gitgutter#process_buffer(file, realtime)
endif
try
if !a:realtime || gitgutter#utility#has_fresh_changes(a:file)
let diff = gitgutter#diff#run_diff(a:realtime || gitgutter#utility#has_unsaved_changes(a:file), 1)
let diff = gitgutter#diff#run_diff(a:realtime || gitgutter#utility#has_unsaved_changes(a:file), 1, 0)
call gitgutter#hunk#set_hunks(gitgutter#diff#parse_diff(diff))
let modified_lines = gitgutter#diff#process_hunks(gitgutter#hunk#hunks())
@@ -156,17 +156,11 @@ function! gitgutter#stage_hunk()
" It doesn't make sense to stage a hunk otherwise.
silent write
" find current hunk
let current_hunk = gitgutter#hunk#current_hunk()
if empty(current_hunk)
return
endif
" construct a diff
let diff_for_hunk = gitgutter#diff#generate_diff_for_hunk(current_hunk, 1)
let diff_for_hunk = gitgutter#diff#generate_diff_for_hunk(1, 1)
" apply the diff
call gitgutter#utility#system(gitgutter#utility#command_in_directory_of_file('git apply --cached --unidiff-zero - '), diff_for_hunk)
call gitgutter#utility#system(gitgutter#utility#command_in_directory_of_file('git apply --cached --recount --allow-overlap - '), diff_for_hunk)
" refresh gitgutter's view of buffer
silent execute "GitGutter"
@@ -179,17 +173,11 @@ function! gitgutter#revert_hunk()
" It doesn't make sense to stage a hunk otherwise.
silent write
" find current hunk
let current_hunk = gitgutter#hunk#current_hunk()
if empty(current_hunk)
return
endif
" construct a diff
let diff_for_hunk = gitgutter#diff#generate_diff_for_hunk(current_hunk, 1)
let diff_for_hunk = gitgutter#diff#generate_diff_for_hunk(1, 1)
" apply the diff
call gitgutter#utility#system(gitgutter#utility#command_in_directory_of_file('git apply --reverse --unidiff-zero - '), diff_for_hunk)
call gitgutter#utility#system(gitgutter#utility#command_in_directory_of_file('git apply --reverse - '), diff_for_hunk)
" reload file
silent edit
@@ -200,14 +188,8 @@ function! gitgutter#preview_hunk()
if gitgutter#utility#is_active()
silent write
" find current hunk
let current_hunk = gitgutter#hunk#current_hunk()
if empty(current_hunk)
return
endif
" construct a diff
let diff_for_hunk = gitgutter#diff#generate_diff_for_hunk(current_hunk, 0)
let diff_for_hunk = gitgutter#diff#generate_diff_for_hunk(0, 0)
" preview the diff
silent! wincmd P