git.oblomov.eu Git - git/blob - merge-recursive.h

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