rugged 0.17.0b2 → 0.17.0.b6

data/ext/rugged/vendor/libgit2-dist/src/branch.h

@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2009-2012 the libgit2 contributors
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-#ifndef INCLUDE_branch_h__
-#define INCLUDE_branch_h__
-
-#include "git2/branch.h"
-
-struct git_branch {
-	char *remote; /* TODO: Make this a git_remote */
-	char *merge;
-};
-
-#endif

data/ext/rugged/vendor/libgit2-dist/src/fetch.c

@@ -1,200 +0,0 @@
-/*
- * Copyright (C) 2009-2012 the libgit2 contributors
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-
-#include "git2/remote.h"
-#include "git2/oid.h"
-#include "git2/refs.h"
-#include "git2/revwalk.h"
-#include "git2/indexer.h"
-
-#include "common.h"
-#include "transport.h"
-#include "remote.h"
-#include "refspec.h"
-#include "pack.h"
-#include "fetch.h"
-#include "netops.h"
-
-struct filter_payload {
-	git_remote *remote;
-	const git_refspec *spec;
-	git_odb *odb;
-	int found_head;
-};
-
-static int filter_ref__cb(git_remote_head *head, void *payload)
-{
-	struct filter_payload *p = payload;
-
-	if (!p->found_head && strcmp(head->name, GIT_HEAD_FILE) == 0) {
-		p->found_head = 1;
-	} else {
-		/* If it doesn't match the refpec, we don't want it */
-		if (!git_refspec_src_matches(p->spec, head->name))
-			return 0;
-
-		/* Don't even try to ask for the annotation target */
-		if (!git__suffixcmp(head->name, "^{}"))
-			return 0;
-	}
-
-	/* If we have the object, mark it so we don't ask for it */
-	if (git_odb_exists(p->odb, &head->oid))
-		head->local = 1;
-	else
-		p->remote->need_pack = 1;
-
-	return git_vector_insert(&p->remote->refs, head);
-}
-
-static int filter_wants(git_remote *remote)
-{
-	struct filter_payload p;
-
-	git_vector_clear(&remote->refs);
-
-	/*
-	 * The fetch refspec can be NULL, and what this means is that the
-	 * user didn't specify one. This is fine, as it means that we're
-	 * not interested in any particular branch but just the remote's
-	 * HEAD, which will be stored in FETCH_HEAD after the fetch.
-	 */
-	p.spec = git_remote_fetchspec(remote);
-	p.found_head = 0;
-	p.remote = remote;
-
-	if (git_repository_odb__weakptr(&p.odb, remote->repo) < 0)
-		return -1;
-
-	return remote->transport->ls(remote->transport, &filter_ref__cb, &p);
-}
-
-/*
- * In this first version, we push all our refs in and start sending
- * them out. When we get an ACK we hide that commit and continue
- * traversing until we're done
- */
-int git_fetch_negotiate(git_remote *remote)
-{
-	git_transport *t = remote->transport;
-
-	if (filter_wants(remote) < 0) {
-		giterr_set(GITERR_NET, "Failed to filter the reference list for wants");
-		return -1;
-	}
-
-	/* Don't try to negotiate when we don't want anything */
-	if (remote->refs.length == 0 || !remote->need_pack)
-		return 0;
-
-	/*
-	 * Now we have everything set up so we can start tell the server
-	 * what we want and what we have.
-	 */
-	return t->negotiate_fetch(t, remote->repo, &remote->refs);
-}
-
-int git_fetch_download_pack(git_remote *remote, git_off_t *bytes, git_indexer_stats *stats)
-{
-	if(!remote->need_pack)
-		return 0;
-
-	return remote->transport->download_pack(remote->transport, remote->repo, bytes, stats);
-}
-
-/* Receiving data from a socket and storing it is pretty much the same for git and HTTP */
-int git_fetch__download_pack(
-	const char *buffered,
-	size_t buffered_size,
-	git_transport *t,
-	git_repository *repo,
-	git_off_t *bytes,
-	git_indexer_stats *stats)
-{
-	int recvd;
-	char buff[1024];
-	gitno_buffer buf;
-	git_indexer_stream *idx;
-
-	gitno_buffer_setup(t, &buf, buff, sizeof(buff));
-
-	if (memcmp(buffered, "PACK", strlen("PACK"))) {
-		giterr_set(GITERR_NET, "The pack doesn't start with the signature");
-		return -1;
-	}
-
-	if (git_indexer_stream_new(&idx, git_repository_path(repo)) < 0)
-		return -1;
-
-	memset(stats, 0, sizeof(git_indexer_stats));
-	if (git_indexer_stream_add(idx, buffered, buffered_size, stats) < 0)
-		goto on_error;
-
-	*bytes = buffered_size;
-
-	do {
-		if (git_indexer_stream_add(idx, buf.data, buf.offset, stats) < 0)
-			goto on_error;
-
-		gitno_consume_n(&buf, buf.offset);
-		if ((recvd = gitno_recv(&buf)) < 0)
-			goto on_error;
-
-		*bytes += recvd;
-	} while(recvd > 0);
-
-	if (git_indexer_stream_finalize(idx, stats))
-		goto on_error;
-
-	git_indexer_stream_free(idx);
-	return 0;
-
-on_error:
-	git_indexer_stream_free(idx);
-	return -1;
-}
-
-int git_fetch_setup_walk(git_revwalk **out, git_repository *repo)
-{
-	git_revwalk *walk;
-	git_strarray refs;
-	unsigned int i;
-	git_reference *ref;
-
-	if (git_reference_list(&refs, repo, GIT_REF_LISTALL) < 0)
-		return -1;
-
-	if (git_revwalk_new(&walk, repo) < 0)
-		return -1;
-
-	git_revwalk_sorting(walk, GIT_SORT_TIME);
-
-	for (i = 0; i < refs.count; ++i) {
-		/* No tags */
-		if (!git__prefixcmp(refs.strings[i], GIT_REFS_TAGS_DIR))
-			continue;
-
-		if (git_reference_lookup(&ref, repo, refs.strings[i]) < 0)
-			goto on_error;
-
-		if (git_reference_type(ref) == GIT_REF_SYMBOLIC)
-			continue;
-		if (git_revwalk_push(walk, git_reference_oid(ref)) < 0)
-			goto on_error;
-
-		git_reference_free(ref);
-	}
-
-	git_strarray_free(&refs);
-	*out = walk;
-	return 0;
-
-on_error:
-	git_reference_free(ref);
-	git_strarray_free(&refs);
-	return -1;
-}

data/ext/rugged/vendor/libgit2-dist/src/notes.c

@@ -1,548 +0,0 @@
-/*
- * Copyright (C) 2009-2012 the libgit2 contributors
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-
-#include "notes.h"
-
-#include "git2.h"
-#include "refs.h"
-#include "config.h"
-#include "iterator.h"
-
-static int find_subtree(git_tree **subtree, const git_oid *root,
-			git_repository *repo, const char *target, int *fanout)
-{
-	int error;
-	unsigned int i;
-	git_tree *tree;
-	const git_tree_entry *entry;
-
-	*subtree = NULL;
-
-	error = git_tree_lookup(&tree, repo, root);
-	if (error < 0)
-		return error;
-
-	for (i=0; i<git_tree_entrycount(tree); i++) {
-		entry = git_tree_entry_byindex(tree, i);
-
-		if (!git__ishex(git_tree_entry_name(entry)))
-			continue;
-
-		/*
-		 * A notes tree follows a strict byte-based progressive fanout
-		 * (i.e. using 2/38, 2/2/36, etc. fanouts, not e.g. 4/36 fanout)
-		 */
-
-		if (S_ISDIR(git_tree_entry_attributes(entry))
-			&& strlen(git_tree_entry_name(entry)) == 2
-			&& !strncmp(git_tree_entry_name(entry), target + *fanout, 2)) {
-
-			/* found matching subtree - unpack and resume lookup */
-
-			git_oid subtree_sha;
-			git_oid_cpy(&subtree_sha, git_tree_entry_id(entry));
-			git_tree_free(tree);
-
-			*fanout += 2;
-
-			return find_subtree(subtree, &subtree_sha, repo,
-					    target, fanout);
-		}
-	}
-
-	*subtree = tree;
-	return 0;
-}
-
-static int find_blob(git_oid *blob, git_tree *tree, const char *target)
-{
-	unsigned int i;
-	const git_tree_entry *entry;
-
-	for (i=0; i<git_tree_entrycount(tree); i++) {
-		entry = git_tree_entry_byindex(tree, i);
-
-		if (!strcmp(git_tree_entry_name(entry), target)) {
-			/* found matching note object - return */
-
-			git_oid_cpy(blob, git_tree_entry_id(entry));
-			return 0;
-		}
-	}
-	return GIT_ENOTFOUND;
-}
-
-static int note_write(git_oid *out, git_repository *repo,
-		      git_signature *author, git_signature *committer,
-		      const char *notes_ref, const char *note,
-		      const git_oid *tree_sha, const char *target,
-		      int nparents, git_commit **parents)
-{
-	int error, fanout = 0;
-	git_oid oid;
-	git_tree *tree = NULL;
-	git_tree_entry *entry;
-	git_treebuilder *tb;
-
-	/* check for existing notes tree */
-
-	if (tree_sha) {
-		error = find_subtree(&tree, tree_sha, repo, target, &fanout);
-		if (error < 0)
-			return error;
-
-		error = find_blob(&oid, tree, target + fanout);
-		if (error != GIT_ENOTFOUND) {
-			git_tree_free(tree);
-			if (!error) {
-				giterr_set(GITERR_REPOSITORY, "Note for '%s' exists already", target);
-				error = GIT_EEXISTS;
-			}
-			return error;
-		}
-	}
-
-	/* no matching tree entry - add note object to target tree */
-
-	error = git_treebuilder_create(&tb, tree);
-	git_tree_free(tree);
-
-	if (error < 0)
-		return error;
-
-	if (!tree_sha)
-		/* no notes tree yet - create fanout */
-		fanout += 2;
-
-	/* create note object */
-	error = git_blob_create_frombuffer(&oid, repo, note, strlen(note));
-	if (error < 0) {
-		git_treebuilder_free(tb);
-		return error;
-	}
-
-	error = git_treebuilder_insert(&entry, tb, target + fanout, &oid, 0100644); //-V536
-	if (error < 0) {
-		/* libgit2 doesn't support object removal (gc) yet */
-		/* we leave an orphaned blob object behind - TODO */
-
-		git_treebuilder_free(tb);
-		return error;
-	}
-
-	if (out)
-		git_oid_cpy(out, git_tree_entry_id(entry));
-
-	error = git_treebuilder_write(&oid, repo, tb);
-	git_treebuilder_free(tb);
-
-	if (error < 0)
-		return 0;
-
-	if (!tree_sha) {
-		/* create fanout subtree */
-
-		char subtree[3];
-		strncpy(subtree, target, 2);
-		subtree[2] = '\0';
-
-		error = git_treebuilder_create(&tb, NULL);
-		if (error < 0)
-			return error;
-
-		error = git_treebuilder_insert(NULL, tb, subtree, &oid, 0040000); //-V536
-		if (error < 0) {
-			git_treebuilder_free(tb);
-			return error;
-		}
-
-		error = git_treebuilder_write(&oid, repo, tb);
-
-		git_treebuilder_free(tb);
-
-		if (error < 0)
-			return error;
-	}
-
-	/* create new notes commit */
-
-	error = git_tree_lookup(&tree, repo, &oid);
-	if (error < 0)
-		return error;
-
-	error = git_commit_create(&oid, repo, notes_ref, author, committer,
-				  NULL, GIT_NOTES_DEFAULT_MSG_ADD,
-				  tree, nparents, (const git_commit **) parents);
-
-	git_tree_free(tree);
-
-	return error;
-}
-
-static int note_lookup(git_note **out, git_repository *repo,
-		       const git_oid *tree_sha, const char *target)
-{
-	int error, fanout = 0;
-	git_oid oid;
-	git_blob *blob;
-	git_tree *tree;
-	git_note *note;
-
-	error = find_subtree(&tree, tree_sha, repo, target, &fanout);
-	if (error < 0)
-		return error;
-
-	error = find_blob(&oid, tree, target + fanout);
-
-	git_tree_free(tree);
-	if (error < 0)
-		return error;
-
-	error = git_blob_lookup(&blob, repo, &oid);
-	if (error < 0)
-		return error;
-
-	note = git__malloc(sizeof(git_note));
-	GITERR_CHECK_ALLOC(note);
-
-	git_oid_cpy(&note->oid, &oid);
-	note->message = git__strdup(git_blob_rawcontent(blob));
-	GITERR_CHECK_ALLOC(note->message);
-
-	*out = note;
-
-	git_blob_free(blob);
-	return error;
-}
-
-static int note_remove(git_repository *repo,
-		       git_signature *author, git_signature *committer,
-		       const char *notes_ref, const git_oid *tree_sha,
-		       const char *target, int nparents, git_commit **parents)
-{
-	int error, fanout = 0;
-	git_oid oid;
-	git_tree *tree;
-	git_treebuilder *tb;
-
-	error = find_subtree(&tree, tree_sha, repo, target, &fanout);
-	if (error < 0)
-		return error;
-
-	error = find_blob(&oid, tree, target + fanout);
-	if (!error)
-		error = git_treebuilder_create(&tb, tree);
-
-	git_tree_free(tree);
-	if (error < 0)
-		return error;
-
-	error = git_treebuilder_remove(tb, target + fanout);
-	if (!error)
-		error = git_treebuilder_write(&oid, repo, tb);
-
-	git_treebuilder_free(tb);
-	if (error < 0)
-		return error;
-
-	/* create new notes commit */
-
-	error = git_tree_lookup(&tree, repo, &oid);
-	if (error < 0)
-		return error;
-
-	error = git_commit_create(&oid, repo, notes_ref, author, committer,
-				  NULL, GIT_NOTES_DEFAULT_MSG_RM,
-				  tree, nparents, (const git_commit **) parents);
-
-	git_tree_free(tree);
-
-	return error;
-}
-
-static int note_get_default_ref(const char **out, git_repository *repo)
-{
-	int ret;
-	git_config *cfg;
-
-	*out = NULL;
-
-	if (git_repository_config__weakptr(&cfg, repo) < 0)
-		return -1;
-
-	ret = git_config_get_string(out, cfg, "core.notesRef");
-	if (ret == GIT_ENOTFOUND) {
-		*out = GIT_NOTES_DEFAULT_REF;
-		return 0;
-	}
-
-	return ret;
-}
-
-static int normalize_namespace(const char **notes_ref, git_repository *repo)
-{
-	if (*notes_ref)
-		return 0;
-
-	return note_get_default_ref(notes_ref, repo);
-}
-
-static int retrieve_note_tree_oid(git_oid *tree_oid_out, git_repository *repo, const char *notes_ref)
-{
-	int error = -1;
-	git_commit *commit = NULL;
-	git_oid oid;
-
-	if ((error = git_reference_name_to_oid(&oid, repo, notes_ref)) < 0)
-		goto cleanup;
-
-	if (git_commit_lookup(&commit, repo, &oid) < 0)
-		goto cleanup;
-
-	git_oid_cpy(tree_oid_out, git_commit_tree_oid(commit));
-
-	error = 0;
-
-cleanup:
-	git_commit_free(commit);
-	return error;
-}
-
-int git_note_read(git_note **out, git_repository *repo,
-		  const char *notes_ref, const git_oid *oid)
-{
-	int error;
-	char *target;
-	git_oid sha;
-
-	*out = NULL;
-
-	if (normalize_namespace(&notes_ref, repo) < 0)
-		return -1;
-
-	if ((error = retrieve_note_tree_oid(&sha, repo, notes_ref)) < 0)
-		return error;
-
-	target = git_oid_allocfmt(oid);
-	GITERR_CHECK_ALLOC(target);
-
-	error = note_lookup(out, repo, &sha, target);
-
-	git__free(target);
-	return error;
-}
-
-int git_note_create(
-	git_oid *out, git_repository *repo,
-	git_signature *author, git_signature *committer,
-	const char *notes_ref, const git_oid *oid,
-	const char *note)
-{
-	int error, nparents = 0;
-	char *target;
-	git_oid sha;
-	git_commit *commit = NULL;
-	git_reference *ref;
-
-	if (normalize_namespace(&notes_ref, repo) < 0)
-		return -1;
-
-	error = git_reference_lookup(&ref, repo, notes_ref);
-	if (error < 0 && error != GIT_ENOTFOUND)
-		return error;
-
-	if (!error) {
-		assert(git_reference_type(ref) == GIT_REF_OID);
-
-		/* lookup existing notes tree oid */
-
-		git_oid_cpy(&sha, git_reference_oid(ref));
-		git_reference_free(ref);
-
-		error = git_commit_lookup(&commit, repo, &sha);
-		if (error < 0)
-			return error;
-
-		git_oid_cpy(&sha, git_commit_tree_oid(commit));
-		nparents++;
-	}
-
-	target = git_oid_allocfmt(oid);
-	GITERR_CHECK_ALLOC(target);
-
-	error = note_write(out, repo, author, committer, notes_ref,
-			   note, nparents ? &sha : NULL, target,
-			   nparents, &commit);
-
-	git__free(target);
-	git_commit_free(commit);
-	return error;
-}
-
-int git_note_remove(git_repository *repo, const char *notes_ref,
-		    git_signature *author, git_signature *committer,
-		    const git_oid *oid)
-{
-	int error;
-	char *target;
-	git_oid sha;
-	git_commit *commit;
-	git_reference *ref;
-
-	if (normalize_namespace(&notes_ref, repo) < 0)
-		return -1;
-
-	error = git_reference_lookup(&ref, repo, notes_ref);
-	if (error < 0)
-		return error;
-
-	assert(git_reference_type(ref) == GIT_REF_OID);
-
-	git_oid_cpy(&sha, git_reference_oid(ref));
-	git_reference_free(ref);
-
-	error = git_commit_lookup(&commit, repo, &sha);
-	if (error < 0)
-		return error;
-
-	git_oid_cpy(&sha, git_commit_tree_oid(commit));
-
-	target = git_oid_allocfmt(oid);
-	GITERR_CHECK_ALLOC(target);
-
-	error = note_remove(repo, author, committer, notes_ref,
-			    &sha, target, 1, &commit);
-
-	git__free(target);
-	git_commit_free(commit);
-	return error;
-}
-
-int git_note_default_ref(const char **out, git_repository *repo)
-{
-	assert(repo);
-	return note_get_default_ref(out, repo);
-}
-
-const char * git_note_message(git_note *note)
-{
-	assert(note);
-	return note->message;
-}
-
-const git_oid * git_note_oid(git_note *note)
-{
-	assert(note);
-	return &note->oid;
-}
-
-void git_note_free(git_note *note)
-{
-	if (note == NULL)
-		return;
-
-	git__free(note->message);
-	git__free(note);
-}
-
-static int process_entry_path(
-	const char* entry_path,
-	const git_oid *note_oid,
-	int (*note_cb)(git_note_data *note_data, void *payload),
-	void *payload)
-{
-	int i = 0, j = 0, error = -1, len;
-	git_buf buf = GIT_BUF_INIT;
-	git_note_data note_data;
-
-	if (git_buf_puts(&buf, entry_path) < 0)
-		goto cleanup;
-	
-	len = git_buf_len(&buf);
-
-	while (i < len) {
-		if (buf.ptr[i] == '/') {
-			i++;
-			continue;
-		}
-		
-		if (git__fromhex(buf.ptr[i]) < 0) {
-			/* This is not a note entry */
-			error = 0;
-			goto cleanup;
-		}
-
-		if (i != j)
-			buf.ptr[j] = buf.ptr[i];
-
-		i++;
-		j++;
-	}
-
-	buf.ptr[j] = '\0';
-	buf.size = j;
-
-	if (j != GIT_OID_HEXSZ) {
-		/* This is not a note entry */
-		error = 0;
-		goto cleanup;
-	}
-
-	if (git_oid_fromstr(&note_data.annotated_object_oid, buf.ptr) < 0)
-		return -1;
-
-	git_oid_cpy(&note_data.blob_oid, note_oid);
-
-	error = note_cb(&note_data, payload);
-
-cleanup:
-	git_buf_free(&buf);
-	return error;
-}
-
-int git_note_foreach(
-	git_repository *repo,
-	const char *notes_ref,
-	int (*note_cb)(git_note_data *note_data, void *payload),
-	void *payload)
-{
-	int error = -1;
-	git_oid tree_oid;
-	git_iterator *iter = NULL;
-	git_tree *tree = NULL;
-	const git_index_entry *item;
-
-	if (normalize_namespace(&notes_ref, repo) < 0)
-		return -1;
-
-	if ((error = retrieve_note_tree_oid(&tree_oid, repo, notes_ref)) < 0)
-		goto cleanup;
-
-	if (git_tree_lookup(&tree, repo, &tree_oid) < 0)
-		goto cleanup;
-
-	if (git_iterator_for_tree(&iter, repo, tree) < 0)
-		goto cleanup;
-
-	if (git_iterator_current(iter, &item) < 0)
-		goto cleanup;
-
-	while (item) {
-		if (process_entry_path(item->path, &item->oid, note_cb, payload) < 0)
-			goto cleanup;
-
-		if (git_iterator_advance(iter, &item) < 0)
-			goto cleanup;
-	}
-
-	error = 0;
-
-cleanup:
-	git_iterator_free(iter);
-	git_tree_free(tree);
-	return error;
-}