2013-03-07 07:12:01 -05:00
|
|
|
" Copyright (c) 2013 Marco Hinz
|
|
|
|
" All rights reserved.
|
|
|
|
"
|
|
|
|
" Redistribution and use in source and binary forms, with or without
|
|
|
|
" modification, are permitted provided that the following conditions are met:
|
|
|
|
"
|
|
|
|
" - Redistributions of source code must retain the above copyright notice, this
|
|
|
|
" list of conditions and the following disclaimer.
|
|
|
|
" - Redistributions in binary form must reproduce the above copyright notice,
|
|
|
|
" this list of conditions and the following disclaimer in the documentation
|
|
|
|
" and/or other materials provided with the distribution.
|
|
|
|
" - Neither the name of the author nor the names of its contributors may be
|
|
|
|
" used to endorse or promote products derived from this software without
|
|
|
|
" specific prior written permission.
|
|
|
|
"
|
|
|
|
" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
|
|
" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
" ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
|
|
|
" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
|
|
" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
|
|
" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
|
|
" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
|
|
" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
|
|
" POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
|
2013-03-08 01:16:33 -05:00
|
|
|
if exists('g:loaded_signify') || !has('signs') || &cp
|
2013-03-05 13:48:21 -05:00
|
|
|
finish
|
|
|
|
endif
|
|
|
|
let g:loaded_signify = 1
|
|
|
|
|
|
|
|
" Default values {{{1
|
2013-03-14 20:27:05 -04:00
|
|
|
let s:line_highlight = 0 " disable line highlighting
|
2013-03-15 07:34:19 -04:00
|
|
|
let s:signmode = 0
|
2013-03-14 20:27:05 -04:00
|
|
|
let s:sy = {} " the main data structure
|
2013-03-15 21:19:38 -04:00
|
|
|
let s:other_signs_line_numbers = {}
|
2013-03-08 03:11:18 -05:00
|
|
|
|
|
|
|
" overwrite non-signify signs by default
|
2013-03-07 06:56:25 -05:00
|
|
|
let s:sign_overwrite = exists('g:signify_sign_overwrite') ? g:signify_sign_overwrite : 1
|
2013-03-05 13:48:21 -05:00
|
|
|
|
2013-03-25 11:12:31 -04:00
|
|
|
let s:vcs_list = exists('g:signify_vcs_list') ? g:signify_vcs_list : [ 'git', 'hg', 'svn', 'darcs', 'bzr', 'cvs', 'rcs' ]
|
|
|
|
|
2013-03-05 13:48:21 -05:00
|
|
|
let s:id_start = 0x100
|
|
|
|
let s:id_top = s:id_start
|
|
|
|
|
|
|
|
" Default mappings {{{1
|
2013-03-26 09:25:45 -04:00
|
|
|
if !maparg('[c', 'n')
|
2013-03-26 13:51:49 -04:00
|
|
|
nnoremap <silent> ]c :<c-u>execute v:count .'SignifyJumpToNextHunk'<cr>
|
|
|
|
nnoremap <silent> [c :<c-u>execute v:count .'SignifyJumpToPrevHunk'<cr>
|
2013-03-26 09:25:45 -04:00
|
|
|
endif
|
|
|
|
|
2013-03-06 06:32:02 -05:00
|
|
|
if exists('g:signify_mapping_next_hunk')
|
2013-03-26 06:38:43 -04:00
|
|
|
execute 'nnoremap <silent> '. g:signify_mapping_next_hunk .' :<c-u>execute v:count ."SignifyJumpToNextHunk"<cr>'
|
2013-03-05 13:48:21 -05:00
|
|
|
else
|
2013-03-26 06:38:43 -04:00
|
|
|
nnoremap <silent> <leader>gj :<c-u>execute v:count .'SignifyJumpToNextHunk'<cr>
|
2013-03-05 13:48:21 -05:00
|
|
|
endif
|
|
|
|
|
2013-03-06 06:32:02 -05:00
|
|
|
if exists('g:signify_mapping_prev_hunk')
|
2013-03-26 06:38:43 -04:00
|
|
|
execute 'nnoremap <silent> '. g:signify_mapping_prev_hunk .' :<c-u>execute v:count ."SignifyJumpToPrevHunk"<cr>'
|
2013-03-05 13:48:21 -05:00
|
|
|
else
|
2013-03-26 06:38:43 -04:00
|
|
|
nnoremap <silent> <leader>gk :<c-u>execute v:count .'SignifyJumpToPrevHunk'<cr>
|
2013-03-05 13:48:21 -05:00
|
|
|
endif
|
|
|
|
|
|
|
|
if exists('g:signify_mapping_toggle_highlight')
|
2013-03-26 06:38:43 -04:00
|
|
|
execute 'nnoremap <silent> '. g:signify_mapping_toggle_highlight .' :SignifyToggleHighlight<cr>'
|
2013-03-05 13:48:21 -05:00
|
|
|
else
|
2013-03-26 06:38:43 -04:00
|
|
|
nnoremap <silent> <leader>gh :SignifyToggleHighlight<cr>
|
2013-03-05 13:48:21 -05:00
|
|
|
endif
|
|
|
|
|
|
|
|
if exists('g:signify_mapping_toggle')
|
2013-03-26 06:38:43 -04:00
|
|
|
execute 'nnoremap <silent> '. g:signify_mapping_toggle .' :SignifyToggle<cr>'
|
2013-03-05 13:48:21 -05:00
|
|
|
else
|
2013-03-26 06:38:43 -04:00
|
|
|
nnoremap <silent> <leader>gt :SignifyToggle<cr>
|
2013-03-05 13:48:21 -05:00
|
|
|
endif
|
|
|
|
|
|
|
|
" Default signs {{{1
|
2013-03-05 17:09:08 -05:00
|
|
|
if exists('g:signify_sign_add')
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'sign define SignifyAdd text='. g:signify_sign_add .' texthl=SignifyAdd linehl=none'
|
2013-03-05 13:48:21 -05:00
|
|
|
else
|
2013-03-11 18:14:58 -04:00
|
|
|
sign define SignifyAdd text=+ texthl=SignifyAdd linehl=none
|
2013-03-05 13:48:21 -05:00
|
|
|
endif
|
|
|
|
|
2013-03-05 17:09:08 -05:00
|
|
|
if exists('g:signify_sign_delete')
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'sign define SignifyDelete text='. g:signify_sign_delete .' texthl=SignifyDelete linehl=none'
|
2013-03-05 13:48:21 -05:00
|
|
|
else
|
2013-03-11 18:14:58 -04:00
|
|
|
sign define SignifyDelete text=_ texthl=SignifyDelete linehl=none
|
2013-03-05 13:48:21 -05:00
|
|
|
endif
|
|
|
|
|
2013-03-11 19:44:51 -04:00
|
|
|
if exists('g:signify_sign_delete_first_line')
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'sign define SignifyDeleteFirstLine text='. g:signify_sign_delete_first_line .' texthl=SignifyDeleteFirstLine linehl=none'
|
2013-03-11 19:44:51 -04:00
|
|
|
else
|
|
|
|
sign define SignifyDeleteFirstLine text=‾ texthl=SignifyDelete linehl=none
|
|
|
|
endif
|
|
|
|
|
2013-03-05 17:09:08 -05:00
|
|
|
if exists('g:signify_sign_change')
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'sign define SignifyChange text='. g:signify_sign_change .' texthl=SignifyChange linehl=none'
|
2013-03-05 13:48:21 -05:00
|
|
|
else
|
2013-03-11 18:14:58 -04:00
|
|
|
sign define SignifyChange text=! texthl=SignifyChange linehl=none
|
2013-03-05 13:48:21 -05:00
|
|
|
endif
|
|
|
|
|
2013-03-11 20:09:46 -04:00
|
|
|
if exists('g:signify_sign_change_delete')
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'sign define SignifyChangeDelete text='. g:signify_sign_change_delete .' texthl=SignifyChange linehl=none'
|
2013-03-11 20:09:46 -04:00
|
|
|
else
|
|
|
|
sign define SignifyChangeDelete text=!_ texthl=SignifyChange linehl=none
|
|
|
|
endif
|
|
|
|
|
2013-03-13 09:30:42 -04:00
|
|
|
sign define SignifyPlaceholder text=~ texthl=SignifyChange linehl=none
|
|
|
|
|
2013-03-05 13:48:21 -05:00
|
|
|
" Initial stuff {{{1
|
2013-03-12 07:25:22 -04:00
|
|
|
augroup signify
|
|
|
|
autocmd!
|
2013-03-13 14:23:47 -04:00
|
|
|
|
2013-03-12 07:25:22 -04:00
|
|
|
if exists('g:signify_cursorhold_normal') && (g:signify_cursorhold_normal == 1)
|
2013-03-17 20:51:19 -04:00
|
|
|
autocmd CursorHold * write | call s:start(s:file)
|
2013-03-12 07:25:22 -04:00
|
|
|
endif
|
2013-03-13 14:23:47 -04:00
|
|
|
|
2013-03-12 07:25:22 -04:00
|
|
|
if exists('g:signify_cursorhold_insert') && (g:signify_cursorhold_insert == 1)
|
2013-03-17 20:51:19 -04:00
|
|
|
autocmd CursorHoldI * write | call s:start(s:file)
|
2013-03-12 07:25:22 -04:00
|
|
|
endif
|
2013-03-13 14:23:47 -04:00
|
|
|
|
|
|
|
if !has('gui_win32')
|
2013-03-17 19:31:59 -04:00
|
|
|
autocmd FocusGained * call s:start(resolve(expand('<afile>:p')))
|
2013-03-13 14:06:52 -04:00
|
|
|
endif
|
2013-03-13 14:23:47 -04:00
|
|
|
|
2013-03-16 13:12:33 -04:00
|
|
|
autocmd VimEnter,ColorScheme * call s:colors_set()
|
2013-03-17 20:51:19 -04:00
|
|
|
autocmd BufEnter * let s:file = resolve(expand('<afile>:p'))
|
|
|
|
autocmd BufEnter,BufWritePost * call s:start(s:file)
|
2013-03-12 07:25:22 -04:00
|
|
|
augroup END
|
2013-03-05 13:48:21 -05:00
|
|
|
|
2013-03-14 20:27:05 -04:00
|
|
|
com! -nargs=0 -bar SignifyToggle call s:toggle_signify()
|
|
|
|
com! -nargs=0 -bar SignifyToggleHighlight call s:toggle_line_highlighting()
|
|
|
|
com! -nargs=0 -bar -count SignifyJumpToNextHunk call s:jump_to_next_hunk(<count>)
|
|
|
|
com! -nargs=0 -bar -count SignifyJumpToPrevHunk call s:jump_to_prev_hunk(<count>)
|
2013-03-05 13:48:21 -05:00
|
|
|
|
|
|
|
" Internal functions {{{1
|
|
|
|
" Functions -> s:start() {{{2
|
2013-03-08 03:11:18 -05:00
|
|
|
function! s:start(path) abort
|
2013-03-12 14:06:03 -04:00
|
|
|
if empty(a:path) || !filereadable(a:path) || &ft == 'help'
|
2013-03-11 18:14:58 -04:00
|
|
|
return
|
|
|
|
endif
|
|
|
|
|
2013-03-15 07:34:19 -04:00
|
|
|
if s:signmode
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'sign place 99999 line=1 name=SignifyPlaceholder file='. a:path
|
2013-03-15 07:34:19 -04:00
|
|
|
endif
|
|
|
|
|
2013-03-26 05:34:29 -04:00
|
|
|
if exists('g:signify_skip_filetype') && has_key(g:signify_skip_filetype, &ft)
|
|
|
|
return
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
2013-03-26 05:34:29 -04:00
|
|
|
if exists('g:signify_skip_filename') && has_key(g:signify_skip_filename, a:path)
|
|
|
|
return
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
|
|
|
|
|
|
|
" New buffer.. add to list.
|
|
|
|
if !has_key(s:sy, a:path)
|
2013-03-12 20:37:46 -04:00
|
|
|
let [ diff, type ] = s:repo_detect(a:path)
|
|
|
|
if empty(diff)
|
|
|
|
return
|
|
|
|
endif
|
|
|
|
let s:sy[a:path] = { 'active': 1, 'type': type, 'ids': [], 'id_jump': s:id_top, 'id_top': s:id_top, 'last_jump_was_next': -1 }
|
|
|
|
" Inactive buffer.. bail out.
|
2013-03-15 07:34:19 -04:00
|
|
|
elseif !s:sy[a:path].active
|
|
|
|
sign unplace 99999
|
|
|
|
let s:signmode = 0
|
2013-03-11 18:14:58 -04:00
|
|
|
return
|
|
|
|
else
|
|
|
|
call s:sign_remove_all(a:path)
|
2013-03-12 20:37:46 -04:00
|
|
|
let diff = s:repo_get_diff_{s:sy[a:path].type}(a:path)
|
|
|
|
if empty(diff)
|
2013-03-13 09:30:42 -04:00
|
|
|
sign unplace 99999
|
2013-03-15 07:34:19 -04:00
|
|
|
let s:signmode = 0
|
2013-03-12 20:37:46 -04:00
|
|
|
return
|
|
|
|
endif
|
2013-03-11 18:14:58 -04:00
|
|
|
let s:sy[a:path].id_top = s:id_top
|
|
|
|
let s:sy[a:path].id_jump = s:id_top
|
|
|
|
let s:sy[a:path].last_jump_was_next = -1
|
|
|
|
endif
|
2013-03-05 13:48:21 -05:00
|
|
|
|
2013-03-11 18:14:58 -04:00
|
|
|
if !s:sign_overwrite
|
|
|
|
call s:sign_get_others(a:path)
|
|
|
|
endif
|
2013-03-05 13:48:21 -05:00
|
|
|
|
2013-03-12 20:37:46 -04:00
|
|
|
call s:repo_process_diff(a:path, diff)
|
2013-03-05 13:48:21 -05:00
|
|
|
|
2013-03-13 09:30:42 -04:00
|
|
|
sign unplace 99999
|
2013-03-15 07:34:19 -04:00
|
|
|
let s:signmode = 1
|
|
|
|
let s:sy[a:path].id_top = (s:id_top - 1)
|
2013-03-19 17:34:31 -04:00
|
|
|
let s:path = a:path
|
2013-03-08 03:11:18 -05:00
|
|
|
endfunction
|
2013-03-07 10:54:20 -05:00
|
|
|
|
2013-03-05 13:48:21 -05:00
|
|
|
" Functions -> s:stop() {{{2
|
2013-03-08 03:11:18 -05:00
|
|
|
function! s:stop(path) abort
|
2013-03-11 18:14:58 -04:00
|
|
|
if !has_key(s:sy, a:path)
|
|
|
|
return
|
|
|
|
endif
|
2013-03-08 03:54:42 -05:00
|
|
|
|
2013-03-11 18:14:58 -04:00
|
|
|
call s:sign_remove_all(a:path)
|
2013-03-08 10:22:58 -05:00
|
|
|
|
2013-03-15 07:34:19 -04:00
|
|
|
if !s:sy[a:path].active
|
2013-03-11 18:14:58 -04:00
|
|
|
return
|
|
|
|
else
|
|
|
|
call remove(s:sy, a:path)
|
|
|
|
endif
|
2013-03-08 03:54:42 -05:00
|
|
|
|
2013-03-25 11:12:31 -04:00
|
|
|
augroup signify
|
|
|
|
autocmd! * <buffer>
|
|
|
|
augroup END
|
2013-03-05 13:48:21 -05:00
|
|
|
endfunction
|
|
|
|
|
2013-03-08 11:19:34 -05:00
|
|
|
" Functions -> s:sign_get_others() {{{2
|
|
|
|
function! s:sign_get_others(path) abort
|
2013-03-11 18:14:58 -04:00
|
|
|
redir => signlist
|
2013-03-17 20:40:03 -04:00
|
|
|
sil! execute 'sign place file='. a:path
|
2013-03-11 18:14:58 -04:00
|
|
|
redir END
|
|
|
|
|
|
|
|
for line in split(signlist, '\n')
|
2013-03-13 11:38:37 -04:00
|
|
|
if line =~ '\v^\s+\w+'
|
2013-03-15 21:19:38 -04:00
|
|
|
let lnum = matchlist(line, '\v^\s+\w+\=(\d+)')[1]
|
2013-03-13 08:44:37 -04:00
|
|
|
let s:other_signs_line_numbers[lnum] = 1
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
|
|
|
endfor
|
2013-03-07 06:56:25 -05:00
|
|
|
endfunction
|
2013-03-06 07:10:51 -05:00
|
|
|
|
2013-03-08 11:19:34 -05:00
|
|
|
" Functions -> s:sign_set() {{{2
|
|
|
|
function! s:sign_set(lnum, type, path)
|
2013-03-11 18:14:58 -04:00
|
|
|
" Preserve non-signify signs
|
2013-03-13 08:44:37 -04:00
|
|
|
if !s:sign_overwrite && has_key(s:other_signs_line_numbers, a:lnum)
|
2013-03-11 18:14:58 -04:00
|
|
|
return
|
|
|
|
endif
|
2013-03-06 07:10:51 -05:00
|
|
|
|
2013-03-11 18:14:58 -04:00
|
|
|
call add(s:sy[a:path].ids, s:id_top)
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'sign place '. s:id_top .' line='. a:lnum .' name='. a:type .' file='. a:path
|
2013-03-06 07:10:51 -05:00
|
|
|
|
2013-03-11 18:14:58 -04:00
|
|
|
let s:id_top += 1
|
2013-03-07 06:56:25 -05:00
|
|
|
endfunction
|
2013-03-06 07:10:51 -05:00
|
|
|
|
2013-03-08 11:19:34 -05:00
|
|
|
" Functions -> s:sign_remove_all() {{{2
|
|
|
|
function! s:sign_remove_all(path) abort
|
2013-03-11 18:14:58 -04:00
|
|
|
for id in s:sy[a:path].ids
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'sign unplace '. id
|
2013-03-11 18:14:58 -04:00
|
|
|
endfor
|
2013-03-08 03:11:18 -05:00
|
|
|
|
2013-03-11 18:14:58 -04:00
|
|
|
let s:other_signs_line_numbers = {}
|
2013-03-11 18:46:34 -04:00
|
|
|
let s:sy[a:path].id_jump = -1
|
2013-03-15 07:34:19 -04:00
|
|
|
let s:sy[a:path].ids = []
|
2013-03-07 06:56:25 -05:00
|
|
|
endfunction
|
2013-03-08 03:11:18 -05:00
|
|
|
|
2013-03-12 20:37:46 -04:00
|
|
|
" Functions -> s:repo_detect() {{{2
|
|
|
|
function! s:repo_detect(path) abort
|
|
|
|
if !executable('grep') || !executable('diff')
|
|
|
|
echo 'signify: I cannot work without grep and diff!'
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
|
|
|
|
2013-03-25 11:12:31 -04:00
|
|
|
for type in s:vcs_list
|
2013-03-12 20:37:46 -04:00
|
|
|
let diff = s:repo_get_diff_{type}(a:path)
|
|
|
|
if !empty(diff)
|
|
|
|
return [ diff, type ]
|
|
|
|
endif
|
|
|
|
endfor
|
|
|
|
|
|
|
|
return [ '', '' ]
|
|
|
|
endfunction
|
|
|
|
|
|
|
|
" Functions -> s:repo_get_diff_git {{{2
|
|
|
|
function! s:repo_get_diff_git(path) abort
|
2013-03-11 18:14:58 -04:00
|
|
|
if executable('git')
|
2013-03-26 08:57:57 -04:00
|
|
|
let diff = system('cd '. fnameescape(fnamemodify(a:path, ':h')) .' && git diff --no-ext-diff -U0 -- '. fnameescape(a:path) .' | grep --color=never "^@@ "')
|
|
|
|
return v:shell_error ? '' : diff
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
2013-03-12 20:37:46 -04:00
|
|
|
endfunction
|
2013-03-06 21:28:21 -05:00
|
|
|
|
2013-03-12 20:37:46 -04:00
|
|
|
" Functions -> s:repo_get_diff_hg {{{2
|
|
|
|
function! s:repo_get_diff_hg(path) abort
|
2013-03-11 18:14:58 -04:00
|
|
|
if executable('hg')
|
2013-03-26 08:58:58 -04:00
|
|
|
let diff = system('hg diff --nodates -U0 -- '. fnameescape(a:path) .' | grep --color=never "^@@ "')
|
2013-03-12 20:37:46 -04:00
|
|
|
return v:shell_error ? '' : diff
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
2013-03-12 20:37:46 -04:00
|
|
|
endfunction
|
2013-03-11 18:14:58 -04:00
|
|
|
|
2013-03-12 20:37:46 -04:00
|
|
|
" Functions -> s:repo_get_diff_svn {{{2
|
|
|
|
function! s:repo_get_diff_svn(path) abort
|
|
|
|
if executable('svn')
|
2013-03-26 08:58:58 -04:00
|
|
|
let diff = system('svn diff --diff-cmd diff -x -U0 -- '. fnameescape(a:path) .' | grep --color=never "^@@ "')
|
2013-03-12 20:37:46 -04:00
|
|
|
return v:shell_error ? '' : diff
|
|
|
|
endif
|
|
|
|
endfunction
|
2013-03-06 21:28:21 -05:00
|
|
|
|
2013-03-12 20:37:46 -04:00
|
|
|
" Functions -> s:repo_get_diff_bzr {{{2
|
|
|
|
function! s:repo_get_diff_bzr(path) abort
|
|
|
|
if executable('bzr')
|
2013-03-26 08:58:58 -04:00
|
|
|
let diff = system('bzr diff --using diff --diff-options=-U0 -- '. fnameescape(a:path) .' | grep --color=never "^@@ "')
|
2013-03-12 20:37:46 -04:00
|
|
|
return v:shell_error ? '' : diff
|
|
|
|
endif
|
|
|
|
endfunction
|
2013-03-06 21:28:21 -05:00
|
|
|
|
2013-03-12 20:37:46 -04:00
|
|
|
" Functions -> s:repo_get_diff_darcs {{{2
|
|
|
|
function! s:repo_get_diff_darcs(path) abort
|
|
|
|
if executable('darcs')
|
2013-03-26 08:57:57 -04:00
|
|
|
let diff = system('cd '. fnameescape(fnamemodify(a:path, ':h')) .' && darcs diff --no-pause-for-gui --diff-command="diff -U0 %1 %2" -- '. fnameescape(a:path) .' | grep --color=never "^@@ "')
|
|
|
|
return v:shell_error ? '' : diff
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
2013-03-12 20:37:46 -04:00
|
|
|
endfunction
|
2013-03-11 18:14:58 -04:00
|
|
|
|
2013-03-12 20:37:46 -04:00
|
|
|
" Functions -> s:repo_get_diff_cvs {{{2
|
|
|
|
function! s:repo_get_diff_cvs(path) abort
|
2013-03-25 11:12:31 -04:00
|
|
|
if executable('cvs')
|
2013-03-26 08:11:53 -04:00
|
|
|
let diff = system('cd '. fnameescape(fnamemodify(a:path, ':h')) .' && cvs diff -U0 -- '. fnameescape(fnamemodify(a:path, ':t')) .' | grep --color=never "^@@ "')
|
2013-03-12 20:37:46 -04:00
|
|
|
return v:shell_error ? '' : diff
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
2013-03-06 21:28:21 -05:00
|
|
|
endfunction
|
|
|
|
|
2013-03-15 08:08:56 -04:00
|
|
|
" Functions -> s:repo_get_diff_rcs {{{2
|
|
|
|
function! s:repo_get_diff_rcs(path) abort
|
|
|
|
if executable('rcs')
|
2013-03-26 08:58:58 -04:00
|
|
|
let diff = system('rcsdiff -U0 '. fnameescape(a:path) .' 2>/dev/null | grep --color=never "^@@ "')
|
2013-03-15 08:08:56 -04:00
|
|
|
return v:shell_error ? '' : diff
|
|
|
|
endif
|
|
|
|
endfunction
|
|
|
|
|
2013-03-12 20:37:46 -04:00
|
|
|
" Functions -> s:repo_process_diff() {{{2
|
|
|
|
function! s:repo_process_diff(path, diff) abort
|
2013-03-11 18:14:58 -04:00
|
|
|
" Determine where we have to put our signs.
|
|
|
|
for line in split(a:diff, '\n')
|
|
|
|
" Parse diff output.
|
2013-03-16 12:29:25 -04:00
|
|
|
let tokens = matchlist(line, '^\v\@\@ -(\d+),?(\d*) \+(\d+),?(\d*)')
|
2013-03-11 18:14:58 -04:00
|
|
|
if empty(tokens)
|
|
|
|
echo 'signify: I cannot parse this line "'. line .'"'
|
|
|
|
return
|
|
|
|
endif
|
|
|
|
|
|
|
|
let [ old_line, old_count, new_line, new_count ] = [ str2nr(tokens[1]), (tokens[2] == '') ? 1 : str2nr(tokens[2]), str2nr(tokens[3]), (tokens[4] == '') ? 1 : str2nr(tokens[4]) ]
|
|
|
|
|
|
|
|
" A new line was added.
|
|
|
|
if (old_count == 0) && (new_count >= 1)
|
|
|
|
let offset = 0
|
|
|
|
while offset < new_count
|
|
|
|
call s:sign_set(new_line + offset, 'SignifyAdd', a:path)
|
|
|
|
let offset += 1
|
|
|
|
endwhile
|
|
|
|
" An old line was removed.
|
|
|
|
elseif (old_count >= 1) && (new_count == 0)
|
2013-03-11 19:44:51 -04:00
|
|
|
if new_line == 0
|
|
|
|
call s:sign_set(1, 'SignifyDeleteFirstLine', a:path)
|
|
|
|
else
|
|
|
|
call s:sign_set(new_line, 'SignifyDelete', a:path)
|
|
|
|
endif
|
2013-03-11 18:14:58 -04:00
|
|
|
" A line was changed.
|
|
|
|
elseif (old_count == new_count)
|
|
|
|
let offset = 0
|
|
|
|
while offset < new_count
|
|
|
|
call s:sign_set(new_line + offset, 'SignifyChange', a:path)
|
|
|
|
let offset += 1
|
|
|
|
endwhile
|
|
|
|
else
|
|
|
|
" Lines were changed && deleted.
|
|
|
|
if (old_count > new_count)
|
|
|
|
let offset = 0
|
|
|
|
while offset < new_count
|
|
|
|
call s:sign_set(new_line + offset, 'SignifyChange', a:path)
|
|
|
|
let offset += 1
|
|
|
|
endwhile
|
2013-03-11 20:09:46 -04:00
|
|
|
call s:sign_set(new_line + offset - 1, 'SignifyChangeDelete', a:path)
|
|
|
|
" (old_count < new_count): Lines were changed && added.
|
2013-03-11 18:14:58 -04:00
|
|
|
else
|
|
|
|
let offset = 0
|
|
|
|
while offset < old_count
|
|
|
|
call s:sign_set(new_line + offset, 'SignifyChange', a:path)
|
|
|
|
let offset += 1
|
|
|
|
endwhile
|
|
|
|
while offset < new_count
|
|
|
|
call s:sign_set(new_line + offset, 'SignifyAdd', a:path)
|
|
|
|
let offset += 1
|
|
|
|
endwhile
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endfor
|
2013-03-05 13:48:21 -05:00
|
|
|
endfunction
|
2013-03-05 19:22:51 -05:00
|
|
|
|
2013-03-08 11:19:34 -05:00
|
|
|
" Functions -> s:colors_set() {{{2
|
2013-03-10 05:17:53 -04:00
|
|
|
function! s:colors_set() abort
|
2013-03-11 18:14:58 -04:00
|
|
|
if has('gui_running')
|
|
|
|
if exists('g:signify_sign_color_guibg')
|
|
|
|
let guibg = g:signify_sign_color_guibg
|
2013-03-16 19:42:11 -04:00
|
|
|
elseif exists('g:signify_sign_color_inherit_from_linenr')
|
|
|
|
let guibg = synIDattr(hlID('LineNr'), 'bg', 'gui')
|
2013-03-16 20:05:02 -04:00
|
|
|
else
|
2013-03-11 18:14:58 -04:00
|
|
|
let guibg = synIDattr(hlID('SignColumn'), 'bg', 'gui')
|
|
|
|
endif
|
|
|
|
|
|
|
|
if exists('g:signify_sign_color_group_add')
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi! link SignifyAdd '. g:signify_sign_color_group_add
|
2013-03-11 18:14:58 -04:00
|
|
|
else
|
|
|
|
let guifg_add = exists('g:signify_sign_color_guifg_add') ? g:signify_sign_color_guifg_add : '#11ee11'
|
|
|
|
if empty(guibg) || guibg < 0
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi SignifyAdd gui=bold guifg='. guifg_add
|
2013-03-11 18:14:58 -04:00
|
|
|
else
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi SignifyAdd gui=bold guifg='. guifg_add .' guibg='. guibg
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
if exists('g:signify_sign_color_group_delete')
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi! link SignifyDelete '. g:signify_sign_color_group_delete
|
2013-03-11 18:14:58 -04:00
|
|
|
else
|
|
|
|
let guifg_delete = exists('g:signify_sign_color_guifg_delete') ? g:signify_sign_color_guifg_delete : '#ee1111'
|
|
|
|
if empty(guibg) || guibg < 0
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi SignifyDelete gui=bold guifg='. guifg_delete
|
2013-03-11 18:14:58 -04:00
|
|
|
else
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi SignifyDelete gui=bold guifg='. guifg_delete .' guibg='. guibg
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
if exists('g:signify_sign_color_group_change')
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi! link SignifyChange '. g:signify_sign_color_group_change
|
2013-03-11 18:14:58 -04:00
|
|
|
else
|
|
|
|
let guifg_change = exists('g:signify_sign_color_guifg_change') ? g:signify_sign_color_guifg_change : '#eeee11'
|
|
|
|
if empty(guibg) || guibg < 0
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi SignifyChange gui=bold guifg='. guifg_change
|
2013-03-11 18:14:58 -04:00
|
|
|
else
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi SignifyChange gui=bold guifg='. guifg_change .' guibg='. guibg
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
else
|
|
|
|
if exists('g:signify_sign_color_ctermbg')
|
|
|
|
let ctermbg = g:signify_sign_color_ctermbg
|
2013-03-16 19:42:11 -04:00
|
|
|
elseif exists('g:signify_sign_color_inherit_from_linenr')
|
2013-03-16 20:05:02 -04:00
|
|
|
let ctermbg = synIDattr(hlID('LineNr'), 'bg', 'cterm')
|
|
|
|
else
|
2013-03-11 18:14:58 -04:00
|
|
|
let ctermbg = synIDattr(hlID('SignColumn'), 'bg', 'cterm')
|
|
|
|
endif
|
|
|
|
|
|
|
|
if exists('g:signify_sign_color_group_add')
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi! link SignifyAdd '. g:signify_sign_color_group_add
|
2013-03-11 18:14:58 -04:00
|
|
|
else
|
|
|
|
let ctermfg_add = exists('g:signify_sign_color_ctermfg_add') ? g:signify_sign_color_ctermfg_add : 2
|
|
|
|
if empty(ctermbg) || ctermbg < 0
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi SignifyAdd cterm=bold ctermfg='. ctermfg_add
|
2013-03-11 18:14:58 -04:00
|
|
|
else
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi SignifyAdd cterm=bold ctermfg='. ctermfg_add .' ctermbg='. ctermbg
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
if exists('g:signify_sign_color_group_delete')
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi! link SignifyDelete '. g:signify_sign_color_group_delete
|
2013-03-10 05:17:53 -04:00
|
|
|
else
|
2013-03-11 18:14:58 -04:00
|
|
|
let ctermfg_delete = exists('g:signify_sign_color_ctermfg_delete') ? g:signify_sign_color_ctermfg_delete : 1
|
|
|
|
if empty(ctermbg) || ctermbg < 0
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi SignifyDelete cterm=bold ctermfg='. ctermfg_delete
|
2013-03-11 18:14:58 -04:00
|
|
|
else
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi SignifyDelete cterm=bold ctermfg='. ctermfg_delete .' ctermbg='. ctermbg
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
2013-03-07 06:56:25 -05:00
|
|
|
endif
|
2013-03-11 18:14:58 -04:00
|
|
|
|
|
|
|
if exists('g:signify_sign_color_group_change')
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi! link SignifyChange '. g:signify_sign_color_group_change
|
2013-03-11 18:14:58 -04:00
|
|
|
else
|
|
|
|
let ctermfg_change = exists('g:signify_sign_color_ctermfg_change') ? g:signify_sign_color_ctermfg_change : 3
|
|
|
|
if empty(ctermbg) || ctermbg < 0
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi SignifyChange cterm=bold ctermfg='. ctermfg_change
|
2013-03-11 18:14:58 -04:00
|
|
|
else
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'hi SignifyChange cterm=bold ctermfg='. ctermfg_change .' ctermbg='. ctermbg
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
2013-03-10 05:17:53 -04:00
|
|
|
endfunction
|
2013-03-07 06:56:25 -05:00
|
|
|
|
2013-03-08 11:19:34 -05:00
|
|
|
" Functions -> s:toggle_signify() {{{2
|
|
|
|
function! s:toggle_signify() abort
|
2013-03-17 20:51:19 -04:00
|
|
|
if empty(s:path)
|
2013-03-11 18:14:58 -04:00
|
|
|
echo "signify: I don't sy empty buffers!"
|
|
|
|
return
|
|
|
|
endif
|
2013-03-08 11:19:34 -05:00
|
|
|
|
2013-03-17 20:51:19 -04:00
|
|
|
if has_key(s:sy, s:path)
|
|
|
|
if (s:sy[s:path].active == 1)
|
|
|
|
let s:sy[s:path].active = 0
|
|
|
|
call s:stop(s:path)
|
2013-03-11 18:14:58 -04:00
|
|
|
else
|
2013-03-17 20:51:19 -04:00
|
|
|
let s:sy[s:path].active = 1
|
|
|
|
call s:start(s:path)
|
2013-03-08 11:19:34 -05:00
|
|
|
endif
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
2013-03-08 11:19:34 -05:00
|
|
|
endfunction
|
|
|
|
|
2013-03-05 13:48:21 -05:00
|
|
|
" Functions -> s:toggle_line_highlighting() {{{2
|
|
|
|
function! s:toggle_line_highlighting() abort
|
2013-03-11 18:14:58 -04:00
|
|
|
if s:line_highlight
|
2013-03-11 20:09:46 -04:00
|
|
|
sign define SignifyAdd text=+ texthl=SignifyAdd linehl=none
|
|
|
|
sign define SignifyChange text=! texthl=SignifyChange linehl=none
|
|
|
|
sign define SignifyChangeDelete text=!_ texthl=SignifyChange linehl=none
|
|
|
|
sign define SignifyDelete text=_ texthl=SignifyDelete linehl=none
|
|
|
|
sign define SignifyDeleteFirstLine text=‾ texthl=SignifyDelete linehl=none
|
2013-03-11 19:44:51 -04:00
|
|
|
|
2013-03-11 18:14:58 -04:00
|
|
|
let s:line_highlight = 0
|
|
|
|
else
|
|
|
|
let add = exists('g:signify_line_color_add') ? g:signify_line_color_add : 'DiffAdd'
|
|
|
|
let delete = exists('g:signify_line_color_delete') ? g:signify_line_color_delete : 'DiffDelete'
|
|
|
|
let change = exists('g:signify_line_color_change') ? g:signify_line_color_change : 'DiffChange'
|
2013-03-11 19:44:51 -04:00
|
|
|
|
2013-03-17 20:40:03 -04:00
|
|
|
execute 'sign define SignifyAdd text=+ texthl=SignifyAdd linehl='. add
|
|
|
|
execute 'sign define SignifyChange text=! texthl=SignifyChange linehl='. change
|
|
|
|
execute 'sign define SignifyChangeDelete text=!_ texthl=SignifyChange linehl='. change
|
|
|
|
execute 'sign define SignifyDelete text=_ texthl=SignifyDelete linehl='. delete
|
|
|
|
execute 'sign define SignifyDeleteFirstLine text=‾ texthl=SignifyDelete linehl='. delete
|
2013-03-11 19:44:51 -04:00
|
|
|
|
2013-03-11 18:14:58 -04:00
|
|
|
let s:line_highlight = 1
|
|
|
|
endif
|
2013-03-17 20:51:19 -04:00
|
|
|
call s:start(s:file)
|
2013-03-05 13:48:21 -05:00
|
|
|
endfunction
|
|
|
|
|
2013-03-06 06:32:02 -05:00
|
|
|
" Functions -> s:jump_to_next_hunk() {{{2
|
2013-03-13 11:34:55 -04:00
|
|
|
function! s:jump_to_next_hunk(count)
|
2013-03-17 20:51:19 -04:00
|
|
|
if !has_key(s:sy, s:path) || s:sy[s:path].id_jump == -1
|
2013-03-11 18:46:34 -04:00
|
|
|
echo "signify: I cannot detect any changes!"
|
2013-03-11 18:14:58 -04:00
|
|
|
return
|
|
|
|
endif
|
2013-03-10 12:41:46 -04:00
|
|
|
|
2013-03-17 20:51:19 -04:00
|
|
|
if s:sy[s:path].last_jump_was_next == 0
|
|
|
|
let s:sy[s:path].id_jump += 2
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
2013-03-08 03:11:18 -05:00
|
|
|
|
2013-03-17 20:51:19 -04:00
|
|
|
let s:sy[s:path].id_jump += a:count ? (a:count - 1) : 0
|
2013-03-13 11:34:55 -04:00
|
|
|
|
2013-03-17 20:51:19 -04:00
|
|
|
if s:sy[s:path].id_jump > s:sy[s:path].id_top
|
|
|
|
let s:sy[s:path].id_jump = s:sy[s:path].ids[0]
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
2013-03-08 03:11:18 -05:00
|
|
|
|
2013-03-17 20:51:19 -04:00
|
|
|
execute 'sign jump '. s:sy[s:path].id_jump .' file='. s:path
|
2013-03-08 03:11:18 -05:00
|
|
|
|
2013-03-17 20:51:19 -04:00
|
|
|
let s:sy[s:path].id_jump += 1
|
|
|
|
let s:sy[s:path].last_jump_was_next = 1
|
2013-03-05 13:48:21 -05:00
|
|
|
endfunction
|
|
|
|
|
2013-03-06 06:32:02 -05:00
|
|
|
" Functions -> s:jump_to_prev_hunk() {{{2
|
2013-03-13 11:34:55 -04:00
|
|
|
function! s:jump_to_prev_hunk(count)
|
2013-03-17 20:51:19 -04:00
|
|
|
if !has_key(s:sy, s:path) || s:sy[s:path].id_jump == -1
|
2013-03-11 18:46:34 -04:00
|
|
|
echo "signify: I cannot detect any changes!"
|
2013-03-11 18:14:58 -04:00
|
|
|
return
|
|
|
|
endif
|
2013-03-10 12:41:46 -04:00
|
|
|
|
2013-03-17 20:51:19 -04:00
|
|
|
if s:sy[s:path].last_jump_was_next == 1
|
|
|
|
let s:sy[s:path].id_jump -= 2
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
2013-03-08 03:11:18 -05:00
|
|
|
|
2013-03-17 20:51:19 -04:00
|
|
|
let s:sy[s:path].id_jump -= a:count ? (a:count - 1) : 0
|
2013-03-13 11:34:55 -04:00
|
|
|
|
2013-03-17 20:51:19 -04:00
|
|
|
if s:sy[s:path].id_jump < s:sy[s:path].ids[0]
|
|
|
|
let s:sy[s:path].id_jump = s:sy[s:path].id_top
|
2013-03-11 18:14:58 -04:00
|
|
|
endif
|
2013-03-08 03:11:18 -05:00
|
|
|
|
2013-03-17 20:51:19 -04:00
|
|
|
execute 'sign jump '. s:sy[s:path].id_jump .' file='. s:path
|
2013-03-08 03:11:18 -05:00
|
|
|
|
2013-03-17 20:51:19 -04:00
|
|
|
let s:sy[s:path].id_jump -= 1
|
|
|
|
let s:sy[s:path].last_jump_was_next = 0
|
2013-03-05 13:48:21 -05:00
|
|
|
endfunction
|
2013-03-06 18:15:06 -05:00
|
|
|
|
2013-03-07 06:56:25 -05:00
|
|
|
" Functions -> SignifyDebugListActiveBuffers() {{{2
|
|
|
|
function! SignifyDebugListActiveBuffers() abort
|
2013-03-11 18:14:58 -04:00
|
|
|
if len(s:sy) == 0
|
|
|
|
echo 'No active buffers!'
|
|
|
|
return
|
|
|
|
endif
|
|
|
|
|
|
|
|
for i in items(s:sy)
|
|
|
|
echo i
|
|
|
|
endfor
|
2013-03-06 18:15:06 -05:00
|
|
|
endfunction
|
2013-03-11 18:14:58 -04:00
|
|
|
|
|
|
|
" vim:set et sw=2 sts=2:
|