thodg/libgit2/src/merge_driver.h

• Show log

  Commit

• Hash : 0c7f49dd
  Author :
  Date : 2017-06-30T13:39:01
  

  Make sure to always include "common.h" first Next to including several files, our "common.h" header also declares various macros which are then used throughout the project. As such, we have to make sure to always include this file first in all implementation files. Otherwise, we might encounter problems or even silent behavioural differences due to macros or defines not being defined as they should be. So in fact, our header and implementation files should make sure to always include "common.h" first. This commit does so by establishing a common include pattern. Header files inside of "src" will now always include "common.h" as its first other file, separated by a newline from all the other includes to make it stand out as special. There are two cases for the implementation files. If they do have a matching header file, they will always include this one first, leading to "common.h" being transitively included as first file. If they do not have a matching header file, they instead include "common.h" as first file themselves. This fixes the outlined problems and will become our standard practice for header and source files inside of the "src/" from now on.

Download

• src/merge_driver.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_merge_driver_h__
  #define INCLUDE_merge_driver_h__
  
  #include "common.h"
  
  #include "git2/merge.h"
  #include "git2/index.h"
  #include "git2/sys/merge.h"
  
  struct git_merge_driver_source {
  	git_repository *repo;
  	const char *default_driver;
  	const git_merge_file_options *file_opts;
  
  	const git_index_entry *ancestor;
  	const git_index_entry *ours;
  	const git_index_entry *theirs;
  };
  
  typedef struct git_merge_driver__builtin {
  	git_merge_driver base;
  	git_merge_file_favor_t favor;
  } git_merge_driver__builtin;
  
  extern int git_merge_driver_global_init(void);
  
  extern int git_merge_driver_for_path(
  	char **name_out,
  	git_merge_driver **driver_out,
  	git_repository *repo,
  	const char *path);
  
  /* Merge driver configuration */
  extern int git_merge_driver_for_source(
  	const char **name_out,
  	git_merge_driver **driver_out,
  	const git_merge_driver_source *src);
  
  extern int git_merge_driver__builtin_apply(
  	git_merge_driver *self,
  	const char **path_out,
  	uint32_t *mode_out,
  	git_buf *merged_out,
  	const char *filter_name,
  	const git_merge_driver_source *src);
  
  /* Merge driver for text files, performs a standard three-way merge */
  extern git_merge_driver__builtin git_merge_driver__text;
  
  /* Merge driver for union-style merging */
  extern git_merge_driver__builtin git_merge_driver__union;
  
  /* Merge driver for unmergeable (binary) files: always produces conflicts */
  extern git_merge_driver git_merge_driver__binary;
  
  #endif
  

Download