Andrew's git - gitweb.git/blob

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