thodg/libgit2/src/diff.h

• Show log

  Commit

• Hash : 71a3d27e
  Author :
  Date : 2013-02-08T10:06:47
  

  Replace diff delta binary with flags Previously the git_diff_delta recorded if the delta was binary. This replaces that (with no net change in structure size) with a full set of flags. The flag values that were already in use for individual git_diff_file objects are reused for the delta flags, too (along with renaming those flags to make it clear that they are used more generally). This (a) makes things somewhat more consistent (because I was using a -1 value in the "boolean" binary field to indicate unset, whereas now I can just use the flags that are easier to understand), and (b) will make it easier for me to add some additional flags to the delta object in the future, such as marking the results of a copy/rename detection or other deltas that might want a special indicator. While making this change, I officially moved some of the flags that were internal only into the private diff header. This also allowed me to remove a gross hack in rename/copy detect code where I was overwriting the status field with an internal value.

Download

• src/diff.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_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? */
  };
  
  enum {
  	GIT_DIFF_FLAG__FREE_PATH  = (1 << 7),  /* `path` is allocated memory */
  	GIT_DIFF_FLAG__FREE_DATA  = (1 << 8),  /* internal file data is allocated */
  	GIT_DIFF_FLAG__UNMAP_DATA = (1 << 9),  /* internal file data is mmap'ed */
  	GIT_DIFF_FLAG__NO_DATA    = (1 << 10), /* file data should not be loaded */
  	GIT_DIFF_FLAG__TO_DELETE  = (1 << 11), /* delete entry during rename det. */
  	GIT_DIFF_FLAG__TO_SPLIT   = (1 << 12), /* split entry during rename det. */
  };
  
  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 */
  	git_pool pool;
  	git_iterator_type_t old_src;
  	git_iterator_type_t new_src;
  	uint32_t diffcaps;
  
  	int (*strcomp)(const char *, const char *);
  	int (*strncomp)(const char *, const char *, size_t);
  	int (*pfxcomp)(const char *str, const char *pfx);
  	int (*entrycomp)(const void *a, const void *b);
  };
  
  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 int git_diff_delta__cmp(const void *a, const void *b);
  
  extern bool git_diff_delta__should_skip(
  	const git_diff_options *opts, const git_diff_delta *delta);
  
  extern int git_diff__oid_for_file(
  	git_repository *, const char *, uint16_t, git_off_t, git_oid *);
  
  extern int git_diff__from_iterators(
  	git_diff_list **diff_ptr,
  	git_repository *repo,
  	git_iterator *old_iter,
  	git_iterator *new_iter,
  	const git_diff_options *opts);
  
  #endif
  
  

Download