Commit 5cdac19caa6c0bf81c5a71d3801be73281387cd9
2014-04-30T08:29:14
remote: move branch upstream deletion to use an iterator This should make it more readable and allocate a bunch fewer strings.
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
diff --git a/src/remote.c b/src/remote.c
index 8bd52e7..ca1099a 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -1749,55 +1749,19 @@ int git_remote_init_callbacks(git_remote_callbacks* opts, int version)
}
}
-struct branch_removal_data {
- git_vector branches;
- const char *name;
-};
-
-static int retrieve_branches_cb(
- const git_config_entry *entry,
- void *payload)
+/* asserts a branch.<foo>.remote format */
+static const char *name_offset(size_t *len_out, const char *name)
{
- int error;
- struct branch_removal_data *data = (struct branch_removal_data *)payload;
-
- if (strcmp(data->name, entry->value))
- return 0;
-
- error = git_vector_insert(
- &data->branches,
- git__strndup(
- entry->name + strlen("branch."),
- strlen(entry->name) - strlen("branch.") - strlen(".remote")));
-
- return error;
-}
-
-static int delete_branch_remote_config_entry(
- git_config *config,
- const char *branch_name)
-{
- int error;
-
- git_buf config_entry = GIT_BUF_INIT;
-
- if (git_buf_printf(&config_entry, "branch.%s.%s", branch_name, "remote") < 0)
- return -1;
-
- if ((error = git_config_delete_entry(config, git_buf_cstr(&config_entry))) < 0)
- goto cleanup;
+ size_t prefix_len;
+ const char *dot;
- git_buf_clear(&config_entry);
+ prefix_len = strlen("remote.");
+ dot = strchr(name + prefix_len, '.');
- if (git_buf_printf(&config_entry, "branch.%s.%s", branch_name, "merge") < 0)
- return -1;
-
- error = git_config_delete_entry(config, git_buf_cstr(&config_entry));
+ assert(dot);
-cleanup:
- git_buf_free(&config_entry);
-
- return error;
+ *len_out = dot - name - prefix_len;
+ return name + prefix_len;
}
static int remove_branch_config_related_entries(
@@ -1806,29 +1770,46 @@ static int remove_branch_config_related_entries(
{
int error;
git_config *config;
- size_t i;
- char *branch_name;
- struct branch_removal_data data;
+ git_config_entry *entry;
+ git_config_iterator *iter;
+ git_buf buf = GIT_BUF_INIT;
if ((error = git_repository_config__weakptr(&config, repo)) < 0)
return error;
- if ((error = git_vector_init(&data.branches, 4, git__strcmp_cb)) < 0)
+ if ((error = git_config_iterator_glob_new(&iter, config, "branch\\..+\\.remote")) < 0)
return error;
- data.name = remote_name;
+ /* find any branches with us as upstream and remove that config */
+ while ((error = git_config_next(&entry, iter)) == 0) {
+ const char *branch;
+ size_t branch_len;
- error = git_config_foreach_match(
- config, "branch\\..+\\.remote", retrieve_branches_cb, &data);
+ if (strcmp(remote_name, entry->value))
+ continue;
- git_vector_foreach(&data.branches, i, branch_name) {
- if (!error)
- error = delete_branch_remote_config_entry(config, branch_name);
+ branch = name_offset(&branch_len, entry->name);
- git__free(branch_name);
+ git_buf_clear(&buf);
+ if (git_buf_printf(&buf, "branch.%.*s.merge", (int)branch_len, branch) < 0)
+ break;
+
+ if ((error = git_config_delete_entry(config, git_buf_cstr(&buf))) < 0)
+ break;
+
+ git_buf_clear(&buf);
+ if (git_buf_printf(&buf, "branch.%.*s.remote", (int)branch_len, branch) < 0)
+ break;
+
+ if ((error = git_config_delete_entry(config, git_buf_cstr(&buf))) < 0)
+ break;
}
- git_vector_free(&data.branches);
+ if (error == GIT_ITEROVER)
+ error = 0;
+
+ git_buf_free(&buf);
+ git_config_iterator_free(iter);
return error;
}