thodg/libgit2/src/diff_file.h

• Show log

  Commit

• Hash : 74ded024
  Author :
  Date : 2013-06-17T17:03:34
  

  Add "as_path" parameters to blob and buffer diffs This adds parameters to the four functions that allow for blob-to- blob and blob-to-buffer differencing (either via callbacks or by making a git_diff_patch object). These parameters let you say that filename we should pretend the blob has while doing the diff. If you pass NULL, there should be no change from the existing behavior, which is to skip using attributes for file type checks and just look at content. With the parameters, you can plug into the new diff driver functionality and get binary or non-binary behavior, plus function context regular expressions, etc. This commit also fixes things so that the git_diff_delta that is generated by these functions will actually be populated with the data that we know about the blobs (or buffers) so you can use it appropriately. It also fixes a bug in generating patches from the git_diff_patch objects created via these functions. Lastly, there is one other behavior change that may matter. If there is no difference between the two blobs, these functions no longer generate any diff callbacks / patches unless you have passed in GIT_DIFF_INCLUDE_UNMODIFIED. This is pretty natural, but could potentially change the behavior of existing usage.

Download

• src/diff_file.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_file_h__
  #define INCLUDE_diff_file_h__
  
  #include "common.h"
  #include "diff.h"
  #include "diff_driver.h"
  #include "map.h"
  
  /* expanded information for one side of a delta */
  typedef struct {
  	git_repository *repo;
  	git_diff_file *file;
  	git_diff_driver *driver;
  	uint32_t flags;
  	uint32_t opts_flags;
  	git_off_t opts_max_size;
  	git_iterator_type_t src;
  	const git_blob *blob;
  	git_map map;
  } git_diff_file_content;
  
  extern int git_diff_file_content__init_from_diff(
  	git_diff_file_content *fc,
  	git_diff_list *diff,
  	size_t delta_index,
  	bool use_old);
  
  extern int git_diff_file_content__init_from_blob(
  	git_diff_file_content *fc,
  	git_repository *repo,
  	const git_diff_options *opts,
  	const git_blob *blob,
  	git_diff_file *as_file);
  
  extern int git_diff_file_content__init_from_raw(
  	git_diff_file_content *fc,
  	git_repository *repo,
  	const git_diff_options *opts,
  	const char *buf,
  	size_t buflen,
  	git_diff_file *as_file);
  
  /* this loads the blob/file-on-disk as needed */
  extern int git_diff_file_content__load(git_diff_file_content *fc);
  
  /* this releases the blob/file-in-memory */
  extern void git_diff_file_content__unload(git_diff_file_content *fc);
  
  /* this unloads and also releases any other resources */
  extern void git_diff_file_content__clear(git_diff_file_content *fc);
  
  #endif
  

Download