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
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
|
/*
* Copyright (C) 2009-2011 the libgit2 contributors
*
* This file is part of libgit2, distributed under the GNU GPL v2 with
* a Linking Exception. For full terms see the included COPYING file.
*/
#include "common.h"
#include "git2/diff.h"
#include "diff.h"
#include "xdiff/xdiff.h"
#include "blob.h"
#include <ctype.h>
static git_diff_delta *new_file_delta(
git_diff_list *diff,
const git_tree_diff_data *tdiff)
{
git_buf path = GIT_BUF_INIT;
git_diff_delta *delta = git__calloc(1, sizeof(git_diff_delta));
if (!delta) {
git__rethrow(GIT_ENOMEM, "Could not allocate diff record");
return NULL;
}
/* copy shared fields */
delta->status = tdiff->status;
delta->old_attr = tdiff->old_attr;
delta->new_attr = tdiff->new_attr;
delta->old_oid = tdiff->old_oid;
delta->new_oid = tdiff->new_oid;
if (git_buf_joinpath(&path, diff->pfx.ptr, tdiff->path) < GIT_SUCCESS ||
(delta->path = git_buf_detach(&path)) == NULL)
{
git__free(delta);
git__rethrow(GIT_ENOMEM, "Could not allocate diff record path");
return NULL;
}
return delta;
}
static int tree_diff_cb(const git_tree_diff_data *ptr, void *data)
{
int error;
git_diff_list *diff = data;
assert(S_ISDIR(ptr->old_attr) == S_ISDIR(ptr->new_attr));
if (S_ISDIR(ptr->old_attr)) {
git_tree *old = NULL, *new = NULL;
ssize_t pfx_len = diff->pfx.size;
if (!(error = git_tree_lookup(&old, diff->repo, &ptr->old_oid)) &&
!(error = git_tree_lookup(&new, diff->repo, &ptr->new_oid)) &&
!(error = git_buf_joinpath(&diff->pfx, diff->pfx.ptr, ptr->path)))
{
error = git_tree_diff(old, new, tree_diff_cb, diff);
git_buf_truncate(&diff->pfx, pfx_len);
}
git_tree_free(old);
git_tree_free(new);
} else {
git_diff_delta *delta = new_file_delta(diff, ptr);
if (delta == NULL)
error = GIT_ENOMEM;
else if ((error = git_vector_insert(&diff->files, delta)) < GIT_SUCCESS)
git__free(delta);
}
return error;
}
static git_diff_list *git_diff_list_alloc(
git_repository *repo, const git_diff_options *opts)
{
git_diff_list *diff = git__calloc(1, sizeof(git_diff_list));
if (diff != NULL) {
if (opts != NULL) {
memcpy(&diff->opts, opts, sizeof(git_diff_options));
/* do something safer with the pathspec strarray */
}
diff->repo = repo;
git_buf_init(&diff->pfx, 0);
}
return diff;
}
void git_diff_list_free(git_diff_list *diff)
{
if (!diff)
return;
git_buf_free(&diff->pfx);
git__free(diff);
}
int git_diff_tree_to_tree(
git_repository *repo,
const git_diff_options *opts,
git_tree *old,
git_tree *new,
git_diff_list **diff_ptr)
{
int error;
git_diff_list *diff = git_diff_list_alloc(repo, opts);
if (!diff)
return GIT_ENOMEM;
if ((error = git_tree_diff(old, new, tree_diff_cb, diff)) == GIT_SUCCESS) {
git_buf_free(&diff->pfx); /* don't need this anymore */
*diff_ptr = diff;
} else
git_diff_list_free(diff);
return error;
}
typedef struct {
git_diff_list *diff;
void *cb_data;
git_diff_hunk_fn hunk_cb;
git_diff_line_fn line_cb;
unsigned int index;
git_diff_delta *delta;
} diff_info;
static int read_next_int(const char **str, int *value)
{
const char *scan = *str;
int v = 0, digits = 0;
/* find next digit */
for (scan = *str; *scan && !isdigit(*scan); scan++);
/* parse next number */
for (; isdigit(*scan); scan++, digits++)
v = (v * 10) + (*scan - '0');
*str = scan;
*value = v;
return (digits > 0) ? GIT_SUCCESS : GIT_ENOTFOUND;
}
static int diff_output_cb(void *priv, mmbuffer_t *bufs, int len)
{
int err = GIT_SUCCESS;
diff_info *di = priv;
if (len == 1 && di->hunk_cb) {
git_diff_range range = { -1, 0, -1, 0 };
/* expect something of the form "@@ -%d[,%d] +%d[,%d] @@" */
if (bufs[0].ptr[0] == '@') {
const char *scan = bufs[0].ptr;
if (!(err = read_next_int(&scan, &range.old_start)) && *scan == ',')
err = read_next_int(&scan, &range.old_lines);
if (!err &&
!(err = read_next_int(&scan, &range.new_start)) && *scan == ',')
err = read_next_int(&scan, &range.new_lines);
if (!err && range.old_start >= 0 && range.new_start >= 0)
err = di->hunk_cb(
di->cb_data, di->delta, &range, bufs[0].ptr, bufs[0].size);
}
}
else if ((len == 2 || len == 3) && di->line_cb) {
int origin;
/* expect " "/"-"/"+", then data, then maybe newline */
origin =
(*bufs[0].ptr == '+') ? GIT_DIFF_LINE_ADDITION :
(*bufs[0].ptr == '-') ? GIT_DIFF_LINE_DELETION :
GIT_DIFF_LINE_CONTEXT;
err = di->line_cb(
di->cb_data, di->delta, origin, bufs[1].ptr, bufs[1].size);
/* deal with adding and removing newline at EOF */
if (err == GIT_SUCCESS && len == 3) {
if (origin == GIT_DIFF_LINE_ADDITION)
origin = GIT_DIFF_LINE_ADD_EOFNL;
else
origin = GIT_DIFF_LINE_DEL_EOFNL;
err = di->line_cb(
di->cb_data, di->delta, origin, bufs[2].ptr, bufs[2].size);
}
}
return err;
}
static int set_file_is_binary(
git_repository *repo,
git_diff_delta *file,
mmfile_t *old,
mmfile_t *new)
{
int error;
const char *value;
/* check diff attribute +, -, or 0 */
error = git_attr_get(repo, file->path, "diff", &value);
if (error != GIT_SUCCESS)
return error;
if (value == GIT_ATTR_TRUE) {
file->binary = 0;
return GIT_SUCCESS;
}
if (value == GIT_ATTR_FALSE) {
file->binary = 1;
return GIT_SUCCESS;
}
/* TODO: if value != NULL, implement diff drivers */
/* TODO: check if NUL byte appears in first bit */
GIT_UNUSED_ARG(old);
GIT_UNUSED_ARG(new);
file->binary = 0;
return GIT_SUCCESS;
}
int git_diff_foreach(
git_diff_list *diff,
void *data,
git_diff_file_fn file_cb,
git_diff_hunk_fn hunk_cb,
git_diff_line_fn line_cb)
{
int error = GIT_SUCCESS;
diff_info di;
git_diff_delta *delta;
di.diff = diff;
di.cb_data = data;
di.hunk_cb = hunk_cb;
di.line_cb = line_cb;
git_vector_foreach(&diff->files, di.index, delta) {
mmfile_t old, new;
xpparam_t params;
xdemitconf_t cfg;
xdemitcb_t callback;
/* map files */
if (hunk_cb || line_cb) {
/* TODO: Partial blob reading to defer loading whole blob.
* I.e. I want a blob with just the first 4kb loaded, then
* later on I will read the rest of the blob if needed.
*/
if (delta->status == GIT_STATUS_DELETED ||
delta->status == GIT_STATUS_MODIFIED)
{
error = git_blob_lookup(
&delta->old_blob, diff->repo, &delta->old_oid);
old.ptr = (char *)git_blob_rawcontent(delta->old_blob);
old.size = git_blob_rawsize(delta->old_blob);
} else {
delta->old_blob = NULL;
old.ptr = "";
old.size = 0;
}
if (delta->status == GIT_STATUS_ADDED ||
delta->status == GIT_STATUS_MODIFIED)
{
error = git_blob_lookup(
&delta->new_blob, diff->repo, &delta->new_oid);
new.ptr = (char *)git_blob_rawcontent(delta->new_blob);
new.size = git_blob_rawsize(delta->new_blob);
} else {
delta->new_blob = NULL;
new.ptr = "";
new.size = 0;
}
}
if (diff->opts.force_text)
delta->binary = 0;
else if ((error = set_file_is_binary(
diff->repo, delta, &old, &new)) < GIT_SUCCESS)
break;
if (file_cb != NULL) {
error = file_cb(data, delta, (float)di.index / diff->files.length);
if (error != GIT_SUCCESS)
break;
}
/* don't do hunk and line diffs if file is binary */
if (delta->binary)
continue;
/* nothing to do if we did not get a blob */
if (!delta->old_blob && !delta->new_blob)
continue;
assert(hunk_cb || line_cb);
di.delta = delta;
memset(¶ms, 0, sizeof(params));
memset(&cfg, 0, sizeof(cfg));
cfg.ctxlen = diff->opts.context_lines || 3;
cfg.interhunkctxlen = diff->opts.interhunk_lines || 3;
if (diff->opts.ignore_whitespace)
cfg.flags |= XDF_WHITESPACE_FLAGS;
memset(&callback, 0, sizeof(callback));
callback.outf = diff_output_cb;
callback.priv = &di;
xdl_diff(&old, &new, ¶ms, &cfg, &callback);
git_blob_free(delta->old_blob);
delta->old_blob = NULL;
git_blob_free(delta->new_blob);
delta->new_blob = NULL;
}
return error;
}
static char pick_suffix(int mode)
{
if (S_ISDIR(mode))
return '/';
else if (mode & S_IXUSR)
return '*';
else
return ' ';
}
static int print_compact(void *data, git_diff_delta *delta, float progress)
{
FILE *fp = data;
char code, old_suffix, new_suffix;
GIT_UNUSED_ARG(progress);
switch (delta->status) {
case GIT_STATUS_ADDED: code = 'A'; break;
case GIT_STATUS_DELETED: code = 'D'; break;
case GIT_STATUS_MODIFIED: code = 'M'; break;
case GIT_STATUS_RENAMED: code = 'R'; break;
case GIT_STATUS_COPIED: code = 'C'; break;
case GIT_STATUS_IGNORED: code = 'I'; break;
case GIT_STATUS_UNTRACKED: code = '?'; break;
default: code = 0;
}
if (!code)
return GIT_SUCCESS;
old_suffix = pick_suffix(delta->old_attr);
new_suffix = pick_suffix(delta->new_attr);
if (delta->new_path != NULL)
fprintf(fp, "%c\t%s%c -> %s%c\n", code,
delta->path, old_suffix, delta->new_path, new_suffix);
else if (delta->old_attr != delta->new_attr)
fprintf(fp, "%c\t%s%c (%o -> %o)\n", code,
delta->path, new_suffix, delta->old_attr, delta->new_attr);
else
fprintf(fp, "%c\t%s%c\n", code, delta->path, old_suffix);
return GIT_SUCCESS;
}
int git_diff_print_compact(FILE *fp, git_diff_list *diff)
{
return git_diff_foreach(diff, fp, print_compact, NULL, NULL);
}
static int print_oid_range(FILE *fp, git_diff_delta *delta)
{
char start_oid[9], end_oid[9];
/* TODO: Determine a good actual OID range to print */
/* TODO: Print a real extra line here to match git diff */
git_oid_to_string(start_oid, sizeof(start_oid), &delta->old_oid);
git_oid_to_string(end_oid, sizeof(end_oid), &delta->new_oid);
if (delta->old_attr == delta->new_attr)
fprintf(fp, "index %s..%s %o\n",
start_oid, end_oid, delta->old_attr);
else
fprintf(fp, "index %s..%s %o %o\n",
start_oid, end_oid, delta->old_attr, delta->new_attr);
return GIT_SUCCESS;
}
static int print_patch_file(void *data, git_diff_delta *delta, float progress)
{
FILE *fp = data;
const char *newpath = delta->new_path ? delta->new_path : delta->path;
GIT_UNUSED_ARG(progress);
if (delta->old_blob && delta->new_blob) {
fprintf(fp, "diff --git a/%s b/%s\n", delta->path, newpath);
print_oid_range(fp, delta);
fprintf(fp, "--- a/%s\n", delta->path);
fprintf(fp, "+++ b/%s\n", newpath);
} else if (delta->old_blob) {
fprintf(fp, "diff --git a/%s /dev/null\n", delta->path);
print_oid_range(fp, delta);
fprintf(fp, "--- a/%s\n", delta->path);
fputs("+++ /dev/null\n", fp);
} else if (delta->new_blob) {
fprintf(fp, "diff --git /dev/null b/%s\n", newpath);
print_oid_range(fp, delta);
fputs("--- /dev/null\n", fp);
fprintf(fp, "+++ b/%s\n", newpath);
}
return GIT_SUCCESS;
}
static int print_patch_hunk(
void *data,
git_diff_delta *d,
git_diff_range *r,
const char *header,
size_t header_len)
{
FILE *fp = data;
GIT_UNUSED_ARG(d);
GIT_UNUSED_ARG(r);
fprintf(fp, "%.*s", (int)header_len, header);
return GIT_SUCCESS;
}
static int print_patch_line(
void *data,
git_diff_delta *delta,
char line_origin, /* GIT_DIFF_LINE value from above */
const char *content,
size_t content_len)
{
FILE *fp = data;
GIT_UNUSED_ARG(delta);
if (line_origin == GIT_DIFF_LINE_ADDITION)
fprintf(fp, "+%.*s", (int)content_len, content);
else if (line_origin == GIT_DIFF_LINE_DELETION)
fprintf(fp, "-%.*s", (int)content_len, content);
else if (content_len > 0)
fprintf(fp, "%.*s", (int)content_len, content);
return GIT_SUCCESS;
}
int git_diff_print_patch(FILE *fp, git_diff_list *diff)
{
return git_diff_foreach(
diff, fp, print_patch_file, print_patch_hunk, print_patch_line);
}
int git_diff_blobs(
git_repository *repo,
git_blob *old_blob,
git_blob *new_blob,
git_diff_options *options,
void *cb_data,
git_diff_hunk_fn hunk_cb,
git_diff_line_fn line_cb)
{
diff_info di;
git_diff_delta delta;
mmfile_t old, new;
xpparam_t params;
xdemitconf_t cfg;
xdemitcb_t callback;
assert(repo && options);
if (old_blob) {
old.ptr = (char *)git_blob_rawcontent(old_blob);
old.size = git_blob_rawsize(old_blob);
} else {
old.ptr = "";
old.size = 0;
}
if (new_blob) {
new.ptr = (char *)git_blob_rawcontent(new_blob);
new.size = git_blob_rawsize(new_blob);
} else {
new.ptr = "";
new.size = 0;
}
/* populate a "fake" delta record */
delta.status = old.ptr ?
(new.ptr ? GIT_STATUS_MODIFIED : GIT_STATUS_DELETED) :
(new.ptr ? GIT_STATUS_ADDED : GIT_STATUS_UNTRACKED);
delta.old_attr = 0100644; /* can't know the truth from a blob alone */
delta.new_attr = 0100644;
git_oid_cpy(&delta.old_oid, git_object_id((const git_object *)old_blob));
git_oid_cpy(&delta.new_oid, git_object_id((const git_object *)new_blob));
delta.old_blob = old_blob;
delta.new_blob = new_blob;
delta.path = NULL;
delta.new_path = NULL;
delta.similarity = 0;
delta.binary = 0;
di.diff = NULL;
di.delta = δ
di.cb_data = cb_data;
di.hunk_cb = hunk_cb;
di.line_cb = line_cb;
memset(¶ms, 0, sizeof(params));
memset(&cfg, 0, sizeof(cfg));
cfg.ctxlen = options->context_lines || 3;
cfg.interhunkctxlen = options->interhunk_lines || 3;
if (options->ignore_whitespace)
cfg.flags |= XDF_WHITESPACE_FLAGS;
memset(&callback, 0, sizeof(callback));
callback.outf = diff_output_cb;
callback.priv = &di;
xdl_diff(&old, &new, ¶ms, &cfg, &callback);
return GIT_SUCCESS;
}
|