diff options
| author | Nick Hengeveld <nickh@github.com> | 2013-11-19 02:03:25 +0400 |
|---|---|---|
| committer | Nick Hengeveld <nickh@github.com> | 2013-11-19 02:03:25 +0400 |
| commit | d8e7ffc2a246491aa139875e840fff34c832a739 (patch) | |
| tree | 26c8ac94f356e381b98274413f4446dc9573aa2e /src/diff_xdiff.c | |
| parent | e1ce5249e52e9c5271727d7e2ef5bba4c45277b9 (diff) | |
Add content offset to git_diff_line
For additions and deletions, external consumers like subversion
can make use of the content offset to generate diffs in their
proprietary formats.
Diffstat (limited to 'src/diff_xdiff.c')
| -rw-r--r-- | src/diff_xdiff.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/diff_xdiff.c b/src/diff_xdiff.c index 2aca76f87..e0bc11f7f 100644 --- a/src/diff_xdiff.c +++ b/src/diff_xdiff.c @@ -54,6 +54,7 @@ typedef struct { git_patch *patch; git_diff_hunk hunk; int old_lineno, new_lineno; + mmfile_t xd_old_data, xd_new_data; } git_xdiff_info; static int diff_update_lines( @@ -135,6 +136,13 @@ static int git_xdiff_cb(void *priv, mmbuffer_t *bufs, int len) (*bufs[0].ptr == '-') ? GIT_DIFF_LINE_DELETION : GIT_DIFF_LINE_CONTEXT; + if (line.origin == GIT_DIFF_LINE_ADDITION) + line.content_offset = bufs[1].ptr - info->xd_new_data.ptr; + else if (line.origin == GIT_DIFF_LINE_DELETION) + line.content_offset = bufs[1].ptr - info->xd_old_data.ptr; + else + line.content_offset = -1; + output->error = diff_update_lines( info, &line, bufs[1].ptr, bufs[1].size); @@ -155,6 +163,8 @@ static int git_xdiff_cb(void *priv, mmbuffer_t *bufs, int len) (*bufs[0].ptr == '-') ? GIT_DIFF_LINE_ADD_EOFNL : GIT_DIFF_LINE_CONTEXT_EOFNL; + line.content_offset = -1; + output->error = diff_update_lines( info, &line, bufs[2].ptr, bufs[2].size); @@ -172,7 +182,6 @@ static int git_xdiff(git_diff_output *output, git_patch *patch) git_xdiff_output *xo = (git_xdiff_output *)output; git_xdiff_info info; git_diff_find_context_payload findctxt; - mmfile_t xd_old_data, xd_new_data; memset(&info, 0, sizeof(info)); info.patch = patch; @@ -193,10 +202,10 @@ static int git_xdiff(git_diff_output *output, git_patch *patch) * updates are needed to xo->params.flags */ - git_patch__old_data(&xd_old_data.ptr, &xd_old_data.size, patch); - git_patch__new_data(&xd_new_data.ptr, &xd_new_data.size, patch); + git_patch__old_data(&info.xd_old_data.ptr, &info.xd_old_data.size, patch); + git_patch__new_data(&info.xd_new_data.ptr, &info.xd_new_data.size, patch); - xdl_diff(&xd_old_data, &xd_new_data, + xdl_diff(&info.xd_old_data, &info.xd_new_data, &xo->params, &xo->config, &xo->callback); git_diff_find_context_clear(&findctxt); |