thodg/libgit2/tests-clar/diff/diff_helpers.h

• Show log

  Commit

• Hash : 67db583d
  Author :
  Date : 2013-05-23T15:06:07
  

  More diff rename tests; better split swap handling This adds a couple more tests of different rename scenarios. Also, this fixes a problem with the case where you have two "split" deltas and the left half of one matches the right half of the other. That case was already being handled, but in the wrong order in a way that could result in bad output. Also, if the swap also happened to put the other two halves into the correct place (i.e. two files exchanged places with each other), then the second delta was left with the SPLIT flag set when it really should be cleared.

Download

• tests-clar/diff/diff_helpers.h

• #include "fileops.h"
  #include "git2/diff.h"
  
  extern git_tree *resolve_commit_oid_to_tree(
  	git_repository *repo, const char *partial_oid);
  
  typedef struct {
  	int files;
  	int files_binary;
  
  	int file_status[10]; /* indexed by git_delta_t value */
  
  	int hunks;
  	int hunk_new_lines;
  	int hunk_old_lines;
  
  	int lines;
  	int line_ctxt;
  	int line_adds;
  	int line_dels;
  
  	/* optional arrays of expected specific values */
  	const char **names;
  	int *statuses;
  
  	int debug;
  
  } diff_expects;
  
  typedef struct {
  	const char *path;
  	const char *matched_pathspec;
  } notify_expected;
  
  extern int diff_file_cb(
  	const git_diff_delta *delta,
  	float progress,
  	void *cb_data);
  
  extern int diff_print_file_cb(
  	const git_diff_delta *delta,
  	float progress,
  	void *cb_data);
  
  extern int diff_hunk_cb(
  	const git_diff_delta *delta,
  	const git_diff_range *range,
  	const char *header,
  	size_t header_len,
  	void *cb_data);
  
  extern int diff_line_cb(
  	const git_diff_delta *delta,
  	const git_diff_range *range,
  	char line_origin,
  	const char *content,
  	size_t content_len,
  	void *cb_data);
  
  extern int diff_foreach_via_iterator(
  	git_diff_list *diff,
  	git_diff_file_cb file_cb,
  	git_diff_hunk_cb hunk_cb,
  	git_diff_data_cb line_cb,
  	void *data);
  
  extern void diff_print(FILE *fp, git_diff_list *diff);
  extern void diff_print_raw(FILE *fp, git_diff_list *diff);
  

Download