git/notes-merge.c

#define USE_THE_REPOSITORY_VARIABLE

#include "git-compat-util.h"
#include "advice.h"
#include "commit.h"
#include "gettext.h"
#include "refs.h"
#include "object-file.h"
#include "object-name.h"
#include "object-store-ll.h"
#include "path.h"
#include "repository.h"
#include "diff.h"
#include "diffcore.h"
#include "hex.h"
#include "xdiff-interface.h"
#include "merge-ll.h"
#include "dir.h"
#include "notes.h"
#include "notes-merge.h"
#include "strbuf.h"
#include "trace.h"
#include "notes-utils.h"
#include "commit-reach.h"

struct notes_merge_pair { … };

void init_notes_merge_options(struct repository *r,
			      struct notes_merge_options *o)
{ … }

static int path_to_oid(const char *path, struct object_id *oid)
{ … }

static int verify_notes_filepair(struct diff_filepair *p, struct object_id *oid)
{ … }

static struct notes_merge_pair *find_notes_merge_pair_pos(
		struct notes_merge_pair *list, int len, struct object_id *obj,
		int insert_new, int *occupied)
{ … }

static struct object_id uninitialized = …;

static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o,
						 const struct object_id *base,
						 const struct object_id *remote,
						 int *num_changes)
{ … }

static void diff_tree_local(struct notes_merge_options *o,
			    struct notes_merge_pair *changes, int len,
			    const struct object_id *base,
			    const struct object_id *local)
{ … }

static void check_notes_merge_worktree(struct notes_merge_options *o)
{ … }

static void write_buf_to_worktree(const struct object_id *obj,
				  const char *buf, unsigned long size)
{ … }

static void write_note_to_worktree(const struct object_id *obj,
				   const struct object_id *note)
{ … }

static int ll_merge_in_worktree(struct notes_merge_options *o,
				struct notes_merge_pair *p)
{ … }

static int merge_one_change_manual(struct notes_merge_options *o,
				   struct notes_merge_pair *p,
				   struct notes_tree *t)
{ … }

static int merge_one_change(struct notes_merge_options *o,
			    struct notes_merge_pair *p, struct notes_tree *t)
{ … }

static int merge_changes(struct notes_merge_options *o,
			 struct notes_merge_pair *changes, int *num_changes,
			 struct notes_tree *t)
{ … }

static int merge_from_diffs(struct notes_merge_options *o,
			    const struct object_id *base,
			    const struct object_id *local,
			    const struct object_id *remote,
			    struct notes_tree *t)
{ … }

int notes_merge(struct notes_merge_options *o,
		struct notes_tree *local_tree,
		struct object_id *result_oid)
{ … }

int notes_merge_commit(struct notes_merge_options *o,
		       struct notes_tree *partial_tree,
		       struct commit *partial_commit,
		       struct object_id *result_oid)
{ … }

int notes_merge_abort(struct notes_merge_options *o)
{ … }