proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-04 18:13:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjust for diff API changes

Browse Source
This commit is contained in:
Ben Straub 2013-10-28 11:21:23 -07:00
parent 42c8f8f807
commit 7dcb1c4525
2 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/blame.c
View File

@ -370,19 +370,15 @@ static bool hunk_is_bufferblame(git_blame_hunk *hunk)
static int buffer_hunk_cb( static int buffer_hunk_cb(
const git_diff_delta *delta, const git_diff_delta *delta,
const git_diff_range *range, const git_diff_hunk *hunk,
const char *header,
size_t header_len,
void *payload) void *payload)
{ {
git_blame *blame = (git_blame*)payload; git_blame *blame = (git_blame*)payload;
size_t wedge_line; size_t wedge_line;
GIT_UNUSED(delta); GIT_UNUSED(delta);
GIT_UNUSED(header);
GIT_UNUSED(header_len);
wedge_line = (range->old_lines == 0) ? range->new_start : range->old_start; wedge_line = (hunk->old_lines == 0) ? hunk->new_start : hunk->old_start;
blame->current_diff_line = wedge_line; blame->current_diff_line = wedge_line;
/* If this hunk doesn't start between existing hunks, split a hunk up so it does */ /* If this hunk doesn't start between existing hunks, split a hunk up so it does */
@ -398,18 +394,15 @@ static int buffer_hunk_cb(
static int ptrs_equal_cmp(const void *a, const void *b) { return a<b ? -1 : a>b ? 1 : 0; } static int ptrs_equal_cmp(const void *a, const void *b) { return a<b ? -1 : a>b ? 1 : 0; }
static int buffer_line_cb( static int buffer_line_cb(
const git_diff_delta *delta, const git_diff_delta *delta,
const git_diff_range *range, const git_diff_hunk *hunk,
char line_origin, const git_diff_line *line,
const char *content,
size_t content_len,
void *payload) void *payload)
{ {
git_blame *blame = (git_blame*)payload; git_blame *blame = (git_blame*)payload;
GIT_UNUSED(delta); GIT_UNUSED(delta);
GIT_UNUSED(range); GIT_UNUSED(hunk);
GIT_UNUSED(content); GIT_UNUSED(line);
GIT_UNUSED(content_len);
#ifdef DO_DEBUG #ifdef DO_DEBUG
{ {
@ -418,7 +411,7 @@ static int buffer_line_cb(
} }
#endif #endif
if (line_origin == GIT_DIFF_LINE_ADDITION) { if (line->origin == GIT_DIFF_LINE_ADDITION) {
if (hunk_is_bufferblame(blame->current_hunk) && if (hunk_is_bufferblame(blame->current_hunk) &&
hunk_ends_at_or_before_line(blame->current_hunk, blame->current_diff_line)) { hunk_ends_at_or_before_line(blame->current_hunk, blame->current_diff_line)) {
/* Append to the current buffer-blame hunk */ /* Append to the current buffer-blame hunk */
@ -433,7 +426,7 @@ static int buffer_line_cb(
blame->current_diff_line++; blame->current_diff_line++;
} }
if (line_origin == GIT_DIFF_LINE_DELETION) { if (line->origin == GIT_DIFF_LINE_DELETION) {
/* Trim the line from the current hunk; remove it if it's now empty */ /* Trim the line from the current hunk; remove it if it's now empty */
size_t shift_base = blame->current_diff_line + blame->current_hunk->lines_in_hunk+1; size_t shift_base = blame->current_diff_line + blame->current_hunk->lines_in_hunk+1;

20
src/blame_git.c
View File

@ -400,7 +400,7 @@ static git_blame__origin* find_origin(
git_blame__origin *origin) git_blame__origin *origin)
{ {
git_blame__origin *porigin = NULL; git_blame__origin *porigin = NULL;
git_diff_list *difflist = NULL; git_diff *difflist = NULL;
git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT;
git_tree *otree=NULL, *ptree=NULL; git_tree *otree=NULL, *ptree=NULL;
@ -427,7 +427,7 @@ static git_blame__origin* find_origin(
int i; int i;
/* Generate a full diff between the two trees */ /* Generate a full diff between the two trees */
git_diff_list_free(difflist); git_diff_free(difflist);
diffopts.pathspec.count = 0; diffopts.pathspec.count = 0;
if (0 != git_diff_tree_to_tree(&difflist, blame->repository, ptree, otree, &diffopts)) if (0 != git_diff_tree_to_tree(&difflist, blame->repository, ptree, otree, &diffopts))
goto cleanup; goto cleanup;
@ -439,19 +439,19 @@ static git_blame__origin* find_origin(
/* Find one that matches */ /* Find one that matches */
for (i=0; i<(int)git_diff_num_deltas(difflist); i++) { for (i=0; i<(int)git_diff_num_deltas(difflist); i++) {
const git_diff_delta *delta; const git_diff_delta *delta = git_diff_get_delta(difflist, i);
git_diff_get_patch(NULL, &delta, difflist, i);
if (git_vector_bsearch(NULL, &blame->paths, delta->new_file.path) != 0)
continue;
git_vector_insert_sorted(&blame->paths, (void*)git__strdup(delta->old_file.path), if (!git_vector_bsearch(NULL, &blame->paths, delta->new_file.path))
paths_on_dup); {
make_origin(&porigin, parent, delta->old_file.path); git_vector_insert_sorted(&blame->paths, (void*)git__strdup(delta->old_file.path),
paths_on_dup);
make_origin(&porigin, parent, delta->old_file.path);
}
} }
} }
cleanup: cleanup:
git_diff_list_free(difflist); git_diff_free(difflist);
git_tree_free(otree); git_tree_free(otree);
git_tree_free(ptree); git_tree_free(ptree);
return porigin; return porigin;