Commit 917f85a1a4616a93fcbba30c82caff9c1c011b83
2014-10-09T14:16:10
Extract shared functionality.
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 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167
diff --git a/src/merge.c b/src/merge.c
index c7ca97c..8252f67 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -62,16 +62,14 @@ struct merge_diff_df_data {
/* Merge base computation */
-int git_merge_base_many(git_oid *out, git_repository *repo, size_t length, const git_oid input_array[])
+int merge_bases_many(git_commit_list **out, git_revwalk **walk_out, git_repository *repo, size_t length, const git_oid input_array[])
{
- git_revwalk *walk;
+ git_revwalk *walk = NULL;
git_vector list;
git_commit_list *result = NULL;
+ git_commit_list_node *commit;
int error = -1;
unsigned int i;
- git_commit_list_node *commit;
-
- assert(out && repo && input_array);
if (length < 2) {
giterr_set(GITERR_INVALID, "At least two commits are required to find an ancestor. Provided 'length' was %u.", length);
@@ -82,104 +80,92 @@ int git_merge_base_many(git_oid *out, git_repository *repo, size_t length, const
return -1;
if (git_revwalk_new(&walk, repo) < 0)
- goto cleanup;
+ goto on_error;
for (i = 1; i < length; i++) {
commit = git_revwalk__commit_lookup(walk, &input_array[i]);
if (commit == NULL)
- goto cleanup;
+ goto on_error;
git_vector_insert(&list, commit);
}
commit = git_revwalk__commit_lookup(walk, &input_array[0]);
if (commit == NULL)
- goto cleanup;
+ goto on_error;
if (git_merge__bases_many(&result, walk, commit, &list) < 0)
- goto cleanup;
+ goto on_error;
if (!result) {
giterr_set(GITERR_MERGE, "No merge base found");
error = GIT_ENOTFOUND;
- goto cleanup;
+ goto on_error;
}
- git_oid_cpy(out, &result->item->oid);
+ *out = result;
+ *walk_out = walk;
- error = 0;
+ git_vector_free(&list);
+ return 0;
-cleanup:
- git_commit_list_free(&result);
- git_revwalk_free(walk);
+on_error:
git_vector_free(&list);
+ git_revwalk_free(walk);
return error;
}
-int git_merge_bases_many(git_oidarray *out, git_repository *repo, size_t length, const git_oid input_array[])
+int git_merge_base_many(git_oid *out, git_repository *repo, size_t length, const git_oid input_array[])
{
git_revwalk *walk;
- git_vector list;
- git_commit_list *current, *result = NULL;
- int error = -1;
- unsigned int i;
- git_commit_list_node *commit;
- git_array_oid_t array;
+ git_commit_list *result = NULL;
+ int error = 0;
assert(out && repo && input_array);
- if (length < 2) {
- giterr_set(GITERR_INVALID, "At least two commits are required to find an ancestor. Provided 'length' was %u.", length);
- return -1;
- }
-
- if (git_vector_init(&list, length - 1, NULL) < 0)
- return -1;
+ if ((error = merge_bases_many(&result, &walk, repo, length, input_array)) < 0)
+ return error;
- if (git_revwalk_new(&walk, repo) < 0)
- goto cleanup;
+ git_oid_cpy(out, &result->item->oid);
- for (i = 1; i < length; i++) {
- commit = git_revwalk__commit_lookup(walk, &input_array[i]);
- if (commit == NULL)
- goto cleanup;
+ git_commit_list_free(&result);
+ git_revwalk_free(walk);
- git_vector_insert(&list, commit);
- }
+ return 0;
+}
- commit = git_revwalk__commit_lookup(walk, &input_array[0]);
- if (commit == NULL)
- goto cleanup;
+int git_merge_bases_many(git_oidarray *out, git_repository *repo, size_t length, const git_oid input_array[])
+{
+ git_revwalk *walk;
+ git_commit_list *list, *result = NULL;
+ int error = 0;
+ git_array_oid_t array;
- if (git_merge__bases_many(&result, walk, commit, &list) < 0)
- goto cleanup;
+ assert(out && repo && input_array);
- if (!result) {
- giterr_set(GITERR_MERGE, "No merge base found");
- error = GIT_ENOTFOUND;
- goto cleanup;
- }
+ if ((error = merge_bases_many(&result, &walk, repo, length, input_array)) < 0)
+ return error;
git_array_init(array);
- current = result;
- while (current) {
+ list = result;
+ while (list) {
git_oid *id = git_array_alloc(array);
- if (id == NULL)
+ if (id == NULL) {
+ error = -1;
goto cleanup;
+ }
- git_oid_cpy(id, ¤t->item->oid);
- current = current->next;
+ git_oid_cpy(id, &list->item->oid);
+ list = list->next;
}
git_oidarray__from_array(out, &array);
- error = 0;
-
cleanup:
git_commit_list_free(&result);
git_revwalk_free(walk);
- git_vector_free(&list);
+
return error;
}