proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-06 09:24:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of some quick hacks

Browse Source
This commit is contained in:
Edward Thomson 2013-08-08 13:16:13 -05:00
parent 96d799aa18
commit fc36800ecd
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/checkout_conflicts.c
View File

@ -23,7 +23,8 @@ typedef struct {
const git_index_entry *theirs; const git_index_entry *theirs;
int name_collision:1, int name_collision:1,
directoryfile:1; directoryfile:1,
one_to_two:1;
} checkout_conflictdata; } checkout_conflictdata;
GIT_INLINE(int) checkout_idxentry_cmp( GIT_INLINE(int) checkout_idxentry_cmp(
@ -104,7 +105,6 @@ GIT_INLINE(int) checkout_conflicts_cmp_entry(
const char *path, const char *path,
const git_index_entry *entry) const git_index_entry *entry)
{ {
/* TODO: is strcmp right here? should we use index->strcomp ? */
return strcmp((const char *)path, entry->path); return strcmp((const char *)path, entry->path);
} }
@ -207,6 +207,8 @@ static int checkout_conflicts_load_byname_entry(
if (name_entry->theirs) { if (name_entry->theirs) {
if (strcmp(name_entry->ancestor, name_entry->theirs) == 0) if (strcmp(name_entry->ancestor, name_entry->theirs) == 0)
theirs = ancestor; theirs = ancestor;
else if (name_entry->ours && strcmp(name_entry->ours, name_entry->theirs) == 0)
theirs = ours;
else if ((theirs = checkout_conflicts_search_branch(conflicts, name_entry->theirs)) == NULL || else if ((theirs = checkout_conflicts_search_branch(conflicts, name_entry->theirs)) == NULL ||
theirs->theirs == NULL) { theirs->theirs == NULL) {
giterr_set(GITERR_INDEX, giterr_set(GITERR_INDEX,
@ -267,6 +269,10 @@ static int checkout_conflicts_coalesce_renames(
if (their_conflict->name_collision) if (their_conflict->name_collision)
ancestor_conflict->name_collision = 1; 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(conflicts, checkout_conflictdata_empty); git_vector_remove_matching(conflicts, checkout_conflictdata_empty);
@ -275,29 +281,27 @@ done:
return error; return error;
} }
/* TODO: does this exist elsewhere? */
GIT_INLINE(void) path_equal_or_prefixed( GIT_INLINE(void) path_equal_or_prefixed(
bool *path_eq, bool *path_eq,
bool *path_prefixed, bool *path_prefixed,
const char *parent, const char *parent,
const char *child) const char *child)
{ {
size_t child_len = strlen(child); const char *p, *c;
size_t parent_len = strlen(parent);
if (child_len == parent_len) { *path_eq = 0;
*path_eq = (strcmp(parent, child) == 0);
*path_prefixed = 0; *path_prefixed = 0;
for (p = parent, c = child; *p && *c; p++, c++) {
if (*p != *c)
return; return;
} }
*path_eq = 0; if (!*p)
*path_prefixed = (*c == '/');
if (child_len < parent_len || if (!*p && !*c)
strncmp(parent, child, parent_len) != 0) *path_eq = 1;
*path_prefixed = 0;
else
*path_prefixed = (child[parent_len] == '/');
} }
static int checkout_conflicts_mark_directoryfile( static int checkout_conflicts_mark_directoryfile(
@ -483,7 +487,6 @@ static int checkout_write_merge(
/* Rename 2->1 conflicts need the branch name appended */ /* Rename 2->1 conflicts need the branch name appended */
if (conflict->name_collision) { if (conflict->name_collision) {
/* TODO: strcmp? */
if ((error = conflict_path_suffixed(&path_suffixed, result.path, if ((error = conflict_path_suffixed(&path_suffixed, result.path,
(strcmp(result.path, conflict->ours->path) == 0 ? (strcmp(result.path, conflict->ours->path) == 0 ?
our_label_raw : their_label_raw))) < 0) our_label_raw : their_label_raw))) < 0)
@ -514,15 +517,6 @@ done:
return error; return error;
} }
GIT_INLINE(bool) conflict_is_1_to_2(checkout_conflictdata *conflict)
{
/* TODO: can't we detect these when we coalesce? */
return conflict->ancestor && conflict->ours && conflict->theirs &&
(strcmp(conflict->ancestor->path, conflict->ours->path) != 0 &&
strcmp(conflict->ancestor->path, conflict->theirs->path) != 0 &&
strcmp(conflict->ours->path, conflict->theirs->path) != 0);
}
int git_checkout__conflicts(checkout_data *data) int git_checkout__conflicts(checkout_data *data)
{ {
git_vector conflicts = GIT_VECTOR_INIT; git_vector conflicts = GIT_VECTOR_INIT;
@ -569,7 +563,7 @@ int git_checkout__conflicts(checkout_data *data)
/* Add/add conflicts and rename 1->2 conflicts, write the /* Add/add conflicts and rename 1->2 conflicts, write the
* ours/theirs sides (potentially name mangled). * ours/theirs sides (potentially name mangled).
*/ */
else if (conflict_is_1_to_2(conflict)) else if (conflict->one_to_two)
error = checkout_write_entries(data, conflict); error = checkout_write_entries(data, conflict);
/* If all sides are links, write the ours side */ /* If all sides are links, write the ours side */