#include <assert.h>

#include "checkout.h"

#include "git2/repository.h"

#include "git2/refs.h"

#include "git2/tree.h"

#include "git2/blob.h"

#include "git2/config.h"

#include "git2/diff.h"

#include "git2/submodule.h"

#include "git2/sys/index.h"

#include "refs.h"

#include "repository.h"

#include "index.h"

#include "filter.h"

#include "blob.h"

#include "diff.h"

#include "pathspec.h"

#include "buf_text.h"

#include "merge_file.h"

#include "path.h"

enum {

CHECKOUT_ACTION__NONE = 0,

CHECKOUT_ACTION__REMOVE = 1,

CHECKOUT_ACTION__UPDATE_BLOB = 2,

CHECKOUT_ACTION__UPDATE_SUBMODULE = 4,

CHECKOUT_ACTION__CONFLICT = 8,

CHECKOUT_ACTION__UPDATE_CONFLICT = 16,

CHECKOUT_ACTION__MAX = 16,

CHECKOUT_ACTION__DEFER_REMOVE = 32,

CHECKOUT_ACTION__REMOVE_AND_UPDATE =

(CHECKOUT_ACTION__UPDATE_BLOB | CHECKOUT_ACTION__REMOVE),

};

typedef struct {

git_repository *repo;

git_diff *diff;

git_checkout_options opts;

bool opts_free_baseline;

char *pfx;

git_index *index;

git_pool pool;

git_vector removes;

git_vector conflicts;

git_buf path;

size_t workdir_len;

unsigned int strategy;

int can_symlink;

bool reload_submodules;

size_t total_steps;

size_t completed_steps;

} checkout_data;

typedef struct {

const git_index_entry *ancestor;

const git_index_entry *ours;

const git_index_entry *theirs;

int name_collision:1,

directoryfile:1,

one_to_two:1,

binary:1,

submodule:1;

} checkout_conflictdata;

static int checkout_notify(

const git_index_entry *wditem)

{

git_diff_file wdfile;

const git_diff_file *baseline = NULL, *target = NULL, *workdir = NULL;

const char *path = NULL;

if (!data->opts.notify_cb ||

(why & data->opts.notify_flags) == 0)

return 0;

if (wditem) {

memset(&wdfile, 0, sizeof(wdfile));

git_oid_cpy(&wdfile.id, &wditem->id);

wdfile.path = wditem->path;

wdfile.size = wditem->file_size;

wdfile.flags = GIT_DIFF_FLAG_VALID_ID;

wdfile.mode = wditem->mode;

workdir = &wdfile;

path = wditem->path;

}

if (delta) {

switch (delta->status) {

case GIT_DELTA_UNMODIFIED:

case GIT_DELTA_MODIFIED:

case GIT_DELTA_TYPECHANGE:

default:

baseline = &delta->old_file;

target = &delta->new_file;

break;

case GIT_DELTA_ADDED:

case GIT_DELTA_IGNORED:

case GIT_DELTA_UNTRACKED:

target = &delta->new_file;

break;

case GIT_DELTA_DELETED:

baseline = &delta->old_file;

break;

}

path = delta->old_file.path;

}

{

int error = data->opts.notify_cb(

why, path, baseline, target, workdir, data->opts.notify_payload);

return giterr_set_after_callback_function(

error, "git_checkout notification");

}

}

static bool checkout_is_workdir_modified(

checkout_data *data,

const git_diff_file *baseitem,

const git_index_entry *wditem)

{

git_oid oid;

const git_index_entry *ie;

/* handle "modified" submodule */

if (wditem->mode == GIT_FILEMODE_COMMIT) {

git_submodule *sm;

unsigned int sm_status = 0;

const git_oid *sm_oid = NULL;

bool rval = false;

if (git_submodule_lookup(&sm, data->repo, wditem->path) < 0) {

giterr_clear();

return true;

}

if (git_submodule_status(&sm_status, sm) < 0 ||

GIT_SUBMODULE_STATUS_IS_WD_DIRTY(sm_status))

rval = true;

else if ((sm_oid = git_submodule_wd_id(sm)) == NULL)

rval = false;

else

rval = (git_oid__cmp(&baseitem->id, sm_oid) != 0);

git_submodule_free(sm);

return rval;

}

/* Look at the cache to decide if the workdir is modified. If not,

if ((ie = git_index_get_bypath(data->index, wditem->path, 0)) != NULL) {

if (wditem->mtime.seconds == ie->mtime.seconds &&

wditem->mtime.nanoseconds == ie->mtime.nanoseconds &&

wditem->file_size == ie->file_size)

return (git_oid__cmp(&baseitem->id, &ie->id) != 0);

}

/* depending on where base is coming from, we may or may not know

if (baseitem->size && wditem->file_size != baseitem->size)

return true;

if (git_diff__oid_for_file(

data->repo, wditem->path, wditem->mode,

wditem->file_size, &oid) < 0)

return false;

return (git_oid__cmp(&baseitem->id, &oid) != 0);

}

#define CHECKOUT_ACTION_IF(FLAG,YES,NO) \

((data->strategy & GIT_CHECKOUT_##FLAG) ? CHECKOUT_ACTION__##YES : CHECKOUT_ACTION__##NO)

static int checkout_action_common(

const git_index_entry *wd)

{

git_checkout_notify_t notify = GIT_CHECKOUT_NOTIFY_NONE;

if ((data->strategy & GIT_CHECKOUT_UPDATE_ONLY) != 0)

*action = (*action & ~CHECKOUT_ACTION__REMOVE);

if ((*action & CHECKOUT_ACTION__UPDATE_BLOB) != 0) {

if (S_ISGITLINK(delta->new_file.mode))

*action = (*action & ~CHECKOUT_ACTION__UPDATE_BLOB) |

CHECKOUT_ACTION__UPDATE_SUBMODULE;

/* to "update" a symlink, we must remove the old one first */

if (delta->new_file.mode == GIT_FILEMODE_LINK && wd != NULL)

*action |= CHECKOUT_ACTION__REMOVE;

notify = GIT_CHECKOUT_NOTIFY_UPDATED;

}

if ((*action & CHECKOUT_ACTION__CONFLICT) != 0)

notify = GIT_CHECKOUT_NOTIFY_CONFLICT;

return checkout_notify(data, notify, delta, wd);

}

static int checkout_action_no_wd(

int *action,

checkout_data *data,

const git_diff_delta *delta)

{

int error = 0;

*action = CHECKOUT_ACTION__NONE;

switch (delta->status) {

case GIT_DELTA_UNMODIFIED: /* case 12 */

error = checkout_notify(data, GIT_CHECKOUT_NOTIFY_DIRTY, delta, NULL);

if (error)

return error;

*action = CHECKOUT_ACTION_IF(SAFE_CREATE, UPDATE_BLOB, NONE);

break;

case GIT_DELTA_ADDED: /* case 2 or 28 (and 5 but not really) */

*action = CHECKOUT_ACTION_IF(SAFE, UPDATE_BLOB, NONE);

break;

case GIT_DELTA_MODIFIED: /* case 13 (and 35 but not really) */

*action = CHECKOUT_ACTION_IF(SAFE_CREATE, UPDATE_BLOB, CONFLICT);

break;

case GIT_DELTA_TYPECHANGE: /* case 21 (B->T) and 28 (T->B)*/

if (delta->new_file.mode == GIT_FILEMODE_TREE)

*action = CHECKOUT_ACTION_IF(SAFE, UPDATE_BLOB, NONE);

break;

case GIT_DELTA_DELETED: /* case 8 or 25 */

*action = CHECKOUT_ACTION_IF(SAFE, REMOVE, NONE);

break;

default: /* impossible */

break;

}

return checkout_action_common(action, data, delta, NULL);

}

static int checkout_action_wd_only(

git_vector *pathspec)

{

int error = 0;

bool remove = false;

git_checkout_notify_t notify = GIT_CHECKOUT_NOTIFY_NONE;

if (!git_pathspec__match(

pathspec, wd->path,

(data->strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH) != 0,

git_iterator_ignore_case(workdir), NULL, NULL))

return 0;

/* check if item is tracked in the index but not in the checkout diff */

if (data->index != NULL) {

if (wd->mode != GIT_FILEMODE_TREE) {

if (!(error = git_index_find(NULL, data->index, wd->path))) {

notify = GIT_CHECKOUT_NOTIFY_DIRTY;

remove = ((data->strategy & GIT_CHECKOUT_FORCE) != 0);

} else if (error != GIT_ENOTFOUND)

return error;

else

giterr_clear();

} else {

/* for tree entries, we have to see if there are any index

size_t pos = git_index__prefix_position(data->index, wd->path);

const git_index_entry *e = git_index_get_byindex(data->index, pos);

if (e != NULL && data->diff->pfxcomp(e->path, wd->path) == 0) {

notify = GIT_CHECKOUT_NOTIFY_DIRTY;

remove = ((data->strategy & GIT_CHECKOUT_FORCE) != 0);

}

}

}

if (notify != GIT_CHECKOUT_NOTIFY_NONE)

/* found in index */;

else if (git_iterator_current_is_ignored(workdir)) {

notify = GIT_CHECKOUT_NOTIFY_IGNORED;

remove = ((data->strategy & GIT_CHECKOUT_REMOVE_IGNORED) != 0);

}

else {

notify = GIT_CHECKOUT_NOTIFY_UNTRACKED;

remove = ((data->strategy & GIT_CHECKOUT_REMOVE_UNTRACKED) != 0);

}

error = checkout_notify(data, notify, NULL, wd);

if (!error && remove) {

char *path = git_pool_strdup(&data->pool, wd->path);

GITERR_CHECK_ALLOC(path);

error = git_vector_insert(&data->removes, path);

}

return error;

}

static bool submodule_is_config_only(

checkout_data *data,

const char *path)

{

git_submodule *sm = NULL;

unsigned int sm_loc = 0;

bool rval = false;

if (git_submodule_lookup(&sm, data->repo, path) < 0)

return true;

if (git_submodule_location(&sm_loc, sm) < 0 ||

sm_loc == GIT_SUBMODULE_STATUS_IN_CONFIG)

rval = true;

git_submodule_free(sm);

return false;

}

static int checkout_action_with_wd(

const git_index_entry *wd)

{

*action = CHECKOUT_ACTION__NONE;

switch (delta->status) {

case GIT_DELTA_UNMODIFIED: /* case 14/15 or 33 */

if (checkout_is_workdir_modified(data, &delta->old_file, wd)) {

GITERR_CHECK_ERROR(

checkout_notify(data, GIT_CHECKOUT_NOTIFY_DIRTY, delta, wd) );

*action = CHECKOUT_ACTION_IF(FORCE, UPDATE_BLOB, NONE);

}

break;

case GIT_DELTA_ADDED: /* case 3, 4 or 6 */

if (git_iterator_current_is_ignored(workdir))

*action = CHECKOUT_ACTION_IF(DONT_OVERWRITE_IGNORED, CONFLICT, UPDATE_BLOB);

else

*action = CHECKOUT_ACTION_IF(FORCE, UPDATE_BLOB, CONFLICT);

break;

case GIT_DELTA_DELETED: /* case 9 or 10 (or 26 but not really) */

if (checkout_is_workdir_modified(data, &delta->old_file, wd))

*action = CHECKOUT_ACTION_IF(FORCE, REMOVE, CONFLICT);

else

*action = CHECKOUT_ACTION_IF(SAFE, REMOVE, NONE);

break;

case GIT_DELTA_MODIFIED: /* case 16, 17, 18 (or 36 but not really) */

if (checkout_is_workdir_modified(data, &delta->old_file, wd))

*action = CHECKOUT_ACTION_IF(FORCE, UPDATE_BLOB, CONFLICT);

else

*action = CHECKOUT_ACTION_IF(SAFE, UPDATE_BLOB, NONE);

break;

case GIT_DELTA_TYPECHANGE: /* case 22, 23, 29, 30 */

if (delta->old_file.mode == GIT_FILEMODE_TREE) {

if (wd->mode == GIT_FILEMODE_TREE)

/* either deleting items in old tree will delete the wd dir,

*action = CHECKOUT_ACTION_IF(SAFE, UPDATE_BLOB, NONE);

else if (wd->mode == GIT_FILEMODE_COMMIT) {

/* workdir is possibly a "phantom" submodule - treat as a

if (submodule_is_config_only(data, wd->path))

*action = CHECKOUT_ACTION_IF(SAFE, UPDATE_BLOB, NONE);

else

*action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, CONFLICT);

} else

*action = CHECKOUT_ACTION_IF(FORCE, REMOVE, CONFLICT);

}

else if (checkout_is_workdir_modified(data, &delta->old_file, wd))

*action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, CONFLICT);

else

*action = CHECKOUT_ACTION_IF(SAFE, REMOVE_AND_UPDATE, NONE);

/* don't update if the typechange is to a tree */

if (delta->new_file.mode == GIT_FILEMODE_TREE)

*action = (*action & ~CHECKOUT_ACTION__UPDATE_BLOB);

break;

default: /* impossible */

break;

}

return checkout_action_common(action, data, delta, wd);

}

static int checkout_action_with_wd_blocker(

const git_index_entry *wd)

{

*action = CHECKOUT_ACTION__NONE;

switch (delta->status) {

case GIT_DELTA_UNMODIFIED:

/* should show delta as dirty / deleted */

GITERR_CHECK_ERROR(

checkout_notify(data, GIT_CHECKOUT_NOTIFY_DIRTY, delta, wd) );

*action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, NONE);

break;

case GIT_DELTA_ADDED:

case GIT_DELTA_MODIFIED:

*action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, CONFLICT);

break;

case GIT_DELTA_DELETED:

*action = CHECKOUT_ACTION_IF(FORCE, REMOVE, CONFLICT);

break;

case GIT_DELTA_TYPECHANGE:

/* not 100% certain about this... */

*action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, CONFLICT);

break;

default: /* impossible */

break;

}

return checkout_action_common(action, data, delta, wd);

}

static int checkout_action_with_wd_dir(

const git_index_entry *wd)

{

*action = CHECKOUT_ACTION__NONE;

switch (delta->status) {

case GIT_DELTA_UNMODIFIED: /* case 19 or 24 (or 34 but not really) */

GITERR_CHECK_ERROR(

checkout_notify(data, GIT_CHECKOUT_NOTIFY_DIRTY, delta, NULL));

GITERR_CHECK_ERROR(

checkout_notify(data, GIT_CHECKOUT_NOTIFY_UNTRACKED, NULL, wd));

break;

case GIT_DELTA_ADDED:/* case 4 (and 7 for dir) */

case GIT_DELTA_MODIFIED: /* case 20 (or 37 but not really) */

if (delta->old_file.mode == GIT_FILEMODE_COMMIT)

/* expected submodule (and maybe found one) */;

else if (delta->new_file.mode != GIT_FILEMODE_TREE)

*action = git_iterator_current_is_ignored(workdir) ?

CHECKOUT_ACTION_IF(DONT_OVERWRITE_IGNORED, CONFLICT, REMOVE_AND_UPDATE) :

CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, CONFLICT);

break;

case GIT_DELTA_DELETED: /* case 11 (and 27 for dir) */

if (delta->old_file.mode != GIT_FILEMODE_TREE)

GITERR_CHECK_ERROR(

checkout_notify(data, GIT_CHECKOUT_NOTIFY_UNTRACKED, NULL, wd));

break;

case GIT_DELTA_TYPECHANGE: /* case 24 or 31 */

if (delta->old_file.mode == GIT_FILEMODE_TREE) {

/* For typechange from dir, remove dir and add blob, but it is

*action = CHECKOUT_ACTION_IF(SAFE, UPDATE_BLOB, NONE);

if (*action != CHECKOUT_ACTION__NONE)

*action |= CHECKOUT_ACTION__DEFER_REMOVE;

}

else if (delta->new_file.mode != GIT_FILEMODE_TREE)

/* For typechange to dir, dir is already created so no action */

*action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, CONFLICT);

break;

default: /* impossible */

break;

}

return checkout_action_common(action, data, delta, wd);

}

static int checkout_action(

git_vector *pathspec)

{

int cmp = -1, error;

int (*strcomp)(const char *, const char *) = data->diff->strcomp;

int (*pfxcomp)(const char *str, const char *pfx) = data->diff->pfxcomp;

int (*advance)(const git_index_entry **, git_iterator *) = NULL;

/* move workdir iterator to follow along with deltas */

while (1) {

const git_index_entry *wd = *wditem;

if (!wd)

return checkout_action_no_wd(action, data, delta);

cmp = strcomp(wd->path, delta->old_file.path);

/* 1. wd before delta ("a/a" before "a/b")

if (cmp < 0) {

cmp = pfxcomp(delta->old_file.path, wd->path);

if (cmp == 0) {

if (wd->mode == GIT_FILEMODE_TREE) {

/* case 2 - entry prefixed by workdir tree */

error = git_iterator_advance_into_or_over(wditem, workdir);

if (error < 0 && error != GIT_ITEROVER)

goto done;

continue;

}

/* case 3 maybe - wd contains non-dir where dir expected */

if (delta->old_file.path[strlen(wd->path)] == '/') {

error = checkout_action_with_wd_blocker(

action, data, delta, wd);

advance = git_iterator_advance;

goto done;

}

}

/* case 1 - handle wd item (if it matches pathspec) */

error = checkout_action_wd_only(data, workdir, wd, pathspec);

if (error)

goto done;

if ((error = git_iterator_advance(wditem, workdir)) < 0 &&

error != GIT_ITEROVER)

goto done;

continue;

}

if (cmp == 0) {

/* case 4 */

error = checkout_action_with_wd(action, data, delta, workdir, wd);

advance = git_iterator_advance;

goto done;

}

cmp = pfxcomp(wd->path, delta->old_file.path);

if (cmp == 0) { /* case 5 */

if (wd->path[strlen(delta->old_file.path)] != '/')

return checkout_action_no_wd(action, data, delta);

if (delta->status == GIT_DELTA_TYPECHANGE) {

if (delta->old_file.mode == GIT_FILEMODE_TREE) {

error = checkout_action_with_wd(action, data, delta, workdir, wd);

advance = git_iterator_advance_into;

goto done;

}

if (delta->new_file.mode == GIT_FILEMODE_TREE ||

delta->new_file.mode == GIT_FILEMODE_COMMIT ||

delta->old_file.mode == GIT_FILEMODE_COMMIT)

{

error = checkout_action_with_wd(action, data, delta, workdir, wd);

advance = git_iterator_advance;

goto done;

}

}

return checkout_action_with_wd_dir(action, data, delta, workdir, wd);

}

/* case 6 - wd is after delta */

return checkout_action_no_wd(action, data, delta);

}

done:

if (!error && advance != NULL &&

(error = advance(wditem, workdir)) < 0) {

*wditem = NULL;

if (error == GIT_ITEROVER)

error = 0;

}

return error;

}

static int checkout_remaining_wd_items(

git_vector *spec)

{

int error = 0;

while (wd && !error) {

if (!(error = checkout_action_wd_only(data, workdir, wd, spec)))

error = git_iterator_advance(&wd, workdir);

}

if (error == GIT_ITEROVER)

error = 0;

return error;

}

GIT_INLINE(int) checkout_idxentry_cmp(

const git_index_entry *a,

const git_index_entry *b)

{

if (!a && !b)

return 0;

else if (!a && b)

return -1;

else if(a && !b)

return 1;

else

return strcmp(a->path, b->path);

}

static int checkout_conflictdata_cmp(const void *a, const void *b)

{

const checkout_conflictdata *ca = a;

const checkout_conflictdata *cb = b;

int diff;

if ((diff = checkout_idxentry_cmp(ca->ancestor, cb->ancestor)) == 0 &&

(diff = checkout_idxentry_cmp(ca->ours, cb->theirs)) == 0)

diff = checkout_idxentry_cmp(ca->theirs, cb->theirs);

return diff;

}

int checkout_conflictdata_empty(const git_vector *conflicts, size_t idx)

{

checkout_conflictdata *conflict;

if ((conflict = git_vector_get(conflicts, idx)) == NULL)

return -1;

if (conflict->ancestor || conflict->ours || conflict->theirs)

return 0;

git__free(conflict);

return 1;

}

GIT_INLINE(bool) conflict_pathspec_match(

const git_index_entry *theirs)

{

/* if the pathspec matches ours *or* theirs, proceed */

if (ours && git_pathspec__match(pathspec, ours->path,

(data->strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH) != 0,

git_iterator_ignore_case(workdir), NULL, NULL))

return true;

if (theirs && git_pathspec__match(pathspec, theirs->path,

(data->strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH) != 0,

git_iterator_ignore_case(workdir), NULL, NULL))

return true;

if (ancestor && git_pathspec__match(pathspec, ancestor->path,

(data->strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH) != 0,

git_iterator_ignore_case(workdir), NULL, NULL))

return true;

return false;

}

GIT_INLINE(int) checkout_conflict_detect_submodule(checkout_conflictdata *conflict)

{

conflict->submodule = ((conflict->ancestor && S_ISGITLINK(conflict->ancestor->mode)) ||

(conflict->ours && S_ISGITLINK(conflict->ours->mode)) ||

(conflict->theirs && S_ISGITLINK(conflict->theirs->mode)));

return 0;

}

GIT_INLINE(int) checkout_conflict_detect_binary(git_repository *repo, checkout_conflictdata *conflict)

{

git_blob *ancestor_blob = NULL, *our_blob = NULL, *their_blob = NULL;

int error = 0;

if (conflict->submodule)

return 0;

if (conflict->ancestor) {

if ((error = git_blob_lookup(&ancestor_blob, repo, &conflict->ancestor->id)) < 0)

goto done;

conflict->binary = git_blob_is_binary(ancestor_blob);

}

if (!conflict->binary && conflict->ours) {

if ((error = git_blob_lookup(&our_blob, repo, &conflict->ours->id)) < 0)

goto done;

conflict->binary = git_blob_is_binary(our_blob);

}

if (!conflict->binary && conflict->theirs) {

if ((error = git_blob_lookup(&their_blob, repo, &conflict->theirs->id)) < 0)

goto done;

conflict->binary = git_blob_is_binary(their_blob);

}

done:

git_blob_free(ancestor_blob);

git_blob_free(our_blob);

git_blob_free(their_blob);

return error;

}

static int checkout_conflicts_load(checkout_data *data, git_iterator *workdir, git_vector *pathspec)

{

git_index_conflict_iterator *iterator = NULL;

const git_index_entry *ancestor, *ours, *theirs;

checkout_conflictdata *conflict;

int error = 0;

if ((error = git_index_conflict_iterator_new(&iterator, data->index)) < 0)

goto done;

data->conflicts._cmp = checkout_conflictdata_cmp;

/* Collect the conflicts */

while ((error = git_index_conflict_next(&ancestor, &ours, &theirs, iterator)) == 0) {

if (!conflict_pathspec_match(data, workdir, pathspec, ancestor, ours, theirs))

continue;

conflict = git__calloc(1, sizeof(checkout_conflictdata));

GITERR_CHECK_ALLOC(conflict);

conflict->ancestor = ancestor;

conflict->ours = ours;

conflict->theirs = theirs;

if ((error = checkout_conflict_detect_submodule(conflict)) < 0 ||

(error = checkout_conflict_detect_binary(data->repo, conflict)) < 0)

{

git__free(conflict);

goto done;

}

git_vector_insert(&data->conflicts, conflict);

}

if (error == GIT_ITEROVER)

error = 0;

done:

git_index_conflict_iterator_free(iterator);

return error;

}

GIT_INLINE(int) checkout_conflicts_cmp_entry(

const char *path,

const git_index_entry *entry)

{

return strcmp((const char *)path, entry->path);

}

static int checkout_conflicts_cmp_ancestor(const void *p, const void *c)

{

const char *path = p;

const checkout_conflictdata *conflict = c;

if (!conflict->ancestor)

return 1;

return checkout_conflicts_cmp_entry(path, conflict->ancestor);

}

static checkout_conflictdata *checkout_conflicts_search_ancestor(

checkout_data *data,

const char *path)

{

size_t pos;

if (git_vector_bsearch2(&pos, &data->conflicts, checkout_conflicts_cmp_ancestor, path) < 0)

return NULL;

return git_vector_get(&data->conflicts, pos);

}

static checkout_conflictdata *checkout_conflicts_search_branch(

checkout_data *data,

const char *path)

{

checkout_conflictdata *conflict;

size_t i;

git_vector_foreach(&data->conflicts, i, conflict) {

int cmp = -1;

if (conflict->ancestor)

break;

if (conflict->ours)

cmp = checkout_conflicts_cmp_entry(path, conflict->ours);

else if (conflict->theirs)

cmp = checkout_conflicts_cmp_entry(path, conflict->theirs);

if (cmp == 0)

return conflict;

}

return NULL;

}

static int checkout_conflicts_load_byname_entry(

const git_index_name_entry *name_entry)

{

checkout_conflictdata *ancestor, *ours = NULL, *theirs = NULL;

int error = 0;

*ancestor_out = NULL;

*ours_out = NULL;

*theirs_out = NULL;

if (!name_entry->ancestor) {

giterr_set(GITERR_INDEX, "A NAME entry exists without an ancestor");

error = -1;

goto done;

}

if (!name_entry->ours && !name_entry->theirs) {

giterr_set(GITERR_INDEX, "A NAME entry exists without an ours or theirs");

error = -1;

goto done;

}

if ((ancestor = checkout_conflicts_search_ancestor(data,

name_entry->ancestor)) == NULL) {

giterr_set(GITERR_INDEX,

"A NAME entry referenced ancestor entry '%s' which does not exist in the main index",

name_entry->ancestor);

error = -1;

goto done;

}

if (name_entry->ours) {

if (strcmp(name_entry->ancestor, name_entry->ours) == 0)

ours = ancestor;

else if ((ours = checkout_conflicts_search_branch(data, name_entry->ours)) == NULL ||

ours->ours == NULL) {

giterr_set(GITERR_INDEX,

"A NAME entry referenced our entry '%s' which does not exist in the main index",

name_entry->ours);

error = -1;

goto done;

}

}

if (name_entry->theirs) {

if (strcmp(name_entry->ancestor, name_entry->theirs) == 0)

theirs = ancestor;

else if (name_entry->ours && strcmp(name_entry->ours, name_entry->theirs) == 0)

theirs = ours;

else if ((theirs = checkout_conflicts_search_branch(data, name_entry->theirs)) == NULL ||

theirs->theirs == NULL) {

giterr_set(GITERR_INDEX,

"A NAME entry referenced their entry '%s' which does not exist in the main index",

name_entry->theirs);

error = -1;

goto done;

}

}

*ancestor_out = ancestor;

*ours_out = ours;

*theirs_out = theirs;

done:

return error;

}

static int checkout_conflicts_coalesce_renames(

checkout_data *data)

{

const git_index_name_entry *name_entry;

checkout_conflictdata *ancestor_conflict, *our_conflict, *their_conflict;

size_t i, names;

int error = 0;

/* Juggle entries based on renames */

names = git_index_name_entrycount(data->index);

for (i = 0; i < names; i++) {

name_entry = git_index_name_get_byindex(data->index, i);

if ((error = checkout_conflicts_load_byname_entry(

&ancestor_conflict, &our_conflict, &their_conflict,

data, name_entry)) < 0)

goto done;

if (our_conflict && our_conflict != ancestor_conflict) {

ancestor_conflict->ours = our_conflict->ours;

our_conflict->ours = NULL;

if (our_conflict->theirs)

our_conflict->name_collision = 1;

if (our_conflict->name_collision)

ancestor_conflict->name_collision = 1;

}

if (their_conflict && their_conflict != ancestor_conflict) {

ancestor_conflict->theirs = their_conflict->theirs;

their_conflict->theirs = NULL;

if (their_conflict->ours)

their_conflict->name_collision = 1;

if (their_conflict->name_collision)

ancestor_conflict->name_collision = 1;

}

if (our_conflict && our_conflict != ancestor_conflict &&

their_conflict && their_conflict != ancestor_conflict)

ancestor_conflict->one_to_two = 1;

}

git_vector_remove_matching(&data->conflicts, checkout_conflictdata_empty);

done:

return error;

}

static int checkout_conflicts_mark_directoryfile(

checkout_data *data)

{

checkout_conflictdata *conflict;

const git_index_entry *entry;

size_t i, j, len;

const char *path;

int prefixed, error = 0;

len = git_index_entrycount(data->index);

/* Find d/f conflicts */

git_vector_foreach(&data->conflicts, i, conflict) {

if ((conflict->ours && conflict->theirs) ||

(!conflict->ours && !conflict->theirs))

continue;

path = conflict->ours ?

conflict->ours->path : conflict->theirs->path;

if ((error = git_index_find(&j, data->index, path)) < 0) {

if (error == GIT_ENOTFOUND)

giterr_set(GITERR_INDEX,

"Index inconsistency, could not find entry for expected conflict '%s'", path);

goto done;

}

for (; j < len; j++) {

if ((entry = git_index_get_byindex(data->index, j)) == NULL) {

giterr_set(GITERR_INDEX,

"Index inconsistency, truncated index while loading expected conflict '%s'", path);

error = -1;

goto done;

}

prefixed = git_path_equal_or_prefixed(path, entry->path);