thodg/libgit2/src/diff.h

• Show log

  Commit

• Hash : 64286308
  Author :
  Date : 2012-09-25T10:48:50
  

  Fix bugs in new diff patch code
  
  This fixes all the bugs in the new diff patch code.  The only
  really interesting one is that when we merge two diffs, we now
  have to actually exclude diff delta records that are not supposed
  to be tracked, as opposed to before where they could be included
  because they would be skipped silently by `git_diff_foreach()`.
  Other than that, there are just minor errors.
  

Download

• src/diff.h

• /*
   * Copyright (C) 2009-2012 the libgit2 contributors
   *
   * 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_h__
  #define INCLUDE_diff_h__
  
  #include "git2/diff.h"
  #include "git2/oid.h"
  
  #include <stdio.h>
  #include "vector.h"
  #include "buffer.h"
  #include "iterator.h"
  #include "repository.h"
  #include "pool.h"
  
  #define DIFF_OLD_PREFIX_DEFAULT "a/"
  #define DIFF_NEW_PREFIX_DEFAULT "b/"
  
  enum {
  	GIT_DIFFCAPS_HAS_SYMLINKS     = (1 << 0), /* symlinks on platform? */
  	GIT_DIFFCAPS_ASSUME_UNCHANGED = (1 << 1), /* use stat? */
  	GIT_DIFFCAPS_TRUST_MODE_BITS  = (1 << 2), /* use st_mode? */
  	GIT_DIFFCAPS_TRUST_CTIME      = (1 << 3), /* use st_ctime? */
  	GIT_DIFFCAPS_USE_DEV          = (1 << 4), /* use st_dev? */
  };
  
  typedef struct {
  	git_refcount   rc;
  	git_diff_delta delta;
  } git_diff_delta_refcounted;
  
  struct git_diff_list {
  	git_refcount     rc;
  	git_repository   *repo;
  	git_diff_options opts;
  	git_vector       pathspec;
  	git_vector       deltas;    /* vector of git_diff_delta_refcounted */
  	git_pool pool;
  	git_iterator_type_t old_src;
  	git_iterator_type_t new_src;
  	uint32_t diffcaps;
  };
  
  extern void git_diff__cleanup_modes(
  	uint32_t diffcaps, uint32_t *omode, uint32_t *nmode);
  
  extern void git_diff_list_addref(git_diff_list *diff);
  
  extern bool git_diff_delta__should_skip(
  	const git_diff_options *opts, const git_diff_delta *delta);
  
  #endif
  
  

Download