rugged 1.6.3 → 1.9.0

data/vendor/libgit2/src/libgit2/clone.c

@@ -16,14 +16,14 @@
 #include "git2/commit.h"
 #include "git2/tree.h"
 
+#include "checkout.h"
 #include "remote.h"
 #include "futils.h"
 #include "refs.h"
 #include "fs_path.h"
 #include "repository.h"
 #include "odb.h"
-
-static int clone_local_into(git_repository *repo, git_remote *remote, const git_fetch_options *fetch_opts, const git_checkout_options *co_opts, const char *branch, int link);
+#include "net.h"
 
 static int create_branch(
 	git_reference **branch,
@@ -336,8 +336,9 @@ static int create_and_configure_origin(
 	git_remote_create_cb remote_create = options->remote_cb;
 	void *payload = options->remote_cb_payload;
 
-	/* If the path exists and is a dir, the url should be the absolute path */
-	if (git_fs_path_root(url) < 0 && git_fs_path_exists(url) && git_fs_path_isdir(url)) {
+	/* If the path is local and exists it should be the absolute path. */
+	if (!git_net_str_is_url(url) && git_fs_path_root(url) < 0 &&
+	    git_fs_path_exists(url)) {
 		if (p_realpath(url, buf) == NULL)
 			return -1;
 
@@ -360,35 +361,50 @@ on_error:
 	return error;
 }
 
-static bool should_checkout(
+static int should_checkout(
+	bool *out,
 	git_repository *repo,
 	bool is_bare,
-	const git_checkout_options *opts)
+	const git_clone_options *opts)
 {
-	if (is_bare)
-		return false;
+	int error;
 
-	if (!opts)
-		return false;
+	if (!opts || is_bare ||
+	    opts->checkout_opts.checkout_strategy == GIT_CHECKOUT_NONE) {
+		*out = false;
+		return 0;
+	}
 
-	if (opts->checkout_strategy == GIT_CHECKOUT_NONE)
-		return false;
+	if ((error = git_repository_head_unborn(repo)) < 0)
+		return error;
 
-	return !git_repository_head_unborn(repo);
+	*out = !error;
+	return 0;
 }
 
-static int checkout_branch(git_repository *repo, git_remote *remote, const git_checkout_options *co_opts, const char *branch, const char *reflog_message)
+static int checkout_branch(
+	git_repository *repo,
+	git_remote *remote,
+	const git_clone_options *opts,
+	const char *reflog_message)
 {
+	bool checkout;
 	int error;
 
-	if (branch)
-		error = update_head_to_branch(repo, remote, branch, reflog_message);
+	if (opts->checkout_branch)
+		error = update_head_to_branch(repo, remote, opts->checkout_branch, reflog_message);
 	/* Point HEAD to the same ref as the remote's head */
 	else
 		error = update_head_to_remote(repo, remote, reflog_message);
 
-	if (!error && should_checkout(repo, git_repository_is_bare(repo), co_opts))
-		error = git_checkout_head(repo, co_opts);
+	if (error < 0)
+		return error;
+
+	if ((error = should_checkout(&checkout, repo, git_repository_is_bare(repo), opts)) < 0)
+		return error;
+
+	if (checkout)
+		error = git_checkout_head(repo, &opts->checkout_opts);
 
 	return error;
 }
@@ -396,16 +412,13 @@ static int checkout_branch(git_repository *repo, git_remote *remote, const git_c
 static int clone_into(
 	git_repository *repo,
 	git_remote *_remote,
-	const git_fetch_options *opts,
-	const git_checkout_options *co_opts,
-	const char *branch)
+	const git_clone_options *opts)
 {
-	int error;
 	git_str reflog_message = GIT_STR_INIT;
 	git_remote_connect_options connect_opts = GIT_REMOTE_CONNECT_OPTIONS_INIT;
-	git_fetch_options fetch_opts;
 	git_remote *remote;
 	git_oid_t oid_type;
+	int error;
 
 	GIT_ASSERT_ARG(repo);
 	GIT_ASSERT_ARG(_remote);
@@ -418,11 +431,7 @@ static int clone_into(
 	if ((error = git_remote_dup(&remote, _remote)) < 0)
 		return error;
 
-	memcpy(&fetch_opts, opts, sizeof(git_fetch_options));
-	fetch_opts.update_fetchhead = 0;
-	fetch_opts.download_tags = GIT_REMOTE_DOWNLOAD_TAGS_ALL;
-
-	if ((error = git_remote_connect_options__from_fetch_opts(&connect_opts, remote, &fetch_opts)) < 0)
+	if ((error = git_remote_connect_options__from_fetch_opts(&connect_opts, remote, &opts->fetch_opts)) < 0)
 		goto cleanup;
 
 	git_str_printf(&reflog_message, "clone: from %s", git_remote_url(remote));
@@ -440,10 +449,10 @@ static int clone_into(
 	    (error = git_repository__set_objectformat(repo, oid_type)) < 0)
 		goto cleanup;
 
-	if ((error = git_remote_fetch(remote, NULL, &fetch_opts, git_str_cstr(&reflog_message))) != 0)
+	if ((error = git_remote_fetch(remote, NULL, &opts->fetch_opts, git_str_cstr(&reflog_message))) != 0)
 		goto cleanup;
 
-	error = checkout_branch(repo, remote, co_opts, branch, git_str_cstr(&reflog_message));
+	error = checkout_branch(repo, remote, opts, git_str_cstr(&reflog_message));
 
 cleanup:
 	git_remote_free(remote);
@@ -453,37 +462,142 @@ cleanup:
 	return error;
 }
 
-int git_clone__should_clone_local(const char *url_or_path, git_clone_local_t local)
+static bool can_link(const char *src, const char *dst, int link)
+{
+#ifdef GIT_WIN32
+	GIT_UNUSED(src);
+	GIT_UNUSED(dst);
+	GIT_UNUSED(link);
+	return false;
+#else
+
+	struct stat st_src, st_dst;
+
+	if (!link)
+		return false;
+
+	if (p_stat(src, &st_src) < 0)
+		return false;
+
+	if (p_stat(dst, &st_dst) < 0)
+		return false;
+
+	return st_src.st_dev == st_dst.st_dev;
+#endif
+}
+
+static int clone_local_into(
+	git_repository *repo,
+	git_remote *remote,
+	const git_clone_options *opts)
+{
+	int error, flags;
+	git_repository *src;
+	git_str src_odb = GIT_STR_INIT, dst_odb = GIT_STR_INIT, src_path = GIT_STR_INIT;
+	git_str reflog_message = GIT_STR_INIT;
+	bool link = (opts && opts->local != GIT_CLONE_LOCAL_NO_LINKS);
+
+	GIT_ASSERT_ARG(repo);
+	GIT_ASSERT_ARG(remote);
+
+	if (!git_repository_is_empty(repo)) {
+		git_error_set(GIT_ERROR_INVALID, "the repository is not empty");
+		return -1;
+	}
+
+	/*
+	 * Let's figure out what path we should use for the source
+	 * repo, if it's not rooted, the path should be relative to
+	 * the repository's worktree/gitdir.
+	 */
+	if ((error = git_fs_path_from_url_or_path(&src_path, git_remote_url(remote))) < 0)
+		return error;
+
+	/* Copy .git/objects/ from the source to the target */
+	if ((error = git_repository_open(&src, git_str_cstr(&src_path))) < 0) {
+		git_str_dispose(&src_path);
+		return error;
+	}
+
+	if (git_repository__item_path(&src_odb, src, GIT_REPOSITORY_ITEM_OBJECTS) < 0 ||
+	    git_repository__item_path(&dst_odb, repo, GIT_REPOSITORY_ITEM_OBJECTS) < 0) {
+		error = -1;
+		goto cleanup;
+	}
+
+	flags = 0;
+	if (can_link(git_repository_path(src), git_repository_path(repo), link))
+		flags |= GIT_CPDIR_LINK_FILES;
+
+	error = git_futils_cp_r(git_str_cstr(&src_odb), git_str_cstr(&dst_odb),
+				flags, GIT_OBJECT_DIR_MODE);
+
+	/*
+	 * can_link() doesn't catch all variations, so if we hit an
+	 * error and did want to link, let's try again without trying
+	 * to link.
+	 */
+	if (error < 0 && link) {
+		flags &= ~GIT_CPDIR_LINK_FILES;
+		error = git_futils_cp_r(git_str_cstr(&src_odb), git_str_cstr(&dst_odb),
+					flags, GIT_OBJECT_DIR_MODE);
+	}
+
+	if (error < 0)
+		goto cleanup;
+
+	git_str_printf(&reflog_message, "clone: from %s", git_remote_url(remote));
+
+	if ((error = git_remote_fetch(remote, NULL, &opts->fetch_opts, git_str_cstr(&reflog_message))) != 0)
+		goto cleanup;
+
+	error = checkout_branch(repo, remote, opts, git_str_cstr(&reflog_message));
+
+cleanup:
+	git_str_dispose(&reflog_message);
+	git_str_dispose(&src_path);
+	git_str_dispose(&src_odb);
+	git_str_dispose(&dst_odb);
+	git_repository_free(src);
+	return error;
+}
+
+int git_clone__should_clone_local(
+	bool *out,
+	const char *url_or_path,
+	git_clone_local_t local)
 {
 	git_str fromurl = GIT_STR_INIT;
-	const char *path = url_or_path;
-	bool is_url, is_local;
+
+	*out = false;
 
 	if (local == GIT_CLONE_NO_LOCAL)
 		return 0;
 
-	if ((is_url = git_fs_path_is_local_file_url(url_or_path)) != 0) {
-		if (git_fs_path_fromurl(&fromurl, url_or_path) < 0) {
-			is_local = -1;
-			goto done;
-		}
+	if (git_net_str_is_url(url_or_path)) {
+		/* If GIT_CLONE_LOCAL_AUTO is specified, any url should
+		 * be treated as remote */
+		if (local == GIT_CLONE_LOCAL_AUTO ||
+		    !git_fs_path_is_local_file_url(url_or_path))
+			return 0;
 
-		path = fromurl.ptr;
-	}
+		if (git_fs_path_fromurl(&fromurl, url_or_path) < 0)
+			return -1;
 
-	is_local = (!is_url || local != GIT_CLONE_LOCAL_AUTO) &&
-		git_fs_path_isdir(path);
+		*out = git_fs_path_isdir(git_str_cstr(&fromurl));
+		git_str_dispose(&fromurl);
+	} else {
+		*out = git_fs_path_isdir(url_or_path);
+	}
 
-done:
-	git_str_dispose(&fromurl);
-	return is_local;
+	return 0;
 }
 
-static int git__clone(
+static int clone_repo(
 	git_repository **out,
 	const char *url,
 	const char *local_path,
-	const git_clone_options *_options,
+	const git_clone_options *given_opts,
 	int use_existing)
 {
 	int error = 0;
@@ -497,11 +611,17 @@ static int git__clone(
 	GIT_ASSERT_ARG(url);
 	GIT_ASSERT_ARG(local_path);
 
-	if (_options)
-		memcpy(&options, _options, sizeof(git_clone_options));
+	if (given_opts)
+		memcpy(&options, given_opts, sizeof(git_clone_options));
 
 	GIT_ERROR_CHECK_VERSION(&options, GIT_CLONE_OPTIONS_VERSION, "git_clone_options");
 
+	/* enforce some behavior on fetch */
+	options.fetch_opts.update_fetchhead = 0;
+
+	if (!options.fetch_opts.depth)
+		options.fetch_opts.download_tags = GIT_REMOTE_DOWNLOAD_TAGS_ALL;
+
 	/* Only clone to a new directory or an empty directory */
 	if (git_fs_path_exists(local_path) && !use_existing && !git_fs_path_is_empty_dir(local_path)) {
 		git_error_set(GIT_ERROR_INVALID,
@@ -522,33 +642,31 @@ static int git__clone(
 		return error;
 
 	if (!(error = create_and_configure_origin(&origin, repo, url, &options))) {
-		int clone_local = git_clone__should_clone_local(url, options.local);
-		int link = options.local != GIT_CLONE_LOCAL_NO_LINKS;
-
-		if (clone_local == 1)
-			error = clone_local_into(
-				repo, origin, &options.fetch_opts, &options.checkout_opts,
-				options.checkout_branch, link);
-		else if (clone_local == 0)
-			error = clone_into(
-				repo, origin, &options.fetch_opts, &options.checkout_opts,
-				options.checkout_branch);
+		bool clone_local;
+
+		if ((error = git_clone__should_clone_local(&clone_local, url, options.local)) < 0) {
+			git_remote_free(origin);
+			return error;
+		}
+
+		if (clone_local)
+			error = clone_local_into(repo, origin, &options);
 		else
-			error = -1;
+			error = clone_into(repo, origin, &options);
 
 		git_remote_free(origin);
 	}
 
 	if (error != 0) {
-		git_error_state last_error = {0};
-		git_error_state_capture(&last_error, error);
+		git_error *last_error;
+		git_error_save(&last_error);
 
 		git_repository_free(repo);
 		repo = NULL;
 
 		(void)git_futils_rmdir_r(local_path, NULL, rmdir_flags);
 
-		git_error_state_restore(&last_error);
+		git_error_restore(last_error);
 	}
 
 	*out = repo;
@@ -559,18 +677,18 @@ int git_clone(
 	git_repository **out,
 	const char *url,
 	const char *local_path,
-	const git_clone_options *_options)
+	const git_clone_options *options)
 {
-	return git__clone(out, url, local_path, _options, 0);
+	return clone_repo(out, url, local_path, options, 0);
 }
 
 int git_clone__submodule(
 	git_repository **out,
 	const char *url,
 	const char *local_path,
-	const git_clone_options *_options)
+	const git_clone_options *options)
 {
-	return git__clone(out, url, local_path, _options, 1);
+	return clone_repo(out, url, local_path, options, 1);
 }
 
 int git_clone_options_init(git_clone_options *opts, unsigned int version)
@@ -586,99 +704,3 @@ int git_clone_init_options(git_clone_options *opts, unsigned int version)
 	return git_clone_options_init(opts, version);
 }
 #endif
-
-static bool can_link(const char *src, const char *dst, int link)
-{
-#ifdef GIT_WIN32
-	GIT_UNUSED(src);
-	GIT_UNUSED(dst);
-	GIT_UNUSED(link);
-	return false;
-#else
-
-	struct stat st_src, st_dst;
-
-	if (!link)
-		return false;
-
-	if (p_stat(src, &st_src) < 0)
-		return false;
-
-	if (p_stat(dst, &st_dst) < 0)
-		return false;
-
-	return st_src.st_dev == st_dst.st_dev;
-#endif
-}
-
-static int clone_local_into(git_repository *repo, git_remote *remote, const git_fetch_options *fetch_opts, const git_checkout_options *co_opts, const char *branch, int link)
-{
-	int error, flags;
-	git_repository *src;
-	git_str src_odb = GIT_STR_INIT, dst_odb = GIT_STR_INIT, src_path = GIT_STR_INIT;
-	git_str reflog_message = GIT_STR_INIT;
-
-	GIT_ASSERT_ARG(repo);
-	GIT_ASSERT_ARG(remote);
-
-	if (!git_repository_is_empty(repo)) {
-		git_error_set(GIT_ERROR_INVALID, "the repository is not empty");
-		return -1;
-	}
-
-	/*
-	 * Let's figure out what path we should use for the source
-	 * repo, if it's not rooted, the path should be relative to
-	 * the repository's worktree/gitdir.
-	 */
-	if ((error = git_fs_path_from_url_or_path(&src_path, git_remote_url(remote))) < 0)
-		return error;
-
-	/* Copy .git/objects/ from the source to the target */
-	if ((error = git_repository_open(&src, git_str_cstr(&src_path))) < 0) {
-		git_str_dispose(&src_path);
-		return error;
-	}
-
-	if (git_repository__item_path(&src_odb, src, GIT_REPOSITORY_ITEM_OBJECTS) < 0 ||
-	    git_repository__item_path(&dst_odb, repo, GIT_REPOSITORY_ITEM_OBJECTS) < 0) {
-		error = -1;
-		goto cleanup;
-	}
-
-	flags = 0;
-	if (can_link(git_repository_path(src), git_repository_path(repo), link))
-		flags |= GIT_CPDIR_LINK_FILES;
-
-	error = git_futils_cp_r(git_str_cstr(&src_odb), git_str_cstr(&dst_odb),
-				flags, GIT_OBJECT_DIR_MODE);
-
-	/*
-	 * can_link() doesn't catch all variations, so if we hit an
-	 * error and did want to link, let's try again without trying
-	 * to link.
-	 */
-	if (error < 0 && link) {
-		flags &= ~GIT_CPDIR_LINK_FILES;
-		error = git_futils_cp_r(git_str_cstr(&src_odb), git_str_cstr(&dst_odb),
-					flags, GIT_OBJECT_DIR_MODE);
-	}
-
-	if (error < 0)
-		goto cleanup;
-
-	git_str_printf(&reflog_message, "clone: from %s", git_remote_url(remote));
-
-	if ((error = git_remote_fetch(remote, NULL, fetch_opts, git_str_cstr(&reflog_message))) != 0)
-		goto cleanup;
-
-	error = checkout_branch(repo, remote, co_opts, branch, git_str_cstr(&reflog_message));
-
-cleanup:
-	git_str_dispose(&reflog_message);
-	git_str_dispose(&src_path);
-	git_str_dispose(&src_odb);
-	git_str_dispose(&dst_odb);
-	git_repository_free(src);
-	return error;
-}

data/vendor/libgit2/src/libgit2/clone.h

@@ -15,6 +15,9 @@ extern int git_clone__submodule(git_repository **out,
 	const char *url, const char *local_path,
 	const git_clone_options *_options);
 
-extern int git_clone__should_clone_local(const char *url, git_clone_local_t local);
+extern int git_clone__should_clone_local(
+	bool *out,
+	const char *url,
+	git_clone_local_t local);
 
 #endif

data/vendor/libgit2/src/libgit2/commit.c

@@ -22,6 +22,7 @@
 #include "object.h"
 #include "array.h"
 #include "oidarray.h"
+#include "grafts.h"
 
 void git_commit__free(void *_commit)
 {
@@ -427,10 +428,6 @@ static int commit_parse(
 		buffer += tree_len;
 	}
 
-	/*
-	 * TODO: commit grafts!
-	 */
-
 	while (git_object__parse_oid_header(&parent_id,
 			&buffer, buffer_end, "parent ",
 			opts->oid_type) == 0) {
@@ -532,16 +529,41 @@ int git_commit__parse_raw(
 	return commit_parse(commit, data, size, &parse_options);
 }
 
+static int assign_commit_parents_from_graft(git_commit *commit, git_commit_graft *graft) {
+	size_t idx;
+	git_oid *oid;
+
+	git_array_clear(commit->parent_ids);
+	git_array_init_to_size(commit->parent_ids, git_array_size(graft->parents));
+	git_array_foreach(graft->parents, idx, oid) {
+		git_oid *id = git_array_alloc(commit->parent_ids);
+		GIT_ERROR_CHECK_ALLOC(id);
+
+		git_oid_cpy(id, oid);
+	}
+
+	return 0;
+}
+
 int git_commit__parse_ext(
 	git_commit *commit,
 	git_odb_object *odb_obj,
 	git_commit__parse_options *parse_opts)
 {
-	return commit_parse(
-		commit,
-		git_odb_object_data(odb_obj),
-		git_odb_object_size(odb_obj),
-		parse_opts);
+	git_repository *repo = git_object_owner((git_object *)commit);
+	git_commit_graft *graft;
+	int error;
+
+	if ((error = commit_parse(commit, git_odb_object_data(odb_obj),
+				  git_odb_object_size(odb_obj), parse_opts)) < 0)
+		return error;
+
+	/* Perform necessary grafts */
+	if (git_grafts_get(&graft, repo->grafts, git_odb_object_id(odb_obj)) != 0 &&
+		git_grafts_get(&graft, repo->shallow_grafts, git_odb_object_id(odb_obj)) != 0)
+		return 0;
+
+	return assign_commit_parents_from_graft(commit, graft);
 }
 
 #define GIT_COMMIT_GETTER(_rvalue, _name, _return, _invalid) \
@@ -1064,6 +1086,83 @@ cleanup:
 	return error;
 }
 
+int git_commit_create_from_stage(
+	git_oid *out,
+	git_repository *repo,
+	const char *message,
+	const git_commit_create_options *given_opts)
+{
+	git_commit_create_options opts = GIT_COMMIT_CREATE_OPTIONS_INIT;
+	git_signature *default_signature = NULL;
+	const git_signature *author, *committer;
+	git_index *index = NULL;
+	git_diff *diff = NULL;
+	git_oid tree_id;
+	git_tree *head_tree = NULL, *tree = NULL;
+	git_commitarray parents = { 0 };
+	int error = -1;
+
+	GIT_ASSERT_ARG(out && repo);
+
+	if (given_opts)
+		memcpy(&opts, given_opts, sizeof(git_commit_create_options));
+
+	author = opts.author;
+	committer = opts.committer;
+
+	if (!author || !committer) {
+		if (git_signature_default(&default_signature, repo) < 0)
+			goto done;
+
+		if (!author)
+			author = default_signature;
+
+		if (!committer)
+			committer = default_signature;
+	}
+
+	if (git_repository_index(&index, repo) < 0)
+		goto done;
+
+	if (!opts.allow_empty_commit) {
+		error = git_repository_head_tree(&head_tree, repo);
+
+		if (error && error != GIT_EUNBORNBRANCH)
+			goto done;
+
+		error = -1;
+
+		if (git_diff_tree_to_index(&diff, repo, head_tree, index, NULL) < 0)
+			goto done;
+
+		if (git_diff_num_deltas(diff) == 0) {
+			git_error_set(GIT_ERROR_REPOSITORY,
+				"no changes are staged for commit");
+			error = GIT_EUNCHANGED;
+			goto done;
+		}
+	}
+
+	if (git_index_write_tree(&tree_id, index) < 0 ||
+	    git_tree_lookup(&tree, repo, &tree_id) < 0 ||
+	    git_repository_commit_parents(&parents, repo) < 0)
+		goto done;
+
+	error = git_commit_create(out, repo, "HEAD", author, committer,
+			opts.message_encoding, message,
+			tree, parents.count,
+			(const git_commit **)parents.commits);
+
+done:
+	git_commitarray_dispose(&parents);
+	git_signature_free(default_signature);
+	git_tree_free(tree);
+	git_tree_free(head_tree);
+	git_diff_free(diff);
+	git_index_free(index);
+	return error;
+}
+
 int git_commit_committer_with_mailmap(
 	git_signature **out, const git_commit *commit, const git_mailmap *mailmap)
 {
@@ -1075,3 +1174,18 @@ int git_commit_author_with_mailmap(
 {
 	return git_mailmap_resolve_signature(out, mailmap, commit->author);
 }
+
+void git_commitarray_dispose(git_commitarray *array)
+{
+	size_t i;
+
+	if (array == NULL)
+		return;
+
+	for (i = 0; i < array->count; i++)
+		git_commit_free(array->commits[i]);
+
+	git__free((git_commit **)array->commits);
+
+	memset(array, 0, sizeof(*array));
+}