| line |
stmt |
bran |
cond |
sub |
pod |
time |
code |
|
1
|
|
|
|
|
|
|
/* |
|
2
|
|
|
|
|
|
|
* Copyright (C) the libgit2 contributors. All rights reserved. |
|
3
|
|
|
|
|
|
|
* |
|
4
|
|
|
|
|
|
|
* This file is part of libgit2, distributed under the GNU GPL v2 with |
|
5
|
|
|
|
|
|
|
* a Linking Exception. For full terms see the included COPYING file. |
|
6
|
|
|
|
|
|
|
*/ |
|
7
|
|
|
|
|
|
|
|
|
8
|
|
|
|
|
|
|
#include "blame.h" |
|
9
|
|
|
|
|
|
|
|
|
10
|
|
|
|
|
|
|
#include "git2/commit.h" |
|
11
|
|
|
|
|
|
|
#include "git2/revparse.h" |
|
12
|
|
|
|
|
|
|
#include "git2/revwalk.h" |
|
13
|
|
|
|
|
|
|
#include "git2/tree.h" |
|
14
|
|
|
|
|
|
|
#include "git2/diff.h" |
|
15
|
|
|
|
|
|
|
#include "git2/blob.h" |
|
16
|
|
|
|
|
|
|
#include "git2/signature.h" |
|
17
|
|
|
|
|
|
|
#include "git2/mailmap.h" |
|
18
|
|
|
|
|
|
|
#include "util.h" |
|
19
|
|
|
|
|
|
|
#include "repository.h" |
|
20
|
|
|
|
|
|
|
#include "blame_git.h" |
|
21
|
|
|
|
|
|
|
|
|
22
|
|
|
|
|
|
|
|
|
23
|
10
|
|
|
|
|
|
static int hunk_byfinalline_search_cmp(const void *key, const void *entry) |
|
24
|
|
|
|
|
|
|
{ |
|
25
|
10
|
|
|
|
|
|
git_blame_hunk *hunk = (git_blame_hunk*)entry; |
|
26
|
|
|
|
|
|
|
|
|
27
|
10
|
|
|
|
|
|
size_t lineno = *(size_t*)key; |
|
28
|
10
|
|
|
|
|
|
size_t lines_in_hunk = hunk->lines_in_hunk; |
|
29
|
10
|
|
|
|
|
|
size_t final_start_line_number = hunk->final_start_line_number; |
|
30
|
|
|
|
|
|
|
|
|
31
|
10
|
100
|
|
|
|
|
if (lineno < final_start_line_number) |
|
32
|
2
|
|
|
|
|
|
return -1; |
|
33
|
8
|
100
|
|
|
|
|
if (lineno >= final_start_line_number + lines_in_hunk) |
|
34
|
4
|
|
|
|
|
|
return 1; |
|
35
|
4
|
|
|
|
|
|
return 0; |
|
36
|
|
|
|
|
|
|
} |
|
37
|
|
|
|
|
|
|
|
|
38
|
12
|
|
|
|
|
|
static int paths_cmp(const void *a, const void *b) { return git__strcmp((char*)a, (char*)b); } |
|
39
|
6
|
|
|
|
|
|
static int hunk_cmp(const void *_a, const void *_b) |
|
40
|
|
|
|
|
|
|
{ |
|
41
|
6
|
|
|
|
|
|
git_blame_hunk *a = (git_blame_hunk*)_a, |
|
42
|
6
|
|
|
|
|
|
*b = (git_blame_hunk*)_b; |
|
43
|
|
|
|
|
|
|
|
|
44
|
6
|
50
|
|
|
|
|
if (a->final_start_line_number > b->final_start_line_number) |
|
45
|
0
|
|
|
|
|
|
return 1; |
|
46
|
6
|
50
|
|
|
|
|
else if (a->final_start_line_number < b->final_start_line_number) |
|
47
|
6
|
|
|
|
|
|
return -1; |
|
48
|
|
|
|
|
|
|
else |
|
49
|
0
|
|
|
|
|
|
return 0; |
|
50
|
|
|
|
|
|
|
} |
|
51
|
|
|
|
|
|
|
|
|
52
|
0
|
|
|
|
|
|
static bool hunk_ends_at_or_before_line(git_blame_hunk *hunk, size_t line) |
|
53
|
|
|
|
|
|
|
{ |
|
54
|
0
|
|
|
|
|
|
return line >= (hunk->final_start_line_number + hunk->lines_in_hunk - 1); |
|
55
|
|
|
|
|
|
|
} |
|
56
|
|
|
|
|
|
|
|
|
57
|
1
|
|
|
|
|
|
static bool hunk_starts_at_or_after_line(git_blame_hunk *hunk, size_t line) |
|
58
|
|
|
|
|
|
|
{ |
|
59
|
1
|
|
|
|
|
|
return line <= hunk->final_start_line_number; |
|
60
|
|
|
|
|
|
|
} |
|
61
|
|
|
|
|
|
|
|
|
62
|
7
|
|
|
|
|
|
static git_blame_hunk* new_hunk( |
|
63
|
|
|
|
|
|
|
size_t start, |
|
64
|
|
|
|
|
|
|
size_t lines, |
|
65
|
|
|
|
|
|
|
size_t orig_start, |
|
66
|
|
|
|
|
|
|
const char *path) |
|
67
|
|
|
|
|
|
|
{ |
|
68
|
7
|
|
|
|
|
|
git_blame_hunk *hunk = git__calloc(1, sizeof(git_blame_hunk)); |
|
69
|
7
|
50
|
|
|
|
|
if (!hunk) return NULL; |
|
70
|
|
|
|
|
|
|
|
|
71
|
7
|
|
|
|
|
|
hunk->lines_in_hunk = lines; |
|
72
|
7
|
|
|
|
|
|
hunk->final_start_line_number = start; |
|
73
|
7
|
|
|
|
|
|
hunk->orig_start_line_number = orig_start; |
|
74
|
7
|
50
|
|
|
|
|
hunk->orig_path = path ? git__strdup(path) : NULL; |
|
75
|
|
|
|
|
|
|
|
|
76
|
7
|
|
|
|
|
|
return hunk; |
|
77
|
|
|
|
|
|
|
} |
|
78
|
|
|
|
|
|
|
|
|
79
|
3
|
|
|
|
|
|
static git_blame_hunk* dup_hunk(git_blame_hunk *hunk) |
|
80
|
|
|
|
|
|
|
{ |
|
81
|
3
|
|
|
|
|
|
git_blame_hunk *newhunk = new_hunk( |
|
82
|
|
|
|
|
|
|
hunk->final_start_line_number, |
|
83
|
|
|
|
|
|
|
hunk->lines_in_hunk, |
|
84
|
|
|
|
|
|
|
hunk->orig_start_line_number, |
|
85
|
|
|
|
|
|
|
hunk->orig_path); |
|
86
|
|
|
|
|
|
|
|
|
87
|
3
|
50
|
|
|
|
|
if (!newhunk) |
|
88
|
0
|
|
|
|
|
|
return NULL; |
|
89
|
|
|
|
|
|
|
|
|
90
|
3
|
|
|
|
|
|
git_oid_cpy(&newhunk->orig_commit_id, &hunk->orig_commit_id); |
|
91
|
3
|
|
|
|
|
|
git_oid_cpy(&newhunk->final_commit_id, &hunk->final_commit_id); |
|
92
|
3
|
|
|
|
|
|
newhunk->boundary = hunk->boundary; |
|
93
|
3
|
|
|
|
|
|
git_signature_dup(&newhunk->final_signature, hunk->final_signature); |
|
94
|
3
|
|
|
|
|
|
git_signature_dup(&newhunk->orig_signature, hunk->orig_signature); |
|
95
|
3
|
|
|
|
|
|
return newhunk; |
|
96
|
|
|
|
|
|
|
} |
|
97
|
|
|
|
|
|
|
|
|
98
|
7
|
|
|
|
|
|
static void free_hunk(git_blame_hunk *hunk) |
|
99
|
|
|
|
|
|
|
{ |
|
100
|
7
|
|
|
|
|
|
git__free((void*)hunk->orig_path); |
|
101
|
7
|
|
|
|
|
|
git_signature_free(hunk->final_signature); |
|
102
|
7
|
|
|
|
|
|
git_signature_free(hunk->orig_signature); |
|
103
|
7
|
|
|
|
|
|
git__free(hunk); |
|
104
|
7
|
|
|
|
|
|
} |
|
105
|
|
|
|
|
|
|
|
|
106
|
|
|
|
|
|
|
/* Starting with the hunk that includes start_line, shift all following hunks' |
|
107
|
|
|
|
|
|
|
* final_start_line by shift_by lines */ |
|
108
|
2
|
|
|
|
|
|
static void shift_hunks_by(git_vector *v, size_t start_line, int shift_by) |
|
109
|
|
|
|
|
|
|
{ |
|
110
|
|
|
|
|
|
|
size_t i; |
|
111
|
|
|
|
|
|
|
|
|
112
|
2
|
50
|
|
|
|
|
if (!git_vector_bsearch2(&i, v, hunk_byfinalline_search_cmp, &start_line)) { |
|
113
|
6
|
100
|
|
|
|
|
for (; i < v->length; i++) { |
|
114
|
4
|
|
|
|
|
|
git_blame_hunk *hunk = (git_blame_hunk*)v->contents[i]; |
|
115
|
4
|
|
|
|
|
|
hunk->final_start_line_number += shift_by; |
|
116
|
|
|
|
|
|
|
} |
|
117
|
|
|
|
|
|
|
} |
|
118
|
2
|
|
|
|
|
|
} |
|
119
|
|
|
|
|
|
|
|
|
120
|
2
|
|
|
|
|
|
git_blame* git_blame__alloc( |
|
121
|
|
|
|
|
|
|
git_repository *repo, |
|
122
|
|
|
|
|
|
|
git_blame_options opts, |
|
123
|
|
|
|
|
|
|
const char *path) |
|
124
|
|
|
|
|
|
|
{ |
|
125
|
2
|
|
|
|
|
|
git_blame *gbr = git__calloc(1, sizeof(git_blame)); |
|
126
|
2
|
50
|
|
|
|
|
if (!gbr) |
|
127
|
0
|
|
|
|
|
|
return NULL; |
|
128
|
|
|
|
|
|
|
|
|
129
|
2
|
|
|
|
|
|
gbr->repository = repo; |
|
130
|
2
|
|
|
|
|
|
gbr->options = opts; |
|
131
|
|
|
|
|
|
|
|
|
132
|
4
|
|
|
|
|
|
if (git_vector_init(&gbr->hunks, 8, hunk_cmp) < 0 || |
|
133
|
4
|
50
|
|
|
|
|
git_vector_init(&gbr->paths, 8, paths_cmp) < 0 || |
|
134
|
4
|
50
|
|
|
|
|
(gbr->path = git__strdup(path)) == NULL || |
|
135
|
2
|
|
|
|
|
|
git_vector_insert(&gbr->paths, git__strdup(path)) < 0) |
|
136
|
|
|
|
|
|
|
{ |
|
137
|
0
|
|
|
|
|
|
git_blame_free(gbr); |
|
138
|
0
|
|
|
|
|
|
return NULL; |
|
139
|
|
|
|
|
|
|
} |
|
140
|
|
|
|
|
|
|
|
|
141
|
2
|
|
|
|
|
|
if (opts.flags & GIT_BLAME_USE_MAILMAP && |
|
142
|
0
|
|
|
|
|
|
git_mailmap_from_repository(&gbr->mailmap, repo) < 0) { |
|
143
|
0
|
|
|
|
|
|
git_blame_free(gbr); |
|
144
|
0
|
|
|
|
|
|
return NULL; |
|
145
|
|
|
|
|
|
|
} |
|
146
|
|
|
|
|
|
|
|
|
147
|
2
|
|
|
|
|
|
return gbr; |
|
148
|
|
|
|
|
|
|
} |
|
149
|
|
|
|
|
|
|
|
|
150
|
2
|
|
|
|
|
|
void git_blame_free(git_blame *blame) |
|
151
|
|
|
|
|
|
|
{ |
|
152
|
|
|
|
|
|
|
size_t i; |
|
153
|
|
|
|
|
|
|
git_blame_hunk *hunk; |
|
154
|
|
|
|
|
|
|
|
|
155
|
2
|
50
|
|
|
|
|
if (!blame) return; |
|
156
|
|
|
|
|
|
|
|
|
157
|
9
|
100
|
|
|
|
|
git_vector_foreach(&blame->hunks, i, hunk) |
|
158
|
7
|
|
|
|
|
|
free_hunk(hunk); |
|
159
|
2
|
|
|
|
|
|
git_vector_free(&blame->hunks); |
|
160
|
|
|
|
|
|
|
|
|
161
|
2
|
|
|
|
|
|
git_vector_free_deep(&blame->paths); |
|
162
|
|
|
|
|
|
|
|
|
163
|
2
|
|
|
|
|
|
git_array_clear(blame->line_index); |
|
164
|
|
|
|
|
|
|
|
|
165
|
2
|
|
|
|
|
|
git_mailmap_free(blame->mailmap); |
|
166
|
|
|
|
|
|
|
|
|
167
|
2
|
|
|
|
|
|
git__free(blame->path); |
|
168
|
2
|
|
|
|
|
|
git_blob_free(blame->final_blob); |
|
169
|
2
|
|
|
|
|
|
git__free(blame); |
|
170
|
|
|
|
|
|
|
} |
|
171
|
|
|
|
|
|
|
|
|
172
|
7
|
|
|
|
|
|
uint32_t git_blame_get_hunk_count(git_blame *blame) |
|
173
|
|
|
|
|
|
|
{ |
|
174
|
7
|
50
|
|
|
|
|
assert(blame); |
|
175
|
7
|
|
|
|
|
|
return (uint32_t)blame->hunks.length; |
|
176
|
|
|
|
|
|
|
} |
|
177
|
|
|
|
|
|
|
|
|
178
|
7
|
|
|
|
|
|
const git_blame_hunk *git_blame_get_hunk_byindex(git_blame *blame, uint32_t index) |
|
179
|
|
|
|
|
|
|
{ |
|
180
|
7
|
50
|
|
|
|
|
assert(blame); |
|
181
|
7
|
|
|
|
|
|
return (git_blame_hunk*)git_vector_get(&blame->hunks, index); |
|
182
|
|
|
|
|
|
|
} |
|
183
|
|
|
|
|
|
|
|
|
184
|
3
|
|
|
|
|
|
const git_blame_hunk *git_blame_get_hunk_byline(git_blame *blame, size_t lineno) |
|
185
|
|
|
|
|
|
|
{ |
|
186
|
3
|
|
|
|
|
|
size_t i, new_lineno = lineno; |
|
187
|
3
|
50
|
|
|
|
|
assert(blame); |
|
188
|
|
|
|
|
|
|
|
|
189
|
3
|
100
|
|
|
|
|
if (!git_vector_bsearch2(&i, &blame->hunks, hunk_byfinalline_search_cmp, &new_lineno)) { |
|
190
|
2
|
|
|
|
|
|
return git_blame_get_hunk_byindex(blame, (uint32_t)i); |
|
191
|
|
|
|
|
|
|
} |
|
192
|
|
|
|
|
|
|
|
|
193
|
3
|
|
|
|
|
|
return NULL; |
|
194
|
|
|
|
|
|
|
} |
|
195
|
|
|
|
|
|
|
|
|
196
|
1
|
|
|
|
|
|
static int normalize_options( |
|
197
|
|
|
|
|
|
|
git_blame_options *out, |
|
198
|
|
|
|
|
|
|
const git_blame_options *in, |
|
199
|
|
|
|
|
|
|
git_repository *repo) |
|
200
|
|
|
|
|
|
|
{ |
|
201
|
1
|
|
|
|
|
|
git_blame_options dummy = GIT_BLAME_OPTIONS_INIT; |
|
202
|
1
|
50
|
|
|
|
|
if (!in) in = &dummy; |
|
203
|
|
|
|
|
|
|
|
|
204
|
1
|
|
|
|
|
|
memcpy(out, in, sizeof(git_blame_options)); |
|
205
|
|
|
|
|
|
|
|
|
206
|
|
|
|
|
|
|
/* No newest_commit => HEAD */ |
|
207
|
1
|
50
|
|
|
|
|
if (git_oid_is_zero(&out->newest_commit)) { |
|
208
|
1
|
50
|
|
|
|
|
if (git_reference_name_to_id(&out->newest_commit, repo, "HEAD") < 0) { |
|
209
|
0
|
|
|
|
|
|
return -1; |
|
210
|
|
|
|
|
|
|
} |
|
211
|
|
|
|
|
|
|
} |
|
212
|
|
|
|
|
|
|
|
|
213
|
|
|
|
|
|
|
/* min_line 0 really means 1 */ |
|
214
|
1
|
50
|
|
|
|
|
if (!out->min_line) out->min_line = 1; |
|
215
|
|
|
|
|
|
|
/* max_line 0 really means N, but we don't know N yet */ |
|
216
|
|
|
|
|
|
|
|
|
217
|
|
|
|
|
|
|
/* Fix up option implications */ |
|
218
|
1
|
50
|
|
|
|
|
if (out->flags & GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES) |
|
219
|
0
|
|
|
|
|
|
out->flags |= GIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES; |
|
220
|
1
|
50
|
|
|
|
|
if (out->flags & GIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES) |
|
221
|
0
|
|
|
|
|
|
out->flags |= GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES; |
|
222
|
1
|
50
|
|
|
|
|
if (out->flags & GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES) |
|
223
|
0
|
|
|
|
|
|
out->flags |= GIT_BLAME_TRACK_COPIES_SAME_FILE; |
|
224
|
|
|
|
|
|
|
|
|
225
|
1
|
|
|
|
|
|
return 0; |
|
226
|
|
|
|
|
|
|
} |
|
227
|
|
|
|
|
|
|
|
|
228
|
0
|
|
|
|
|
|
static git_blame_hunk *split_hunk_in_vector( |
|
229
|
|
|
|
|
|
|
git_vector *vec, |
|
230
|
|
|
|
|
|
|
git_blame_hunk *hunk, |
|
231
|
|
|
|
|
|
|
size_t rel_line, |
|
232
|
|
|
|
|
|
|
bool return_new) |
|
233
|
|
|
|
|
|
|
{ |
|
234
|
|
|
|
|
|
|
size_t new_line_count; |
|
235
|
|
|
|
|
|
|
git_blame_hunk *nh; |
|
236
|
|
|
|
|
|
|
|
|
237
|
|
|
|
|
|
|
/* Don't split if already at a boundary */ |
|
238
|
0
|
0
|
|
|
|
|
if (rel_line <= 0 || |
|
|
|
0
|
|
|
|
|
|
|
239
|
0
|
|
|
|
|
|
rel_line >= hunk->lines_in_hunk) |
|
240
|
|
|
|
|
|
|
{ |
|
241
|
0
|
|
|
|
|
|
return hunk; |
|
242
|
|
|
|
|
|
|
} |
|
243
|
|
|
|
|
|
|
|
|
244
|
0
|
|
|
|
|
|
new_line_count = hunk->lines_in_hunk - rel_line; |
|
245
|
0
|
|
|
|
|
|
nh = new_hunk(hunk->final_start_line_number + rel_line, new_line_count, |
|
246
|
0
|
|
|
|
|
|
hunk->orig_start_line_number + rel_line, hunk->orig_path); |
|
247
|
|
|
|
|
|
|
|
|
248
|
0
|
0
|
|
|
|
|
if (!nh) |
|
249
|
0
|
|
|
|
|
|
return NULL; |
|
250
|
|
|
|
|
|
|
|
|
251
|
0
|
|
|
|
|
|
git_oid_cpy(&nh->final_commit_id, &hunk->final_commit_id); |
|
252
|
0
|
|
|
|
|
|
git_oid_cpy(&nh->orig_commit_id, &hunk->orig_commit_id); |
|
253
|
|
|
|
|
|
|
|
|
254
|
|
|
|
|
|
|
/* Adjust hunk that was split */ |
|
255
|
0
|
|
|
|
|
|
hunk->lines_in_hunk -= new_line_count; |
|
256
|
0
|
|
|
|
|
|
git_vector_insert_sorted(vec, nh, NULL); |
|
257
|
|
|
|
|
|
|
{ |
|
258
|
0
|
0
|
|
|
|
|
git_blame_hunk *ret = return_new ? nh : hunk; |
|
259
|
0
|
|
|
|
|
|
return ret; |
|
260
|
|
|
|
|
|
|
} |
|
261
|
|
|
|
|
|
|
} |
|
262
|
|
|
|
|
|
|
|
|
263
|
|
|
|
|
|
|
/* |
|
264
|
|
|
|
|
|
|
* Construct a list of char indices for where lines begin |
|
265
|
|
|
|
|
|
|
* Adapted from core git: |
|
266
|
|
|
|
|
|
|
* https://github.com/gitster/git/blob/be5c9fb9049ed470e7005f159bb923a5f4de1309/builtin/blame.c#L1760-L1789 |
|
267
|
|
|
|
|
|
|
*/ |
|
268
|
1
|
|
|
|
|
|
static int index_blob_lines(git_blame *blame) |
|
269
|
|
|
|
|
|
|
{ |
|
270
|
1
|
|
|
|
|
|
const char *buf = blame->final_buf; |
|
271
|
1
|
|
|
|
|
|
size_t len = blame->final_buf_size; |
|
272
|
1
|
|
|
|
|
|
int num = 0, incomplete = 0, bol = 1; |
|
273
|
|
|
|
|
|
|
size_t *i; |
|
274
|
|
|
|
|
|
|
|
|
275
|
1
|
50
|
|
|
|
|
if (len && buf[len-1] != '\n') |
|
|
|
50
|
|
|
|
|
|
|
276
|
1
|
|
|
|
|
|
incomplete++; /* incomplete line at the end */ |
|
277
|
26
|
100
|
|
|
|
|
while (len--) { |
|
278
|
25
|
100
|
|
|
|
|
if (bol) { |
|
279
|
4
|
100
|
|
|
|
|
i = git_array_alloc(blame->line_index); |
|
|
|
50
|
|
|
|
|
|
|
280
|
4
|
50
|
|
|
|
|
GIT_ERROR_CHECK_ALLOC(i); |
|
281
|
4
|
|
|
|
|
|
*i = buf - blame->final_buf; |
|
282
|
4
|
|
|
|
|
|
bol = 0; |
|
283
|
|
|
|
|
|
|
} |
|
284
|
25
|
100
|
|
|
|
|
if (*buf++ == '\n') { |
|
285
|
3
|
|
|
|
|
|
num++; |
|
286
|
3
|
|
|
|
|
|
bol = 1; |
|
287
|
|
|
|
|
|
|
} |
|
288
|
|
|
|
|
|
|
} |
|
289
|
1
|
50
|
|
|
|
|
i = git_array_alloc(blame->line_index); |
|
|
|
50
|
|
|
|
|
|
|
290
|
1
|
50
|
|
|
|
|
GIT_ERROR_CHECK_ALLOC(i); |
|
291
|
1
|
|
|
|
|
|
*i = buf - blame->final_buf; |
|
292
|
1
|
|
|
|
|
|
blame->num_lines = num + incomplete; |
|
293
|
1
|
|
|
|
|
|
return blame->num_lines; |
|
294
|
|
|
|
|
|
|
} |
|
295
|
|
|
|
|
|
|
|
|
296
|
3
|
|
|
|
|
|
static git_blame_hunk* hunk_from_entry(git_blame__entry *e, git_blame *blame) |
|
297
|
|
|
|
|
|
|
{ |
|
298
|
3
|
|
|
|
|
|
git_blame_hunk *h = new_hunk( |
|
299
|
6
|
|
|
|
|
|
e->lno+1, e->num_lines, e->s_lno+1, e->suspect->path); |
|
300
|
|
|
|
|
|
|
|
|
301
|
3
|
50
|
|
|
|
|
if (!h) |
|
302
|
0
|
|
|
|
|
|
return NULL; |
|
303
|
|
|
|
|
|
|
|
|
304
|
3
|
|
|
|
|
|
git_oid_cpy(&h->final_commit_id, git_commit_id(e->suspect->commit)); |
|
305
|
3
|
|
|
|
|
|
git_oid_cpy(&h->orig_commit_id, git_commit_id(e->suspect->commit)); |
|
306
|
3
|
|
|
|
|
|
git_commit_author_with_mailmap( |
|
307
|
3
|
|
|
|
|
|
&h->final_signature, e->suspect->commit, blame->mailmap); |
|
308
|
3
|
|
|
|
|
|
git_signature_dup(&h->orig_signature, h->final_signature); |
|
309
|
3
|
|
|
|
|
|
h->boundary = e->is_boundary ? 1 : 0; |
|
310
|
3
|
|
|
|
|
|
return h; |
|
311
|
|
|
|
|
|
|
} |
|
312
|
|
|
|
|
|
|
|
|
313
|
2
|
|
|
|
|
|
static int load_blob(git_blame *blame) |
|
314
|
|
|
|
|
|
|
{ |
|
315
|
|
|
|
|
|
|
int error; |
|
316
|
|
|
|
|
|
|
|
|
317
|
2
|
100
|
|
|
|
|
if (blame->final_blob) return 0; |
|
318
|
|
|
|
|
|
|
|
|
319
|
1
|
|
|
|
|
|
error = git_commit_lookup(&blame->final, blame->repository, &blame->options.newest_commit); |
|
320
|
1
|
50
|
|
|
|
|
if (error < 0) |
|
321
|
0
|
|
|
|
|
|
goto cleanup; |
|
322
|
1
|
|
|
|
|
|
error = git_object_lookup_bypath((git_object**)&blame->final_blob, |
|
323
|
1
|
|
|
|
|
|
(git_object*)blame->final, blame->path, GIT_OBJECT_BLOB); |
|
324
|
|
|
|
|
|
|
|
|
325
|
|
|
|
|
|
|
cleanup: |
|
326
|
1
|
|
|
|
|
|
return error; |
|
327
|
|
|
|
|
|
|
} |
|
328
|
|
|
|
|
|
|
|
|
329
|
1
|
|
|
|
|
|
static int blame_internal(git_blame *blame) |
|
330
|
|
|
|
|
|
|
{ |
|
331
|
|
|
|
|
|
|
int error; |
|
332
|
1
|
|
|
|
|
|
git_blame__entry *ent = NULL; |
|
333
|
|
|
|
|
|
|
git_blame__origin *o; |
|
334
|
|
|
|
|
|
|
|
|
335
|
1
|
50
|
|
|
|
|
if ((error = load_blob(blame)) < 0 || |
|
|
|
50
|
|
|
|
|
|
|
336
|
1
|
|
|
|
|
|
(error = git_blame__get_origin(&o, blame, blame->final, blame->path)) < 0) |
|
337
|
|
|
|
|
|
|
goto cleanup; |
|
338
|
|
|
|
|
|
|
|
|
339
|
1
|
|
|
|
|
|
if (git_blob_rawsize(blame->final_blob) > SIZE_MAX) { |
|
340
|
|
|
|
|
|
|
git_error_set(GIT_ERROR_NOMEMORY, "blob is too large to blame"); |
|
341
|
|
|
|
|
|
|
error = -1; |
|
342
|
|
|
|
|
|
|
goto cleanup; |
|
343
|
|
|
|
|
|
|
} |
|
344
|
|
|
|
|
|
|
|
|
345
|
1
|
|
|
|
|
|
blame->final_buf = git_blob_rawcontent(blame->final_blob); |
|
346
|
1
|
|
|
|
|
|
blame->final_buf_size = (size_t)git_blob_rawsize(blame->final_blob); |
|
347
|
|
|
|
|
|
|
|
|
348
|
1
|
|
|
|
|
|
ent = git__calloc(1, sizeof(git_blame__entry)); |
|
349
|
1
|
50
|
|
|
|
|
GIT_ERROR_CHECK_ALLOC(ent); |
|
350
|
|
|
|
|
|
|
|
|
351
|
1
|
|
|
|
|
|
ent->num_lines = index_blob_lines(blame); |
|
352
|
1
|
|
|
|
|
|
ent->lno = blame->options.min_line - 1; |
|
353
|
1
|
|
|
|
|
|
ent->num_lines = ent->num_lines - blame->options.min_line + 1; |
|
354
|
1
|
50
|
|
|
|
|
if (blame->options.max_line > 0) |
|
355
|
0
|
|
|
|
|
|
ent->num_lines = blame->options.max_line - blame->options.min_line + 1; |
|
356
|
1
|
|
|
|
|
|
ent->s_lno = ent->lno; |
|
357
|
1
|
|
|
|
|
|
ent->suspect = o; |
|
358
|
|
|
|
|
|
|
|
|
359
|
1
|
|
|
|
|
|
blame->ent = ent; |
|
360
|
|
|
|
|
|
|
|
|
361
|
1
|
|
|
|
|
|
error = git_blame__like_git(blame, blame->options.flags); |
|
362
|
|
|
|
|
|
|
|
|
363
|
|
|
|
|
|
|
cleanup: |
|
364
|
4
|
100
|
|
|
|
|
for (ent = blame->ent; ent; ) { |
|
365
|
3
|
|
|
|
|
|
git_blame__entry *e = ent->next; |
|
366
|
3
|
|
|
|
|
|
git_blame_hunk *h = hunk_from_entry(ent, blame); |
|
367
|
|
|
|
|
|
|
|
|
368
|
3
|
|
|
|
|
|
git_vector_insert(&blame->hunks, h); |
|
369
|
|
|
|
|
|
|
|
|
370
|
3
|
|
|
|
|
|
git_blame__free_entry(ent); |
|
371
|
3
|
|
|
|
|
|
ent = e; |
|
372
|
|
|
|
|
|
|
} |
|
373
|
|
|
|
|
|
|
|
|
374
|
1
|
|
|
|
|
|
return error; |
|
375
|
|
|
|
|
|
|
} |
|
376
|
|
|
|
|
|
|
|
|
377
|
|
|
|
|
|
|
/******************************************************************************* |
|
378
|
|
|
|
|
|
|
* File blaming |
|
379
|
|
|
|
|
|
|
******************************************************************************/ |
|
380
|
|
|
|
|
|
|
|
|
381
|
1
|
|
|
|
|
|
int git_blame_file( |
|
382
|
|
|
|
|
|
|
git_blame **out, |
|
383
|
|
|
|
|
|
|
git_repository *repo, |
|
384
|
|
|
|
|
|
|
const char *path, |
|
385
|
|
|
|
|
|
|
git_blame_options *options) |
|
386
|
|
|
|
|
|
|
{ |
|
387
|
1
|
|
|
|
|
|
int error = -1; |
|
388
|
1
|
|
|
|
|
|
git_blame_options normOptions = GIT_BLAME_OPTIONS_INIT; |
|
389
|
1
|
|
|
|
|
|
git_blame *blame = NULL; |
|
390
|
|
|
|
|
|
|
|
|
391
|
1
|
50
|
|
|
|
|
assert(out && repo && path); |
|
|
|
50
|
|
|
|
|
|
|
|
|
50
|
|
|
|
|
|
|
392
|
1
|
50
|
|
|
|
|
if ((error = normalize_options(&normOptions, options, repo)) < 0) |
|
393
|
0
|
|
|
|
|
|
goto on_error; |
|
394
|
|
|
|
|
|
|
|
|
395
|
1
|
|
|
|
|
|
blame = git_blame__alloc(repo, normOptions, path); |
|
396
|
1
|
50
|
|
|
|
|
GIT_ERROR_CHECK_ALLOC(blame); |
|
397
|
|
|
|
|
|
|
|
|
398
|
1
|
50
|
|
|
|
|
if ((error = load_blob(blame)) < 0) |
|
399
|
0
|
|
|
|
|
|
goto on_error; |
|
400
|
|
|
|
|
|
|
|
|
401
|
1
|
50
|
|
|
|
|
if ((error = blame_internal(blame)) < 0) |
|
402
|
0
|
|
|
|
|
|
goto on_error; |
|
403
|
|
|
|
|
|
|
|
|
404
|
1
|
|
|
|
|
|
*out = blame; |
|
405
|
1
|
|
|
|
|
|
return 0; |
|
406
|
|
|
|
|
|
|
|
|
407
|
|
|
|
|
|
|
on_error: |
|
408
|
0
|
|
|
|
|
|
git_blame_free(blame); |
|
409
|
1
|
|
|
|
|
|
return error; |
|
410
|
|
|
|
|
|
|
} |
|
411
|
|
|
|
|
|
|
|
|
412
|
|
|
|
|
|
|
/******************************************************************************* |
|
413
|
|
|
|
|
|
|
* Buffer blaming |
|
414
|
|
|
|
|
|
|
*******************************************************************************/ |
|
415
|
|
|
|
|
|
|
|
|
416
|
1
|
|
|
|
|
|
static bool hunk_is_bufferblame(git_blame_hunk *hunk) |
|
417
|
|
|
|
|
|
|
{ |
|
418
|
1
|
50
|
|
|
|
|
return hunk && git_oid_is_zero(&hunk->final_commit_id); |
|
|
|
50
|
|
|
|
|
|
|
419
|
|
|
|
|
|
|
} |
|
420
|
|
|
|
|
|
|
|
|
421
|
1
|
|
|
|
|
|
static int buffer_hunk_cb( |
|
422
|
|
|
|
|
|
|
const git_diff_delta *delta, |
|
423
|
|
|
|
|
|
|
const git_diff_hunk *hunk, |
|
424
|
|
|
|
|
|
|
void *payload) |
|
425
|
|
|
|
|
|
|
{ |
|
426
|
1
|
|
|
|
|
|
git_blame *blame = (git_blame*)payload; |
|
427
|
|
|
|
|
|
|
uint32_t wedge_line; |
|
428
|
|
|
|
|
|
|
|
|
429
|
|
|
|
|
|
|
GIT_UNUSED(delta); |
|
430
|
|
|
|
|
|
|
|
|
431
|
1
|
50
|
|
|
|
|
wedge_line = (hunk->old_lines == 0) ? hunk->new_start : hunk->old_start; |
|
432
|
1
|
|
|
|
|
|
blame->current_diff_line = wedge_line; |
|
433
|
|
|
|
|
|
|
|
|
434
|
1
|
|
|
|
|
|
blame->current_hunk = (git_blame_hunk*)git_blame_get_hunk_byline(blame, wedge_line); |
|
435
|
1
|
50
|
|
|
|
|
if (!blame->current_hunk) { |
|
436
|
|
|
|
|
|
|
/* Line added at the end of the file */ |
|
437
|
0
|
|
|
|
|
|
blame->current_hunk = new_hunk(wedge_line, 0, wedge_line, blame->path); |
|
438
|
0
|
0
|
|
|
|
|
GIT_ERROR_CHECK_ALLOC(blame->current_hunk); |
|
439
|
|
|
|
|
|
|
|
|
440
|
0
|
|
|
|
|
|
git_vector_insert(&blame->hunks, blame->current_hunk); |
|
441
|
1
|
50
|
|
|
|
|
} else if (!hunk_starts_at_or_after_line(blame->current_hunk, wedge_line)){ |
|
442
|
|
|
|
|
|
|
/* If this hunk doesn't start between existing hunks, split a hunk up so it does */ |
|
443
|
0
|
|
|
|
|
|
blame->current_hunk = split_hunk_in_vector(&blame->hunks, blame->current_hunk, |
|
444
|
0
|
|
|
|
|
|
wedge_line - blame->current_hunk->orig_start_line_number, true); |
|
445
|
0
|
0
|
|
|
|
|
GIT_ERROR_CHECK_ALLOC(blame->current_hunk); |
|
446
|
|
|
|
|
|
|
} |
|
447
|
|
|
|
|
|
|
|
|
448
|
1
|
|
|
|
|
|
return 0; |
|
449
|
|
|
|
|
|
|
} |
|
450
|
|
|
|
|
|
|
|
|
451
|
0
|
0
|
|
|
|
|
static int ptrs_equal_cmp(const void *a, const void *b) { return ab ? 1 : 0; } |
|
452
|
2
|
|
|
|
|
|
static int buffer_line_cb( |
|
453
|
|
|
|
|
|
|
const git_diff_delta *delta, |
|
454
|
|
|
|
|
|
|
const git_diff_hunk *hunk, |
|
455
|
|
|
|
|
|
|
const git_diff_line *line, |
|
456
|
|
|
|
|
|
|
void *payload) |
|
457
|
|
|
|
|
|
|
{ |
|
458
|
2
|
|
|
|
|
|
git_blame *blame = (git_blame*)payload; |
|
459
|
|
|
|
|
|
|
|
|
460
|
|
|
|
|
|
|
GIT_UNUSED(delta); |
|
461
|
|
|
|
|
|
|
GIT_UNUSED(hunk); |
|
462
|
|
|
|
|
|
|
GIT_UNUSED(line); |
|
463
|
|
|
|
|
|
|
|
|
464
|
2
|
100
|
|
|
|
|
if (line->origin == GIT_DIFF_LINE_ADDITION) { |
|
465
|
1
|
|
|
|
|
|
if (hunk_is_bufferblame(blame->current_hunk) && |
|
466
|
0
|
|
|
|
|
|
hunk_ends_at_or_before_line(blame->current_hunk, blame->current_diff_line)) { |
|
467
|
|
|
|
|
|
|
/* Append to the current buffer-blame hunk */ |
|
468
|
0
|
|
|
|
|
|
blame->current_hunk->lines_in_hunk++; |
|
469
|
0
|
|
|
|
|
|
shift_hunks_by(&blame->hunks, blame->current_diff_line+1, 1); |
|
470
|
|
|
|
|
|
|
} else { |
|
471
|
|
|
|
|
|
|
/* Create a new buffer-blame hunk with this line */ |
|
472
|
1
|
|
|
|
|
|
shift_hunks_by(&blame->hunks, blame->current_diff_line, 1); |
|
473
|
1
|
|
|
|
|
|
blame->current_hunk = new_hunk(blame->current_diff_line, 1, 0, blame->path); |
|
474
|
1
|
50
|
|
|
|
|
GIT_ERROR_CHECK_ALLOC(blame->current_hunk); |
|
475
|
|
|
|
|
|
|
|
|
476
|
1
|
|
|
|
|
|
git_vector_insert_sorted(&blame->hunks, blame->current_hunk, NULL); |
|
477
|
|
|
|
|
|
|
} |
|
478
|
1
|
|
|
|
|
|
blame->current_diff_line++; |
|
479
|
|
|
|
|
|
|
} |
|
480
|
|
|
|
|
|
|
|
|
481
|
2
|
100
|
|
|
|
|
if (line->origin == GIT_DIFF_LINE_DELETION) { |
|
482
|
|
|
|
|
|
|
/* Trim the line from the current hunk; remove it if it's now empty */ |
|
483
|
1
|
|
|
|
|
|
size_t shift_base = blame->current_diff_line + blame->current_hunk->lines_in_hunk+1; |
|
484
|
|
|
|
|
|
|
|
|
485
|
1
|
50
|
|
|
|
|
if (--(blame->current_hunk->lines_in_hunk) == 0) { |
|
486
|
|
|
|
|
|
|
size_t i; |
|
487
|
0
|
|
|
|
|
|
shift_base--; |
|
488
|
0
|
0
|
|
|
|
|
if (!git_vector_search2(&i, &blame->hunks, ptrs_equal_cmp, blame->current_hunk)) { |
|
489
|
0
|
|
|
|
|
|
git_vector_remove(&blame->hunks, i); |
|
490
|
0
|
|
|
|
|
|
free_hunk(blame->current_hunk); |
|
491
|
0
|
|
|
|
|
|
blame->current_hunk = (git_blame_hunk*)git_blame_get_hunk_byindex(blame, (uint32_t)i); |
|
492
|
|
|
|
|
|
|
} |
|
493
|
|
|
|
|
|
|
} |
|
494
|
1
|
|
|
|
|
|
shift_hunks_by(&blame->hunks, shift_base, -1); |
|
495
|
|
|
|
|
|
|
} |
|
496
|
2
|
|
|
|
|
|
return 0; |
|
497
|
|
|
|
|
|
|
} |
|
498
|
|
|
|
|
|
|
|
|
499
|
1
|
|
|
|
|
|
int git_blame_buffer( |
|
500
|
|
|
|
|
|
|
git_blame **out, |
|
501
|
|
|
|
|
|
|
git_blame *reference, |
|
502
|
|
|
|
|
|
|
const char *buffer, |
|
503
|
|
|
|
|
|
|
size_t buffer_len) |
|
504
|
|
|
|
|
|
|
{ |
|
505
|
|
|
|
|
|
|
git_blame *blame; |
|
506
|
1
|
|
|
|
|
|
git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; |
|
507
|
|
|
|
|
|
|
size_t i; |
|
508
|
|
|
|
|
|
|
git_blame_hunk *hunk; |
|
509
|
|
|
|
|
|
|
|
|
510
|
1
|
|
|
|
|
|
diffopts.context_lines = 0; |
|
511
|
|
|
|
|
|
|
|
|
512
|
1
|
50
|
|
|
|
|
assert(out && reference && buffer && buffer_len); |
|
|
|
50
|
|
|
|
|
|
|
|
|
50
|
|
|
|
|
|
|
|
|
50
|
|
|
|
|
|
|
513
|
|
|
|
|
|
|
|
|
514
|
1
|
|
|
|
|
|
blame = git_blame__alloc(reference->repository, reference->options, reference->path); |
|
515
|
1
|
50
|
|
|
|
|
GIT_ERROR_CHECK_ALLOC(blame); |
|
516
|
|
|
|
|
|
|
|
|
517
|
|
|
|
|
|
|
/* Duplicate all of the hunk structures in the reference blame */ |
|
518
|
4
|
100
|
|
|
|
|
git_vector_foreach(&reference->hunks, i, hunk) { |
|
519
|
3
|
|
|
|
|
|
git_blame_hunk *h = dup_hunk(hunk); |
|
520
|
3
|
50
|
|
|
|
|
GIT_ERROR_CHECK_ALLOC(h); |
|
521
|
|
|
|
|
|
|
|
|
522
|
3
|
|
|
|
|
|
git_vector_insert(&blame->hunks, h); |
|
523
|
|
|
|
|
|
|
} |
|
524
|
|
|
|
|
|
|
|
|
525
|
|
|
|
|
|
|
/* Diff to the reference blob */ |
|
526
|
1
|
|
|
|
|
|
git_diff_blob_to_buffer(reference->final_blob, blame->path, |
|
527
|
1
|
|
|
|
|
|
buffer, buffer_len, blame->path, &diffopts, |
|
528
|
|
|
|
|
|
|
NULL, NULL, buffer_hunk_cb, buffer_line_cb, blame); |
|
529
|
|
|
|
|
|
|
|
|
530
|
1
|
|
|
|
|
|
*out = blame; |
|
531
|
1
|
|
|
|
|
|
return 0; |
|
532
|
|
|
|
|
|
|
} |
|
533
|
|
|
|
|
|
|
|
|
534
|
0
|
|
|
|
|
|
int git_blame_options_init(git_blame_options *opts, unsigned int version) |
|
535
|
|
|
|
|
|
|
{ |
|
536
|
0
|
0
|
|
|
|
|
GIT_INIT_STRUCTURE_FROM_TEMPLATE( |
|
537
|
|
|
|
|
|
|
opts, version, git_blame_options, GIT_BLAME_OPTIONS_INIT); |
|
538
|
0
|
|
|
|
|
|
return 0; |
|
539
|
|
|
|
|
|
|
} |
|
540
|
|
|
|
|
|
|
|
|
541
|
0
|
|
|
|
|
|
int git_blame_init_options(git_blame_options *opts, unsigned int version) |
|
542
|
|
|
|
|
|
|
{ |
|
543
|
0
|
|
|
|
|
|
return git_blame_options_init(opts, version); |
|
544
|
|
|
|
|
|
|
} |