Commit 1c7eb971 by Ben Straub

Reindent.

parent 8fb5e403
...@@ -154,8 +154,6 @@ static int update_head_to_remote(git_repository *repo, git_remote *remote) ...@@ -154,8 +154,6 @@ static int update_head_to_remote(git_repository *repo, git_remote *remote)
/* /*
* submodules? * submodules?
* filemodes?
* Line endings
*/ */
......
...@@ -7,110 +7,106 @@ static git_repository *g_repo; ...@@ -7,110 +7,106 @@ static git_repository *g_repo;
void test_clone_clone__initialize(void) void test_clone_clone__initialize(void)
{ {
g_repo = NULL; g_repo = NULL;
} }
void test_clone_clone__cleanup(void) void test_clone_clone__cleanup(void)
{ {
if (g_repo) { if (g_repo) {
git_repository_free(g_repo); git_repository_free(g_repo);
g_repo = NULL; g_repo = NULL;
} }
} }
// TODO: This is copy/pasted from network/remotelocal.c. // TODO: This is copy/pasted from network/remotelocal.c.
static void build_local_file_url(git_buf *out, const char *fixture) static void build_local_file_url(git_buf *out, const char *fixture)
{ {
const char *in_buf; const char *in_buf;
git_buf path_buf = GIT_BUF_INIT; git_buf path_buf = GIT_BUF_INIT;
cl_git_pass(git_path_prettify_dir(&path_buf, fixture, NULL)); cl_git_pass(git_path_prettify_dir(&path_buf, fixture, NULL));
cl_git_pass(git_buf_puts(out, "file://")); cl_git_pass(git_buf_puts(out, "file://"));
#ifdef GIT_WIN32 #ifdef GIT_WIN32
/* /*
* A FILE uri matches the following format: file://[host]/path * A FILE uri matches the following format: file://[host]/path
* where "host" can be empty and "path" is an absolute path to the resource. * where "host" can be empty and "path" is an absolute path to the resource.
* *
* In this test, no hostname is used, but we have to ensure the leading triple slashes: * In this test, no hostname is used, but we have to ensure the leading triple slashes:
* *
* *nix: file:///usr/home/... * *nix: file:///usr/home/...
* Windows: file:///C:/Users/... * Windows: file:///C:/Users/...
*/ */
cl_git_pass(git_buf_putc(out, '/')); cl_git_pass(git_buf_putc(out, '/'));
#endif #endif
in_buf = git_buf_cstr(&path_buf); in_buf = git_buf_cstr(&path_buf);
/* /*
* A very hacky Url encoding that only takes care of escaping the spaces * A very hacky Url encoding that only takes care of escaping the spaces
*/ */
while (*in_buf) { while (*in_buf) {
if (*in_buf == ' ') if (*in_buf == ' ')
cl_git_pass(git_buf_puts(out, "%20")); cl_git_pass(git_buf_puts(out, "%20"));
else else
cl_git_pass(git_buf_putc(out, *in_buf)); cl_git_pass(git_buf_putc(out, *in_buf));
in_buf++; in_buf++;
} }
git_buf_free(&path_buf); git_buf_free(&path_buf);
} }
void test_clone_clone__bad_url(void) void test_clone_clone__bad_url(void)
{ {
/* Clone should clean up the mess if the URL isn't a git repository */ /* Clone should clean up the mess if the URL isn't a git repository */
cl_git_fail(git_clone(&g_repo, "not_a_repo", "./foo", NULL)); cl_git_fail(git_clone(&g_repo, "not_a_repo", "./foo", NULL));
cl_assert(!git_path_exists("./foo")); cl_assert(!git_path_exists("./foo"));
cl_git_fail(git_clone_bare(&g_repo, "not_a_repo", "./foo.git", NULL)); cl_git_fail(git_clone_bare(&g_repo, "not_a_repo", "./foo.git", NULL));
cl_assert(!git_path_exists("./foo.git")); cl_assert(!git_path_exists("./foo.git"));
} }
void test_clone_clone__local(void) void test_clone_clone__local(void)
{ {
git_buf src = GIT_BUF_INIT; git_buf src = GIT_BUF_INIT;
build_local_file_url(&src, cl_fixture("testrepo.git")); build_local_file_url(&src, cl_fixture("testrepo.git"));
#if 0 #if 0
cl_git_pass(git_clone(&g_repo, git_buf_cstr(&src), "./local", NULL)); cl_git_pass(git_clone(&g_repo, git_buf_cstr(&src), "./local", NULL));
git_repository_free(g_repo); git_repository_free(g_repo);
git_futils_rmdir_r("./local", GIT_DIRREMOVAL_FILES_AND_DIRS); git_futils_rmdir_r("./local", GIT_DIRREMOVAL_FILES_AND_DIRS);
cl_git_pass(git_clone_bare(&g_repo, git_buf_cstr(&src), "./local.git", NULL)); cl_git_pass(git_clone_bare(&g_repo, git_buf_cstr(&src), "./local.git", NULL));
git_futils_rmdir_r("./local.git", GIT_DIRREMOVAL_FILES_AND_DIRS); git_futils_rmdir_r("./local.git", GIT_DIRREMOVAL_FILES_AND_DIRS);
#endif #endif
git_buf_free(&src); git_buf_free(&src);
} }
void test_clone_clone__network_full(void) void test_clone_clone__network_full(void)
{ {
#if 0 #if 0
git_remote *origin; git_remote *origin;
cl_git_pass(git_clone(&g_repo, cl_git_pass(git_clone(&g_repo, "http://github.com/libgit2/node-gitteh", "./attr", NULL));
"https://github.com/libgit2/GitForDelphi.git", cl_assert(!git_repository_is_bare(g_repo));
"./libgit2", NULL)); cl_git_pass(git_remote_load(&origin, g_repo, "origin"));
cl_assert(!git_repository_is_bare(g_repo)); git_futils_rmdir_r("./attr", GIT_DIRREMOVAL_FILES_AND_DIRS);
cl_git_pass(git_remote_load(&origin, g_repo, "origin"));
git_futils_rmdir_r("./libgit2", GIT_DIRREMOVAL_FILES_AND_DIRS);
#endif #endif
} }
void test_clone_clone__network_bare(void) void test_clone_clone__network_bare(void)
{ {
#if 0 #if 0
git_remote *origin; git_remote *origin;
cl_git_pass(git_clone_bare(&g_repo, cl_git_pass(git_clone_bare(&g_repo, "http://github.com/libgit2/node-gitteh", "attr", NULL));
"https://github.com/libgit2/GitForDelphi.git", cl_assert(git_repository_is_bare(g_repo));
"./libgit2.git", NULL)); cl_git_pass(git_remote_load(&origin, g_repo, "origin"));
cl_assert(git_repository_is_bare(g_repo)); git_futils_rmdir_r("./attr", GIT_DIRREMOVAL_FILES_AND_DIRS);
cl_git_pass(git_remote_load(&origin, g_repo, "origin"));
git_futils_rmdir_r("./libgit2.git", GIT_DIRREMOVAL_FILES_AND_DIRS);
#endif #endif
} }
...@@ -118,29 +114,29 @@ void test_clone_clone__network_bare(void) ...@@ -118,29 +114,29 @@ void test_clone_clone__network_bare(void)
void test_clone_clone__already_exists(void) void test_clone_clone__already_exists(void)
{ {
#if 0 #if 0
int bar; int bar;
/* Should pass with existing-but-empty dir */ /* Should pass with existing-but-empty dir */
p_mkdir("./foo", GIT_DIR_MODE); p_mkdir("./foo", GIT_DIR_MODE);
cl_git_pass(git_clone(&g_repo, cl_git_pass(git_clone(&g_repo,
"http://github.com/libgit2/libgit2.git", "http://github.com/libgit2/libgit2.git",
"./foo", NULL)); "./foo", NULL));
git_repository_free(g_repo); g_repo = NULL; git_repository_free(g_repo); g_repo = NULL;
git_futils_rmdir_r("./foo", GIT_DIRREMOVAL_FILES_AND_DIRS); git_futils_rmdir_r("./foo", GIT_DIRREMOVAL_FILES_AND_DIRS);
#endif #endif
/* Should fail with a file */ /* Should fail with a file */
cl_git_mkfile("./foo", "Bar!"); cl_git_mkfile("./foo", "Bar!");
cl_git_fail(git_clone(&g_repo, cl_git_fail(git_clone(&g_repo,
"http://github.com/libgit2/libgit2.git", "http://github.com/libgit2/libgit2.git",
"./foo", NULL)); "./foo", NULL));
git_futils_rmdir_r("./foo", GIT_DIRREMOVAL_FILES_AND_DIRS); git_futils_rmdir_r("./foo", GIT_DIRREMOVAL_FILES_AND_DIRS);
/* Should fail with existing-and-nonempty dir */ /* Should fail with existing-and-nonempty dir */
p_mkdir("./foo", GIT_DIR_MODE); p_mkdir("./foo", GIT_DIR_MODE);
cl_git_mkfile("./foo/bar", "Baz!"); cl_git_mkfile("./foo/bar", "Baz!");
cl_git_fail(git_clone(&g_repo, cl_git_fail(git_clone(&g_repo,
"https://github.com/libgit2/libgit2.git", "https://github.com/libgit2/libgit2.git",
"./foo", NULL)); "./foo", NULL));
git_futils_rmdir_r("./foo", GIT_DIRREMOVAL_FILES_AND_DIRS); git_futils_rmdir_r("./foo", GIT_DIRREMOVAL_FILES_AND_DIRS);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment