1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
|
" ============================================================================
" File: diff_navigator.vim
" Description: Filetype plugin to ease navigation in (unified) diffs
" Maintainer: Petr Uzel <petr.uzel -at- centrum.cz>
" Version: 0.1
" Last Change: 27 Aug, 2008
" License: This program is free software. It comes without any warranty,
" to the extent permitted by applicable law. You can redistribute
" it and/or modify it under the terms of the Do What The Fuck You
" Want To Public License, Version 2, as published by Sam Hocevar.
" See http://sam.zoy.org/wtfpl/COPYING for more details.
"
" Bugs: Send bugreports/patches directly to me via mail
" Dependencies: filterdiff (part of patchutils project)
"
"
" TODO: show current hunk in status line
" TODO: delete hunk/whole file diff - like http://www.vim.org/scripts/script.php?script_id=444)
" TODO: incorporate more patchutils functionality
" TODO: something like taglist for diff (shows all files/hunks in the diff)
" TODO: option for *Next|Prev* funtions to wrap around end of file
" ============================================================================
" Only do this when not done yet for this buffer
" Usually, not needed, just for the keeping normal API
if exists("b:did_ftplugin")
finish
endif
let b:did_ftplugin = 1
" Load this plugin only once
if exists("g:loaded_diff_navigator")
finish
endif
let g:loaded_diff_navigator = 1
function s:checkFilterDiff()
if !executable('filterdiff')
echohl WarningMsg
echo "You need to install filterdiff first (part of patchutils)"
echohl None
return 0
endif
return 1
endfunction
" Given the linenumber of the hunk returned its parsed content
"
" From http://www.clearchain.com/blog/posts/splitting-a-patch
" -----------------------------------------------------------
"
" here’s at least some info about the format of a patch file.
"
" @@ -143,6 +143,13 @@
"
" the first number is the starting line for this hunk in oldfile
" the second number is the number of original source lines in this
" hunk (this includes lines marked with “-”)
" the third number is the starting line for this hunk in newfile
" the last number is the number of lines after the hunk has been applied.
function s:parseHunkHeader(lineno)
let inline = getline(a:lineno)
" Thanks for somian from #vim IRC channel for this incredible RE
let hunk_nos = substitute(inline,
\ '\_^\S\S\s\+-\(\d\+\),\(\d\+\)\s\++\(\d\+\),\(\d\+\)\s\+\S\S\(\_.*\)',
\ "\\1,\\2,\\3,\\4,\\5","")
let result = split(hunk_nos, ",")
return {
\ 'line': a:lineno,
\ 'oldFirst': result[0],
\ 'oldCount': result[1],
\ 'newFirst': result[2],
\ 'newCount': result[3],
\ 'remainderLine': result[4]
\ }
endfunction
" Get hunk header from the hunk surrounding cursor
function s:getCurrentHunkHeader()
if getline(".") =~ '^+++ \|^--- '
let lineno = search('^@@[ +-\,\d]*@@.*$', 'ncW')
else
let lineno = search('^@@[ +-\,\d]*@@.*$', 'bncW')
endif
return s:parseHunkHeader(lineno)
endfunction
" Generate hunk header line
function s:createHunkHeader(oldStart, oldLen, newStart, newLen, remaind)
return "@@ -" . a:oldStart . "," . a:oldLen .
\ " +" . a:newStart . "," . a:newLen . " @@" . a:remaind
endfunction
" Return number of lines in the range between start and end line (both
" inclusive) which are from the state before patch and the one after
" patch is applied.
function s:countLines(start, end)
let context_lines = 0
let old_lines = 0
let new_lines = 0
for line in getline(a:start, a:end)
let first_char = strpart(line, 0, 1)
if first_char == ' '
context_lines += 1
elseif first_char == '-'
old_lines += 1
elseif first_char == '+'
new_lines += 1
else
endif
endfor
return [context_lines + old_lines, context_lines + new_lines]
endfunction
" -------------------------------------------------------------
" Annotate each hunk with it's number and name of the changed file
function s:DiffAnnotate()
if s:checkFilterDiff()
let l:cursorpos = winsaveview()
%!filterdiff --annotate
call winrestview(cursorpos)
endif
endfunction
" Print annotation of current hunk
function s:DiffShowHunk()
" if the current line begins with '+++' or '---', then it makes
" sense to search forwards
let hunk_header = s:getCurrentHunkHeader()
let l:hunk_annotation = substitute(getline(hunk_header['line']),
\ '^@@[ +-\,\d]*@@\s*\(.*\)$', '\1', '')
echo l:hunk_annotation
endfunction
" Skip to next hunk
function s:DiffNextHunk()
call search('^@@[ +-\,\d]*@@', 'sW')
endfunction
" Skip to previous hunk
function s:DiffPrevHunk()
call search('^@@[ +-\,\d]*@@', 'bsW')
endfunction
" Skip to next changed file
function s:DiffNextFile()
call search('^--- ', 'sW')
endfunction
" Skip to previous changed file
function s:DiffPrevFile()
call search('^--- ', 'bsW')
endfunction
function s:DiffSplitHunk()
let old_cur_header = s:getCurrentHunkHeader()
let cur_line_no = line(".")
" With this hunk:
"
" @@ -20,8 +20,17 @@ Hunk #1, a/tests/test_ec_curves.py
"
" import unittest
" #import sha
" -from M2Crypto import EC, Rand
" -from test_ecdsa import ECDSATestCase as ECDSATest
" +try:
" + from M2Crypto import EC, Rand
"-- " + from test_ecdsa import ECDSATestCase as ECDSATest
" +# AttributeError: 'module' object has no attribute 'ec_init'
" +#except AttributeError:
" +except:
" + EC_Module_Available = False
" + print("No EC modules available")
" +else:
" + EC_Module_Available = True
" + print("EC modules are available")
"
" creates above the line
" @@ -25,3 +25,12 @@
"
" and the original hunk line is now
" @@ -20,5 +20,5 @@ Hunk #1, a/tests/test_ec_curves.py
"
"
" Start line below header and stop one line above the current line
let diff_lines = s:countLines(old_cur_header['line'] + 1,
\ cur_line_no - 1)
let diff_old = diff_lines[0]
let diff_new = diff_lines[1]
" IN THE NEW START HUNK HEADER
" 1. length is number of lines above the current position which
" are either context or deleted lines (-)
" 2. length is number of lines above the current position which
" are either context or added lines (+)
" Start positions are same as well the stuff after the second @@
let new_start_del_start = old_cur_header['oldFirst']
let new_start_del_len = diff_old
let new_start_add_start = old_cur_header['newFirst']
let new_start_add_len = diff_new
let @x = s:createHunkHeader(new_start_del_start, new_start_del_len,
\ new_start_add_start, new_start_add_len,
\ old_cur_header['remainderLine'])
let window_state = winsaveview()
" write the new original header line
setpos(".", old_cur_header['line'])
normal ^d$"xp
winrestview(window_state)
" IN THE NEW HUNK HEADER
" new lengths = original len - new len
" new starts = original start + (difference)
let new_pos_del_start = old_cur_header['oldFirst'] + diff_old
let new_pos_del_len = old_cur_header['oldCount'] - diff_old
let new_pos_add_start = old_cur_header['newFirst'] + diff_new
let new_pos_add_len = old_cur_header['newCount'] - diff_new
let @x = s:createHunkHeader(new_pos_del_start, new_pos_del_len,
\ new_pos_add_start, new_pos_add_len, "")
execute "normal! O\<Esc>\"xP"
endfunction
" Define new commands
command DiffAnnotate call s:DiffAnnotate()
command DiffShowHunk call s:DiffShowHunk()
command DiffNextHunk call s:DiffNextHunk()
command DiffPrevHunk call s:DiffPrevHunk()
command DiffNextFile call s:DiffNextFile()
command DiffPrevFile call s:DiffPrevFile()
" Default },{,(,) do not make much sense in diffs, so remap them to
" make something useful
nnoremap <script> } :call <SID>DiffNextFile()<CR>
nnoremap <script> { :call <SID>DiffPrevFile()<CR>
nnoremap <script> ) :call <SID>DiffNextHunk()<CR>
nnoremap <script> ( :call <SID>DiffPrevHunk()<CR>
nnoremap <script> ! :call <SID>DiffShowHunk()<CR>
|
