Commit ea817863 by Ben Straub

Tabify.

parent aed794d0
...@@ -28,128 +28,128 @@ ...@@ -28,128 +28,128 @@
GIT_BEGIN_DECL GIT_BEGIN_DECL
struct HeadInfo { struct HeadInfo {
git_repository *repo; git_repository *repo;
git_oid remote_head_oid; git_oid remote_head_oid;
git_buf branchname; git_buf branchname;
}; };
static int create_tracking_branch(git_repository *repo, const git_oid *target, const char *name) static int create_tracking_branch(git_repository *repo, const git_oid *target, const char *name)
{ {
git_object *head_obj = NULL; git_object *head_obj = NULL;
git_oid branch_oid; git_oid branch_oid;
int retcode = GIT_ERROR; int retcode = GIT_ERROR;
/* Find the target commit */ /* Find the target commit */
if (git_object_lookup(&head_obj, repo, target, GIT_OBJ_ANY) < 0) if (git_object_lookup(&head_obj, repo, target, GIT_OBJ_ANY) < 0)
return GIT_ERROR; return GIT_ERROR;
/* Create the new branch */ /* Create the new branch */
if (!git_branch_create(&branch_oid, repo, name, head_obj, 0)) { if (!git_branch_create(&branch_oid, repo, name, head_obj, 0)) {
/* Set up tracking */ /* Set up tracking */
git_config *cfg; git_config *cfg;
if (!git_repository_config(&cfg, repo)) { if (!git_repository_config(&cfg, repo)) {
git_buf remote = GIT_BUF_INIT; git_buf remote = GIT_BUF_INIT;
git_buf merge = GIT_BUF_INIT; git_buf merge = GIT_BUF_INIT;
git_buf merge_target = GIT_BUF_INIT; git_buf merge_target = GIT_BUF_INIT;
if (!git_buf_printf(&remote, "branch.%s.remote", name) && if (!git_buf_printf(&remote, "branch.%s.remote", name) &&
!git_buf_printf(&merge, "branch.%s.merge", name) && !git_buf_printf(&merge, "branch.%s.merge", name) &&
!git_buf_printf(&merge_target, "refs/heads/%s", name) && !git_buf_printf(&merge_target, "refs/heads/%s", name) &&
!git_config_set_string(cfg, git_buf_cstr(&remote), "origin") && !git_config_set_string(cfg, git_buf_cstr(&remote), "origin") &&
!git_config_set_string(cfg, git_buf_cstr(&merge), git_buf_cstr(&merge_target))) { !git_config_set_string(cfg, git_buf_cstr(&merge), git_buf_cstr(&merge_target))) {
retcode = 0; retcode = 0;
} }
git_buf_free(&remote); git_buf_free(&remote);
git_buf_free(&merge); git_buf_free(&merge);
git_buf_free(&merge_target); git_buf_free(&merge_target);
git_config_free(cfg); git_config_free(cfg);
} }
} }
git_object_free(head_obj); git_object_free(head_obj);
return retcode; return retcode;
} }
static int reference_matches_remote_head(const char *head_name, void *payload) static int reference_matches_remote_head(const char *head_name, void *payload)
{ {
struct HeadInfo *head_info = (struct HeadInfo *)payload; struct HeadInfo *head_info = (struct HeadInfo *)payload;
git_oid oid; git_oid oid;
/* Stop looking if we've already found a match */ /* Stop looking if we've already found a match */
if (git_buf_len(&head_info->branchname) > 0) return 0; if (git_buf_len(&head_info->branchname) > 0) return 0;
if (!git_reference_name_to_oid(&oid, head_info->repo, head_name) && if (!git_reference_name_to_oid(&oid, head_info->repo, head_name) &&
!git_oid_cmp(&head_info->remote_head_oid, &oid)) { !git_oid_cmp(&head_info->remote_head_oid, &oid)) {
git_buf_puts(&head_info->branchname, git_buf_puts(&head_info->branchname,
head_name+strlen("refs/remotes/origin/")); head_name+strlen("refs/remotes/origin/"));
} }
return 0; return 0;
} }
static int update_head_to_new_branch(git_repository *repo, const git_oid *target, const char *name) static int update_head_to_new_branch(git_repository *repo, const git_oid *target, const char *name)
{ {
int retcode = GIT_ERROR; int retcode = GIT_ERROR;
if (!create_tracking_branch(repo, target, name)) { if (!create_tracking_branch(repo, target, name)) {
git_reference *head; git_reference *head;
if (!git_reference_lookup(&head, repo, GIT_HEAD_FILE)) { if (!git_reference_lookup(&head, repo, GIT_HEAD_FILE)) {
git_buf targetbuf = GIT_BUF_INIT; git_buf targetbuf = GIT_BUF_INIT;
if (!git_buf_printf(&targetbuf, "refs/heads/%s", name) && if (!git_buf_printf(&targetbuf, "refs/heads/%s", name) &&
!git_reference_set_target(head, git_buf_cstr(&targetbuf))) { !git_reference_set_target(head, git_buf_cstr(&targetbuf))) {
/* Read the tree into the index */ /* Read the tree into the index */
git_commit *commit; git_commit *commit;
if (!git_commit_lookup(&commit, repo, target)) { if (!git_commit_lookup(&commit, repo, target)) {
git_tree *tree; git_tree *tree;
if (!git_commit_tree(&tree, commit)) { if (!git_commit_tree(&tree, commit)) {
git_index *index; git_index *index;
if (!git_repository_index(&index, repo)) { if (!git_repository_index(&index, repo)) {
if (!git_index_read_tree(index, tree)) { if (!git_index_read_tree(index, tree)) {
git_index_write(index); git_index_write(index);
retcode = 0; retcode = 0;
} }
git_index_free(index); git_index_free(index);
} }
git_tree_free(tree); git_tree_free(tree);
} }
git_commit_free(commit); git_commit_free(commit);
} }
} }
git_buf_free(&targetbuf); git_buf_free(&targetbuf);
git_reference_free(head); git_reference_free(head);
} }
} }
return retcode; return retcode;
} }
static int update_head_to_remote(git_repository *repo, git_remote *remote) static int update_head_to_remote(git_repository *repo, git_remote *remote)
{ {
int retcode = GIT_ERROR; int retcode = GIT_ERROR;
git_remote_head *remote_head; git_remote_head *remote_head;
git_oid oid; git_oid oid;
struct HeadInfo head_info; struct HeadInfo head_info;
/* Get the remote's HEAD. This is always the first ref in remote->refs. */ /* Get the remote's HEAD. This is always the first ref in remote->refs. */
remote_head = remote->refs.contents[0]; remote_head = remote->refs.contents[0];
git_oid_cpy(&head_info.remote_head_oid, &remote_head->oid); git_oid_cpy(&head_info.remote_head_oid, &remote_head->oid);
git_buf_init(&head_info.branchname, 16); git_buf_init(&head_info.branchname, 16);
head_info.repo = repo; head_info.repo = repo;
/* Check to see if "master" matches the remote head */ /* Check to see if "master" matches the remote head */
if (!git_reference_name_to_oid(&oid, repo, "refs/remotes/origin/master") && if (!git_reference_name_to_oid(&oid, repo, "refs/remotes/origin/master") &&
!git_oid_cmp(&remote_head->oid, &oid)) { !git_oid_cmp(&remote_head->oid, &oid)) {
retcode = update_head_to_new_branch(repo, &oid, "master"); retcode = update_head_to_new_branch(repo, &oid, "master");
} }
/* Not master. Check all the other refs. */ /* Not master. Check all the other refs. */
else if (!git_reference_foreach(repo, GIT_REF_LISTALL, else if (!git_reference_foreach(repo, GIT_REF_LISTALL,
reference_matches_remote_head, reference_matches_remote_head,
&head_info) && &head_info) &&
git_buf_len(&head_info.branchname) > 0) { git_buf_len(&head_info.branchname) > 0) {
retcode = update_head_to_new_branch(repo, &head_info.remote_head_oid, retcode = update_head_to_new_branch(repo, &head_info.remote_head_oid,
git_buf_cstr(&head_info.branchname)); git_buf_cstr(&head_info.branchname));
} }
git_buf_free(&head_info.branchname); git_buf_free(&head_info.branchname);
return retcode; return retcode;
} }
/* /*
...@@ -161,151 +161,151 @@ static int update_head_to_remote(git_repository *repo, git_remote *remote) ...@@ -161,151 +161,151 @@ static int update_head_to_remote(git_repository *repo, git_remote *remote)
static int setup_remotes_and_fetch(git_repository *repo, static int setup_remotes_and_fetch(git_repository *repo,
const char *origin_url, const char *origin_url,
git_indexer_stats *stats) git_indexer_stats *stats)
{ {
int retcode = GIT_ERROR; int retcode = GIT_ERROR;
git_remote *origin = NULL; git_remote *origin = NULL;
git_off_t bytes = 0; git_off_t bytes = 0;
git_indexer_stats dummy_stats; git_indexer_stats dummy_stats;
if (!stats) stats = &dummy_stats; if (!stats) stats = &dummy_stats;
/* Create the "origin" remote */ /* Create the "origin" remote */
if (!git_remote_add(&origin, repo, "origin", origin_url)) { if (!git_remote_add(&origin, repo, "origin", origin_url)) {
/* Connect and download everything */ /* Connect and download everything */
if (!git_remote_connect(origin, GIT_DIR_FETCH)) { if (!git_remote_connect(origin, GIT_DIR_FETCH)) {
if (!git_remote_download(origin, &bytes, stats)) { if (!git_remote_download(origin, &bytes, stats)) {
/* Create "origin/foo" branches for all remote branches */ /* Create "origin/foo" branches for all remote branches */
if (!git_remote_update_tips(origin, NULL)) { if (!git_remote_update_tips(origin, NULL)) {
/* Point HEAD to the same ref as the remote's head */ /* Point HEAD to the same ref as the remote's head */
if (!update_head_to_remote(repo, origin)) { if (!update_head_to_remote(repo, origin)) {
retcode = 0; retcode = 0;
} }
} }
} }
git_remote_disconnect(origin); git_remote_disconnect(origin);
} }
git_remote_free(origin); git_remote_free(origin);
} }
return retcode; return retcode;
} }
static bool is_dot_or_dotdot(const char *name) static bool is_dot_or_dotdot(const char *name)
{ {
return (name[0] == '.' && return (name[0] == '.' &&
(name[1] == '\0' || (name[1] == '\0' ||
(name[1] == '.' && name[2] == '\0'))); (name[1] == '.' && name[2] == '\0')));
} }
/* TODO: p_opendir, p_closedir */ /* TODO: p_opendir, p_closedir */
static bool path_is_okay(const char *path) static bool path_is_okay(const char *path)
{ {
#ifdef GIT_WIN32 #ifdef GIT_WIN32
HANDLE hFind = INVALID_HANDLE_VALUE; HANDLE hFind = INVALID_HANDLE_VALUE;
wchar_t *wbuf; wchar_t *wbuf;
WIN32_FIND_DATAW ffd; WIN32_FIND_DATAW ffd;
#else #else
DIR *dir = NULL; DIR *dir = NULL;
struct dirent *e; struct dirent *e;
#endif #endif
bool retval = true; bool retval = true;
/* The path must either not exist, or be an empty directory */ /* The path must either not exist, or be an empty directory */
if (!git_path_exists(path)) return true; if (!git_path_exists(path)) return true;
if (!git_path_isdir(path)) { if (!git_path_isdir(path)) {
giterr_set(GITERR_INVALID, giterr_set(GITERR_INVALID,
"'%s' exists and is not an empty directory", path); "'%s' exists and is not an empty directory", path);
return false; return false;
} }
#ifdef GIT_WIN32 #ifdef GIT_WIN32
wbuf = gitwin_to_utf16(path); wbuf = gitwin_to_utf16(path);
gitwin_append_utf16(wbuf, "\\*", 2); gitwin_append_utf16(wbuf, "\\*", 2);
hFind = FindFirstFileW(wbuf, &ffd); hFind = FindFirstFileW(wbuf, &ffd);
if (INVALID_HANDLE_VALUE != hFind) { if (INVALID_HANDLE_VALUE != hFind) {
retval = false; retval = false;
FindClose(hFind); FindClose(hFind);
} }
git__free(wbuf); git__free(wbuf);
#else #else
dir = opendir(path); dir = opendir(path);
if (!dir) { if (!dir) {
giterr_set(GITERR_OS, "Couldn't open '%s'", path); giterr_set(GITERR_OS, "Couldn't open '%s'", path);
return false; return false;
} }
while ((e = readdir(dir)) != NULL) { while ((e = readdir(dir)) != NULL) {
if (!is_dot_or_dotdot(e->d_name)) { if (!is_dot_or_dotdot(e->d_name)) {
giterr_set(GITERR_INVALID, giterr_set(GITERR_INVALID,
"'%s' exists and is not an empty directory", path); "'%s' exists and is not an empty directory", path);
retval = false; retval = false;
break; break;
} }
} }
closedir(dir); closedir(dir);
#endif #endif
return retval; return retval;
} }
static int clone_internal(git_repository **out, static int clone_internal(git_repository **out,
const char *origin_url, const char *origin_url,
const char *path, const char *path,
git_indexer_stats *stats, git_indexer_stats *stats,
int is_bare) int is_bare)
{ {
int retcode = GIT_ERROR; int retcode = GIT_ERROR;
git_repository *repo = NULL; git_repository *repo = NULL;
if (!path_is_okay(path)) { if (!path_is_okay(path)) {
return GIT_ERROR; return GIT_ERROR;
} }
if (!(retcode = git_repository_init(&repo, path, is_bare))) { if (!(retcode = git_repository_init(&repo, path, is_bare))) {
if ((retcode = setup_remotes_and_fetch(repo, origin_url, stats)) < 0) { if ((retcode = setup_remotes_and_fetch(repo, origin_url, stats)) < 0) {
/* Failed to fetch; clean up */ /* Failed to fetch; clean up */
git_repository_free(repo); git_repository_free(repo);
git_futils_rmdir_r(path, GIT_DIRREMOVAL_FILES_AND_DIRS); git_futils_rmdir_r(path, GIT_DIRREMOVAL_FILES_AND_DIRS);
} else { } else {
*out = repo; *out = repo;
retcode = 0; retcode = 0;
} }
} }
return retcode; return retcode;
} }
int git_clone_bare(git_repository **out, int git_clone_bare(git_repository **out,
const char *origin_url, const char *origin_url,
const char *dest_path, const char *dest_path,
git_indexer_stats *stats) git_indexer_stats *stats)
{ {
assert(out && origin_url && dest_path); assert(out && origin_url && dest_path);
return clone_internal(out, origin_url, dest_path, stats, 1); return clone_internal(out, origin_url, dest_path, stats, 1);
} }
int git_clone(git_repository **out, int git_clone(git_repository **out,
const char *origin_url, const char *origin_url,
const char *workdir_path, const char *workdir_path,
git_indexer_stats *stats) git_indexer_stats *stats)
{ {
int retcode = GIT_ERROR; int retcode = GIT_ERROR;
assert(out && origin_url && workdir_path); assert(out && origin_url && workdir_path);
if (!(retcode = clone_internal(out, origin_url, workdir_path, stats, 0))) { if (!(retcode = clone_internal(out, origin_url, workdir_path, stats, 0))) {
git_indexer_stats checkout_stats; git_indexer_stats checkout_stats;
retcode = git_checkout_force(*out, &checkout_stats); retcode = git_checkout_force(*out, &checkout_stats);
} }
return retcode; return retcode;
} }
......
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