merge-recursive.h

   1 #ifndef MERGE_RECURSIVE_H
   2 #define MERGE_RECURSIVE_H
   3
   4 #include "string-list.h"
   5 #include "unpack-trees.h"
   6
   7 struct commit;
   8
   9 struct merge_options {
  10         const char *ancestor;
  11         const char *branch1;
  12         const char *branch2;
  13         enum {
  14                 MERGE_RECURSIVE_NORMAL = 0,
  15                 MERGE_RECURSIVE_OURS,
  16                 MERGE_RECURSIVE_THEIRS
  17         } recursive_variant;
  18         const char *subtree_shift;
  19         unsigned buffer_output; /* 1: output at end, 2: keep buffered */
  20         unsigned renormalize : 1;
  21         long xdl_opts;
  22         int verbosity;
  23         int diff_detect_rename;
  24         int merge_detect_rename;
  25         int diff_rename_limit;
  26         int merge_rename_limit;
  27         int rename_score;
  28         int needed_rename_limit;
  29         int show_rename_progress;
  30         int call_depth;
  31         struct strbuf obuf;
  32         struct hashmap current_file_dir_set;
  33         struct string_list df_conflict_file_set;
  34         struct unpack_trees_options unpack_opts;
  35         struct index_state orig_index;
  36 };
  37
  38 /*
  39  * For dir_rename_entry, directory names are stored as a full path from the
  40  * toplevel of the repository and do not include a trailing '/'.  Also:
  41  *
  42  *   dir:                original name of directory being renamed
  43  *   non_unique_new_dir: if true, could not determine new_dir
  44  *   new_dir:            final name of directory being renamed
  45  *   possible_new_dirs:  temporary used to help determine new_dir; see comments
  46  *                       in get_directory_renames() for details
  47  */
  48 struct dir_rename_entry {
  49         struct hashmap_entry ent; /* must be the first member! */
  50         char *dir;
  51         unsigned non_unique_new_dir:1;
  52         struct strbuf new_dir;
  53         struct string_list possible_new_dirs;
  54 };
  55
  56 struct collision_entry {
  57         struct hashmap_entry ent; /* must be the first member! */
  58         char *target_file;
  59         struct string_list source_files;
  60         unsigned reported_already:1;
  61 };
  62
  63 static inline int merge_detect_rename(struct merge_options *o)
  64 {
  65         return o->merge_detect_rename >= 0 ? o->merge_detect_rename :
  66                 o->diff_detect_rename >= 0 ? o->diff_detect_rename : 1;
  67 }
  68
  69 /* merge_trees() but with recursive ancestor consolidation */
  70 int merge_recursive(struct merge_options *o,
  71                     struct commit *h1,
  72                     struct commit *h2,
  73                     struct commit_list *ancestors,
  74                     struct commit **result);
  75
  76 /* rename-detecting three-way merge, no recursion */
  77 int merge_trees(struct merge_options *o,
  78                 struct tree *head,
  79                 struct tree *merge,
  80                 struct tree *common,
  81                 struct tree **result);
  82
  83 /*
  84  * "git-merge-recursive" can be fed trees; wrap them into
  85  * virtual commits and call merge_recursive() proper.
  86  */
  87 int merge_recursive_generic(struct merge_options *o,
  88                             const struct object_id *head,
  89                             const struct object_id *merge,
  90                             int num_ca,
  91                             const struct object_id **ca,
  92                             struct commit **result);
  93
  94 void init_merge_options(struct merge_options *o);
  95 struct tree *write_tree_from_memory(struct merge_options *o);
  96
  97 int parse_merge_opt(struct merge_options *out, const char *s);
  98
  99 #endif