summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornulltoken <emeric.fermas@gmail.com>2012-06-21 18:48:36 +0200
committernulltoken <emeric.fermas@gmail.com>2012-06-21 18:51:32 +0200
commitd4827081ea3ed869c92fcc414bea81be7aa3edfe (patch)
tree5485a4dfd904afadd58ed918f865fc3d51b6cae5
parenta8fd805e2ff73a3825ddfe6f290774ef5a217972 (diff)
downloadlibgit2-d4827081ea3ed869c92fcc414bea81be7aa3edfe.tar.gz
branch: drop git_branch_list()
-rw-r--r--include/git2/branch.h24
-rw-r--r--src/branch.c43
-rw-r--r--tests-clar/refs/branches/listall.c78
3 files changed, 0 insertions, 145 deletions
diff --git a/include/git2/branch.h b/include/git2/branch.h
index f2239a207..8884df15a 100644
--- a/include/git2/branch.h
+++ b/include/git2/branch.h
@@ -72,30 +72,6 @@ GIT_EXTERN(int) git_branch_delete(
git_branch_t branch_type);
/**
- * Fill a list with all the branches in the Repository
- *
- * The string array will be filled with the names of the
- * matching branches; these values are owned by the user and
- * should be free'd manually when no longer needed, using
- * `git_strarray_free`.
- *
- * @param branch_names Pointer to a git_strarray structure
- * where the branch names will be stored.
- *
- * @param repo Repository where to find the branches.
- *
- * @param list_flags Filtering flags for the branch
- * listing. Valid values are GIT_BRANCH_LOCAL, GIT_BRANCH_REMOTE
- * or a combination of the two.
- *
- * @return 0 or an error code.
- */
-GIT_EXTERN(int) git_branch_list(
- git_strarray *branch_names,
- git_repository *repo,
- unsigned int list_flags);
-
-/**
* Loop over all the branches and issue a callback for each one.
*
* @param repo Repository where to find the branches.
diff --git a/src/branch.c b/src/branch.c
index 94d9a955e..671e42051 100644
--- a/src/branch.c
+++ b/src/branch.c
@@ -141,49 +141,6 @@ on_error:
}
typedef struct {
- git_vector *branchlist;
- unsigned int branch_type;
-} branch_filter_data;
-
-static int branch_list_cb(const char *branch_name, void *payload)
-{
- branch_filter_data *filter = (branch_filter_data *)payload;
-
- if (filter->branch_type & GIT_BRANCH_LOCAL && git__prefixcmp(branch_name, GIT_REFS_HEADS_DIR) == 0) {
- return git_vector_insert(filter->branchlist, git__strdup(branch_name +strlen(GIT_REFS_HEADS_DIR)));
- } else if (filter->branch_type & GIT_BRANCH_REMOTE && git__prefixcmp(branch_name, GIT_REFS_REMOTES_DIR) == 0) {
- return git_vector_insert(filter->branchlist, git__strdup(branch_name+strlen(GIT_REFS_DIR)));
- }
-
- return 0;
-}
-
-int git_branch_list(git_strarray *branch_names, git_repository *repo, unsigned int list_flags)
-{
- int error;
- branch_filter_data filter;
- git_vector branchlist;
-
- assert(branch_names && repo);
-
- if (git_vector_init(&branchlist, 8, NULL) < 0)
- return -1;
-
- filter.branchlist = &branchlist;
- filter.branch_type = list_flags;
-
- error = git_reference_foreach(repo, GIT_REF_LISTALL, &branch_list_cb, (void *)&filter);
- if (error < 0) {
- git_vector_free(&branchlist);
- return -1;
- }
-
- branch_names->strings = (char **)branchlist.contents;
- branch_names->count = branchlist.length;
- return 0;
-}
-
-typedef struct {
int (*branch_cb)(
const char *branch_name,
git_branch_t branch_type,
diff --git a/tests-clar/refs/branches/listall.c b/tests-clar/refs/branches/listall.c
deleted file mode 100644
index 77f8270fb..000000000
--- a/tests-clar/refs/branches/listall.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include "clar_libgit2.h"
-#include "refs.h"
-#include "branch.h"
-
-static git_repository *repo;
-static git_strarray branch_list;
-static git_reference *fake_remote;
-
-void test_refs_branches_listall__initialize(void)
-{
- git_oid id;
-
- cl_fixture_sandbox("testrepo.git");
- cl_git_pass(git_repository_open(&repo, "testrepo.git"));
-
- cl_git_pass(git_oid_fromstr(&id, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"));
- cl_git_pass(git_reference_create_oid(&fake_remote, repo, "refs/remotes/nulltoken/master", &id, 0));
-}
-
-void test_refs_branches_listall__cleanup(void)
-{
- git_strarray_free(&branch_list);
- git_reference_free(fake_remote);
- git_repository_free(repo);
-
- cl_fixture_cleanup("testrepo.git");
-}
-
-static void assert_retrieval(unsigned int flags, unsigned int expected_count)
-{
- cl_git_pass(git_branch_list(&branch_list, repo, flags));
-
- cl_assert_equal_i(branch_list.count, expected_count);
-}
-
-void test_refs_branches_listall__retrieve_all_branches(void)
-{
- assert_retrieval(GIT_BRANCH_LOCAL | GIT_BRANCH_REMOTE, 9);
-}
-
-void test_refs_branches_listall__retrieve_remote_branches(void)
-{
- assert_retrieval(GIT_BRANCH_REMOTE, 2);
-}
-
-void test_refs_branches_listall__retrieve_local_branches(void)
-{
- assert_retrieval(GIT_BRANCH_LOCAL, 7);
-}
-
-static void assert_branch_list_contains(git_strarray *branches, const char* expected_branch_name)
-{
- unsigned int i;
-
- for (i = 0; i < branches->count; i++) {
- if (strcmp(expected_branch_name, branches->strings[i]) == 0)
- return;
- }
-
- cl_fail("expected branch not found in list.");
-}
-
-/*
- * $ git branch -r
- * nulltoken/HEAD -> nulltoken/master
- * nulltoken/master
- */
-void test_refs_branches_listall__retrieve_remote_symbolic_HEAD_when_present(void)
-{
- git_reference_free(fake_remote);
- cl_git_pass(git_reference_create_symbolic(&fake_remote, repo, "refs/remotes/nulltoken/HEAD", "refs/remotes/nulltoken/master", 0));
-
- cl_git_pass(git_branch_list(&branch_list, repo, GIT_BRANCH_REMOTE));
-
- cl_assert_equal_i(3, branch_list.count);
- assert_branch_list_contains(&branch_list, "remotes/nulltoken/HEAD");
- assert_branch_list_contains(&branch_list, "remotes/nulltoken/master");
-}