Commit fa8a38a490a6285593c6c18357426acaca4b5614
2015-03-17T22:22:38
Merge pull request #2983 from jeffhostetler/jeffhostetler/perf_merge_lazy_binary_check PERF: In MERGE, lazily compute is_binary
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101
diff --git a/src/merge.c b/src/merge.c
index 75ad091..449a178 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -61,6 +61,11 @@ struct merge_diff_df_data {
git_merge_diff *prev_conflict;
};
+GIT_INLINE(int) merge_diff_detect_binary(
+ bool *binary_out,
+ git_repository *repo,
+ const git_merge_diff *conflict);
+
/* Merge base computation */
@@ -662,6 +667,7 @@ static int merge_conflict_resolve_automerge(
git_odb *odb = NULL;
git_oid automerge_oid;
int error = 0;
+ bool binary = false;
assert(resolved && diff_list && conflict);
@@ -697,7 +703,9 @@ static int merge_conflict_resolve_automerge(
return 0;
/* Reject binary conflicts */
- if (conflict->binary)
+ if ((error = merge_diff_detect_binary(&binary, diff_list->repo, conflict)) < 0)
+ return error;
+ if (binary)
return 0;
ancestor = GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->ancestor_entry) ?
@@ -1303,35 +1311,39 @@ GIT_INLINE(int) merge_diff_detect_type(
}
GIT_INLINE(int) merge_diff_detect_binary(
+ bool *binary_out,
git_repository *repo,
- git_merge_diff *conflict)
+ const git_merge_diff *conflict)
{
git_blob *ancestor_blob = NULL, *our_blob = NULL, *their_blob = NULL;
int error = 0;
+ bool binary = false;
if (GIT_MERGE_INDEX_ENTRY_ISFILE(conflict->ancestor_entry)) {
if ((error = git_blob_lookup(&ancestor_blob, repo, &conflict->ancestor_entry.id)) < 0)
goto done;
- conflict->binary = git_blob_is_binary(ancestor_blob);
+ binary = git_blob_is_binary(ancestor_blob);
}
- if (!conflict->binary &&
+ if (!binary &&
GIT_MERGE_INDEX_ENTRY_ISFILE(conflict->our_entry)) {
if ((error = git_blob_lookup(&our_blob, repo, &conflict->our_entry.id)) < 0)
goto done;
- conflict->binary = git_blob_is_binary(our_blob);
+ binary = git_blob_is_binary(our_blob);
}
- if (!conflict->binary &&
+ if (!binary &&
GIT_MERGE_INDEX_ENTRY_ISFILE(conflict->their_entry)) {
if ((error = git_blob_lookup(&their_blob, repo, &conflict->their_entry.id)) < 0)
goto done;
- conflict->binary = git_blob_is_binary(their_blob);
+ binary = git_blob_is_binary(their_blob);
}
+ *binary_out = binary;
+
done:
git_blob_free(ancestor_blob);
git_blob_free(our_blob);
@@ -1411,7 +1423,6 @@ static int merge_diff_list_insert_conflict(
if ((conflict = merge_diff_from_index_entries(diff_list, tree_items)) == NULL ||
merge_diff_detect_type(conflict) < 0 ||
merge_diff_detect_df_conflict(merge_df_data, conflict) < 0 ||
- merge_diff_detect_binary(diff_list->repo, conflict) < 0 ||
git_vector_insert(&diff_list->conflicts, conflict) < 0)
return -1;
diff --git a/src/merge.h b/src/merge.h
index 2684c15..fe4505f 100644
--- a/src/merge.h
+++ b/src/merge.h
@@ -107,7 +107,6 @@ typedef struct {
git_index_entry their_entry;
git_delta_t their_status;
- int binary:1;
} git_merge_diff;
int git_merge__bases_many(