thodg/libgit2/src/diff_patch.h

• Show log

  Commit

• Hash : 8147b1af
  Author :
  Date : 2015-05-25T20:03:59
  

  diff: introduce binary diff callbacks
  
  Introduce a new binary diff callback to provide the actual binary
  delta contents to callers.  Create this data from the diff contents
  (instead of directly from the ODB) to support binary diffs including
  the workdir, not just things coming out of the ODB.
  

Download

• src/diff_patch.h

• /*
   * 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.
   */
  #ifndef INCLUDE_diff_patch_h__
  #define INCLUDE_diff_patch_h__
  
  #include "common.h"
  #include "diff.h"
  #include "diff_file.h"
  #include "array.h"
  #include "git2/patch.h"
  
   /* cached information about a hunk in a diff */
  typedef struct diff_patch_hunk {
  	git_diff_hunk hunk;
  	size_t line_start;
  	size_t line_count;
  } diff_patch_hunk;
  
  enum {
  	GIT_DIFF_PATCH_ALLOCATED = (1 << 0),
  	GIT_DIFF_PATCH_INITIALIZED = (1 << 1),
  	GIT_DIFF_PATCH_LOADED = (1 << 2),
  	GIT_DIFF_PATCH_DIFFABLE = (1 << 3),
  	GIT_DIFF_PATCH_DIFFED = (1 << 4),
  	GIT_DIFF_PATCH_FLATTENED = (1 << 5),
  };
  
  struct git_patch {
  	git_refcount rc;
  	git_diff *diff; /* for refcount purposes, maybe NULL for blob diffs */
  	git_diff_options diff_opts;
  	git_diff_delta *delta;
  	size_t delta_index;
  	git_diff_file_content ofile;
  	git_diff_file_content nfile;
  	uint32_t flags;
  	git_diff_binary binary;
  	git_array_t(diff_patch_hunk) hunks;
  	git_array_t(git_diff_line)   lines;
  	size_t content_size, context_size, header_size;
  	git_pool flattened;
  };
  
  extern git_diff *git_patch__diff(git_patch *);
  
  extern git_diff_driver *git_patch__driver(git_patch *);
  
  extern void git_patch__old_data(char **, size_t *, git_patch *);
  extern void git_patch__new_data(char **, size_t *, git_patch *);
  
  extern int git_patch__invoke_callbacks(
  	git_patch *patch,
  	git_diff_file_cb file_cb,
  	git_diff_binary_cb binary_cb,
  	git_diff_hunk_cb hunk_cb,
  	git_diff_line_cb line_cb,
  	void *payload);
  
  typedef struct git_diff_output git_diff_output;
  struct git_diff_output {
  	/* these callbacks are issued with the diff data */
  	git_diff_file_cb file_cb;
  	git_diff_binary_cb binary_cb;
  	git_diff_hunk_cb hunk_cb;
  	git_diff_line_cb data_cb;
  	void *payload;
  
  	/* this records the actual error in cases where it may be obscured */
  	int error;
  
  	/* this callback is used to do the diff and drive the other callbacks.
  	 * see diff_xdiff.h for how to use this in practice for now.
  	 */
  	int (*diff_cb)(git_diff_output *output, git_patch *patch);
  };
  
  #endif
  

Download