thodg/libgit2/src/diff_print.c

• Show log

  Commit

• Hash : 00e85927
  Author :
  Date : 2013-09-23T21:52:42
  

  Clean up unnecessary git_buf_printf calls This replaces some git_buf_printf calls with simple calls to git_buf_put instead. Also, it fixes a missing va_end inside the git_buf_vprintf implementation.

Download

• src/diff_print.c

• /*
   * Copyright (C) the libgit2 contributors. All rights reserved.
   *
   * 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 "diff.h"
  #include "diff_patch.h"
  #include "fileops.h"
  
  typedef struct {
  	git_diff_list *diff;
  	git_diff_data_cb print_cb;
  	void *payload;
  	git_buf *buf;
  	int oid_strlen;
  } diff_print_info;
  
  static int diff_print_info_init(
  	diff_print_info *pi,
  	git_buf *out, git_diff_list *diff, git_diff_data_cb cb, void *payload)
  {
  	pi->diff     = diff;
  	pi->print_cb = cb;
  	pi->payload  = payload;
  	pi->buf      = out;
  
  	if (!diff || !diff->repo)
  		pi->oid_strlen = GIT_ABBREV_DEFAULT;
  	else if (git_repository__cvar(
  		&pi->oid_strlen, diff->repo, GIT_CVAR_ABBREV) < 0)
  		return -1;
  
  	pi->oid_strlen += 1; /* for NUL byte */
  
  	if (pi->oid_strlen < 2)
  		pi->oid_strlen = 2;
  	else if (pi->oid_strlen > GIT_OID_HEXSZ + 1)
  		pi->oid_strlen = GIT_OID_HEXSZ + 1;
  
  	return 0;
  }
  
  static char diff_pick_suffix(int mode)
  {
  	if (S_ISDIR(mode))
  		return '/';
  	else if (GIT_PERMS_IS_EXEC(mode)) /* -V536 */
  		/* in git, modes are very regular, so we must have 0100755 mode */
  		return '*';
  	else
  		return ' ';
  }
  
  char git_diff_status_char(git_delta_t status)
  {
  	char code;
  
  	switch (status) {
  	case GIT_DELTA_ADDED:     code = 'A'; break;
  	case GIT_DELTA_DELETED:   code = 'D'; break;
  	case GIT_DELTA_MODIFIED:  code = 'M'; break;
  	case GIT_DELTA_RENAMED:   code = 'R'; break;
  	case GIT_DELTA_COPIED:    code = 'C'; break;
  	case GIT_DELTA_IGNORED:   code = 'I'; break;
  	case GIT_DELTA_UNTRACKED: code = '?'; break;
  	default:                  code = ' '; break;
  	}
  
  	return code;
  }
  
  static int callback_error(void)
  {
  	giterr_clear();
  	return GIT_EUSER;
  }
  
  static int diff_print_one_compact(
  	const git_diff_delta *delta, float progress, void *data)
  {
  	diff_print_info *pi = data;
  	git_buf *out = pi->buf;
  	char old_suffix, new_suffix, code = git_diff_status_char(delta->status);
  	int (*strcomp)(const char *, const char *) =
  		pi->diff ? pi->diff->strcomp : git__strcmp;
  
  	GIT_UNUSED(progress);
  
  	if (code == ' ')
  		return 0;
  
  	old_suffix = diff_pick_suffix(delta->old_file.mode);
  	new_suffix = diff_pick_suffix(delta->new_file.mode);
  
  	git_buf_clear(out);
  
  	if (delta->old_file.path != delta->new_file.path &&
  		strcomp(delta->old_file.path,delta->new_file.path) != 0)
  		git_buf_printf(out, "%c\t%s%c %s%c\n", code,
  			delta->old_file.path, old_suffix, delta->new_file.path, new_suffix);
  	else if (delta->old_file.mode != delta->new_file.mode &&
  		delta->old_file.mode != 0 && delta->new_file.mode != 0)
  		git_buf_printf(out, "%c\t%s%c %s%c\n", code,
  			delta->old_file.path, old_suffix, delta->new_file.path, new_suffix);
  	else if (old_suffix != ' ')
  		git_buf_printf(out, "%c\t%s%c\n", code, delta->old_file.path, old_suffix);
  	else
  		git_buf_printf(out, "%c\t%s\n", code, delta->old_file.path);
  
  	if (git_buf_oom(out))
  		return -1;
  
  	if (pi->print_cb(delta, NULL, GIT_DIFF_LINE_FILE_HDR,
  			git_buf_cstr(out), git_buf_len(out), pi->payload))
  		return callback_error();
  
  	return 0;
  }
  
  /* print a git_diff_list to a print callback in compact format */
  int git_diff_print_compact(
  	git_diff_list *diff,
  	git_diff_data_cb print_cb,
  	void *payload)
  {
  	int error;
  	git_buf buf = GIT_BUF_INIT;
  	diff_print_info pi;
  
  	if (!(error = diff_print_info_init(&pi, &buf, diff, print_cb, payload)))
  		error = git_diff_foreach(diff, diff_print_one_compact, NULL, NULL, &pi);
  
  	git_buf_free(&buf);
  
  	return error;
  }
  
  static int diff_print_one_raw(
  	const git_diff_delta *delta, float progress, void *data)
  {
  	diff_print_info *pi = data;
  	git_buf *out = pi->buf;
  	char code = git_diff_status_char(delta->status);
  	char start_oid[GIT_OID_HEXSZ+1], end_oid[GIT_OID_HEXSZ+1];
  
  	GIT_UNUSED(progress);
  
  	if (code == ' ')
  		return 0;
  
  	git_buf_clear(out);
  
  	git_oid_tostr(start_oid, pi->oid_strlen, &delta->old_file.oid);
  	git_oid_tostr(end_oid, pi->oid_strlen, &delta->new_file.oid);
  
  	git_buf_printf(
  		out, ":%06o %06o %s... %s... %c",
  		delta->old_file.mode, delta->new_file.mode, start_oid, end_oid, code);
  
  	if (delta->similarity > 0)
  		git_buf_printf(out, "%03u", delta->similarity);
  
  	if (delta->old_file.path != delta->new_file.path)
  		git_buf_printf(
  			out, "\t%s %s\n", delta->old_file.path, delta->new_file.path);
  	else
  		git_buf_printf(
  			out, "\t%s\n", delta->old_file.path ?
  			delta->old_file.path : delta->new_file.path);
  
  	if (git_buf_oom(out))
  		return -1;
  
  	if (pi->print_cb(delta, NULL, GIT_DIFF_LINE_FILE_HDR,
  			git_buf_cstr(out), git_buf_len(out), pi->payload))
  		return callback_error();
  
  	return 0;
  }
  
  /* print a git_diff_list to a print callback in raw output format */
  int git_diff_print_raw(
  	git_diff_list *diff,
  	git_diff_data_cb print_cb,
  	void *payload)
  {
  	int error;
  	git_buf buf = GIT_BUF_INIT;
  	diff_print_info pi;
  
  	if (!(error = diff_print_info_init(&pi, &buf, diff, print_cb, payload)))
  		error = git_diff_foreach(diff, diff_print_one_raw, NULL, NULL, &pi);
  
  	git_buf_free(&buf);
  
  	return error;
  }
  
  static int diff_print_oid_range(
  	git_buf *out, const git_diff_delta *delta, int oid_strlen)
  {
  	char start_oid[GIT_OID_HEXSZ+1], end_oid[GIT_OID_HEXSZ+1];
  
  	git_oid_tostr(start_oid, oid_strlen, &delta->old_file.oid);
  	git_oid_tostr(end_oid, oid_strlen, &delta->new_file.oid);
  
  	/* TODO: Match git diff more closely */
  	if (delta->old_file.mode == delta->new_file.mode) {
  		git_buf_printf(out, "index %s..%s %o\n",
  			start_oid, end_oid, delta->old_file.mode);
  	} else {
  		if (delta->old_file.mode == 0) {
  			git_buf_printf(out, "new file mode %o\n", delta->new_file.mode);
  		} else if (delta->new_file.mode == 0) {
  			git_buf_printf(out, "deleted file mode %o\n", delta->old_file.mode);
  		} else {
  			git_buf_printf(out, "old mode %o\n", delta->old_file.mode);
  			git_buf_printf(out, "new mode %o\n", delta->new_file.mode);
  		}
  		git_buf_printf(out, "index %s..%s\n", start_oid, end_oid);
  	}
  
  	if (git_buf_oom(out))
  		return -1;
  
  	return 0;
  }
  
  static int diff_delta_format_with_paths(
  	git_buf *out,
  	const git_diff_delta *delta,
  	const char *oldpfx,
  	const char *newpfx,
  	const char *template)
  {
  	const char *oldpath = delta->old_file.path;
  	const char *newpath = delta->new_file.path;
  
  	if (git_oid_iszero(&delta->old_file.oid)) {
  		oldpfx = "";
  		oldpath = "/dev/null";
  	}
  	if (git_oid_iszero(&delta->new_file.oid)) {
  		newpfx = "";
  		newpath = "/dev/null";
  	}
  
  	return git_buf_printf(out, template, oldpfx, oldpath, newpfx, newpath);
  }
  
  int git_diff_delta__format_file_header(
  	git_buf *out,
  	const git_diff_delta *delta,
  	const char *oldpfx,
  	const char *newpfx,
  	int oid_strlen)
  {
  	if (!oldpfx)
  		oldpfx = DIFF_OLD_PREFIX_DEFAULT;
  	if (!newpfx)
  		newpfx = DIFF_NEW_PREFIX_DEFAULT;
  	if (!oid_strlen)
  		oid_strlen = GIT_ABBREV_DEFAULT + 1;
  
  	git_buf_clear(out);
  
  	git_buf_printf(out, "diff --git %s%s %s%s\n",
  		oldpfx, delta->old_file.path, newpfx, delta->new_file.path);
  
  	if (diff_print_oid_range(out, delta, oid_strlen) < 0)
  		return -1;
  
  	if ((delta->flags & GIT_DIFF_FLAG_BINARY) == 0)
  		diff_delta_format_with_paths(
  			out, delta, oldpfx, newpfx, "--- %s%s\n+++ %s%s\n");
  
  	return git_buf_oom(out) ? -1 : 0;
  }
  
  static int diff_print_patch_file(
  	const git_diff_delta *delta, float progress, void *data)
  {
  	diff_print_info *pi = data;
  	const char *oldpfx =
  		pi->diff ? pi->diff->opts.old_prefix : DIFF_OLD_PREFIX_DEFAULT;
  	const char *newpfx =
  		pi->diff ? pi->diff->opts.new_prefix : DIFF_NEW_PREFIX_DEFAULT;
  	uint32_t opts_flags = pi->diff ? pi->diff->opts.flags : GIT_DIFF_NORMAL;
  
  	GIT_UNUSED(progress);
  
  	if (S_ISDIR(delta->new_file.mode) ||
  		delta->status == GIT_DELTA_UNMODIFIED ||
  		delta->status == GIT_DELTA_IGNORED ||
  		(delta->status == GIT_DELTA_UNTRACKED &&
  		 (opts_flags & GIT_DIFF_INCLUDE_UNTRACKED_CONTENT) == 0))
  		return 0;
  
  	if (git_diff_delta__format_file_header(
  			pi->buf, delta, oldpfx, newpfx, pi->oid_strlen) < 0)
  		return -1;
  
  	if (pi->print_cb(delta, NULL, GIT_DIFF_LINE_FILE_HDR,
  			git_buf_cstr(pi->buf), git_buf_len(pi->buf), pi->payload))
  		return callback_error();
  
  	if ((delta->flags & GIT_DIFF_FLAG_BINARY) == 0)
  		return 0;
  
  	git_buf_clear(pi->buf);
  
  	if (diff_delta_format_with_paths(
  			pi->buf, delta, oldpfx, newpfx,
  			"Binary files %s%s and %s%s differ\n") < 0)
  		return -1;
  
  	if (pi->print_cb(delta, NULL, GIT_DIFF_LINE_BINARY,
  			git_buf_cstr(pi->buf), git_buf_len(pi->buf), pi->payload))
  		return callback_error();
  
  	return 0;
  }
  
  static int diff_print_patch_hunk(
  	const git_diff_delta *d,
  	const git_diff_range *r,
  	const char *header,
  	size_t header_len,
  	void *data)
  {
  	diff_print_info *pi = data;
  
  	if (S_ISDIR(d->new_file.mode))
  		return 0;
  
  	git_buf_clear(pi->buf);
  	if (git_buf_put(pi->buf, header, header_len) < 0)
  		return -1;
  
  	if (pi->print_cb(d, r, GIT_DIFF_LINE_HUNK_HDR,
  			git_buf_cstr(pi->buf), git_buf_len(pi->buf), pi->payload))
  		return callback_error();
  
  	return 0;
  }
  
  static int diff_print_patch_line(
  	const git_diff_delta *delta,
  	const git_diff_range *range,
  	char line_origin, /* GIT_DIFF_LINE value from above */
  	const char *content,
  	size_t content_len,
  	void *data)
  {
  	diff_print_info *pi = data;
  
  	if (S_ISDIR(delta->new_file.mode))
  		return 0;
  
  	git_buf_clear(pi->buf);
  	git_buf_grow(pi->buf, content_len + 2);
  
  	if (line_origin == GIT_DIFF_LINE_ADDITION ||
  		line_origin == GIT_DIFF_LINE_DELETION ||
  		line_origin == GIT_DIFF_LINE_CONTEXT)
  		git_buf_putc(pi->buf, line_origin);
  
  	git_buf_put(pi->buf, content, content_len);
  
  	if (git_buf_oom(pi->buf))
  		return -1;
  
  	if (pi->print_cb(delta, range, line_origin,
  			git_buf_cstr(pi->buf), git_buf_len(pi->buf), pi->payload))
  		return callback_error();
  
  	return 0;
  }
  
  /* print a git_diff_list to an output callback in patch format */
  int git_diff_print_patch(
  	git_diff_list *diff,
  	git_diff_data_cb print_cb,
  	void *payload)
  {
  	int error;
  	git_buf buf = GIT_BUF_INIT;
  	diff_print_info pi;
  
  	if (!(error = diff_print_info_init(&pi, &buf, diff, print_cb, payload)))
  		error = git_diff_foreach(
  			diff, diff_print_patch_file, diff_print_patch_hunk,
  			diff_print_patch_line, &pi);
  
  	git_buf_free(&buf);
  
  	return error;
  }
  
  /* print a git_diff_patch to an output callback */
  int git_diff_patch_print(
  	git_diff_patch *patch,
  	git_diff_data_cb print_cb,
  	void *payload)
  {
  	int error;
  	git_buf temp = GIT_BUF_INIT;
  	diff_print_info pi;
  
  	assert(patch && print_cb);
  
  	if (!(error = diff_print_info_init(
  			&pi, &temp, git_diff_patch__diff(patch), print_cb, payload)))
  		error = git_diff_patch__invoke_callbacks(
  			patch, diff_print_patch_file, diff_print_patch_hunk,
  			diff_print_patch_line, &pi);
  
  	git_buf_free(&temp);
  
  	return error;
  }
  
  static int diff_print_to_buffer_cb(
  	const git_diff_delta *delta,
  	const git_diff_range *range,
  	char line_origin,
  	const char *content,
  	size_t content_len,
  	void *payload)
  {
  	git_buf *output = payload;
  	GIT_UNUSED(delta); GIT_UNUSED(range); GIT_UNUSED(line_origin);
  	return git_buf_put(output, content, content_len);
  }
  
  /* print a git_diff_patch to a string buffer */
  int git_diff_patch_to_str(
  	char **string,
  	git_diff_patch *patch)
  {
  	int error;
  	git_buf output = GIT_BUF_INIT;
  
  	error = git_diff_patch_print(patch, diff_print_to_buffer_cb, &output);
  
  	/* GIT_EUSER means git_buf_put in print_to_buffer_cb returned -1,
  	 * meaning a memory allocation failure, so just map to -1...
  	 */
  	if (error == GIT_EUSER)
  		error = -1;
  
  	*string = git_buf_detach(&output);
  
  	return error;
  }
  

Download