proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-10 17:36:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move a couple more functions to use iterators

Browse Source
This commit is contained in:
Carlos Martín Nieto 2013-05-04 16:49:39 +02:00
parent 2b562c3a1e
commit 9bd89d9622
2 changed files with 49 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/branch.c
View File

@ -124,40 +124,43 @@ on_error:
return error;
}
typedef struct {
git_branch_foreach_cb branch_cb;
void *callback_payload;
unsigned int branch_type;
} branch_foreach_filter;
static int branch_foreach_cb(const char *branch_name, void *payload)
{
branch_foreach_filter *filter = (branch_foreach_filter *)payload;
if (filter->branch_type & GIT_BRANCH_LOCAL &&
git__prefixcmp(branch_name, GIT_REFS_HEADS_DIR) == 0)
return filter->branch_cb(branch_name + strlen(GIT_REFS_HEADS_DIR), GIT_BRANCH_LOCAL, filter->callback_payload);
if (filter->branch_type & GIT_BRANCH_REMOTE &&
git__prefixcmp(branch_name, GIT_REFS_REMOTES_DIR) == 0)
return filter->branch_cb(branch_name + strlen(GIT_REFS_REMOTES_DIR), GIT_BRANCH_REMOTE, filter->callback_payload);
return 0;
}
int git_branch_foreach(
git_repository *repo,
unsigned int list_flags,
git_branch_foreach_cb branch_cb,
git_branch_foreach_cb callback,
void *payload)
{
branch_foreach_filter filter;
git_reference_iterator *iter;
const char *name;
int error;
filter.branch_cb = branch_cb;
filter.branch_type = list_flags;
filter.callback_payload = payload;
if (git_reference_iterator_new(&iter, repo) < 0)
return -1;
while ((error = git_reference_next(&name, iter)) == 0) {
if (list_flags & GIT_BRANCH_LOCAL &&
git__prefixcmp(name, GIT_REFS_HEADS_DIR) == 0) {
if (callback(name + strlen(GIT_REFS_HEADS_DIR), GIT_BRANCH_LOCAL, payload)) {
error = GIT_EUSER;
break;
}
}
if (list_flags & GIT_BRANCH_REMOTE &&
git__prefixcmp(name, GIT_REFS_REMOTES_DIR) == 0) {
if (callback(name + strlen(GIT_REFS_REMOTES_DIR), GIT_BRANCH_REMOTE, payload)) {
error = GIT_EUSER;
break;
}
}
}
if (error == GIT_ITEROVER)
error = 0;
git_reference_iterator_free(iter);
return error;
return git_reference_foreach(repo, &branch_foreach_cb, (void *)&filter);
}
int git_branch_move(

32
src/remote.c
View File

@ -1244,14 +1244,6 @@ static int update_branch_remote_config_entry(
update_config_entries_cb, &data);
}
static int rename_cb(const char *ref, void *data)
{
if (git__prefixcmp(ref, GIT_REFS_REMOTES_DIR))
return 0;
return git_vector_insert((git_vector *)data, git__strdup(ref));
}
static int rename_one_remote_reference(
git_repository *repo,
const char *reference_name,
@ -1291,15 +1283,29 @@ static int rename_remote_references(
int error = -1;
unsigned int i;
char *name;
const char *refname;
git_reference_iterator *iter;
if (git_vector_init(&refnames, 8, NULL) < 0)
return -1;
if (git_reference_iterator_new(&iter, repo) < 0)
goto cleanup;
if (git_reference_foreach(
repo,
rename_cb,
&refnames) < 0)
goto cleanup;
while ((error = git_reference_next(&refname, iter)) == 0) {
if (git__prefixcmp(refname, GIT_REFS_REMOTES_DIR))
continue;
if ((error = git_vector_insert(&refnames, git__strdup(refname))) < 0)
break;
}
git_reference_iterator_free(iter);
if (error == GIT_ITEROVER)
error = 0;
else
goto cleanup;
git_vector_foreach(&refnames, i, name) {
if ((error = rename_one_remote_reference(repo, name, old_name, new_name)) < 0)