rugged 0.22.0b4 → 0.22.0b5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c23a53921543d1466bbda19c3f6008f8977d0767
-  data.tar.gz: c955ad35377960f880ec4d23ea1a484705217fa0
+  metadata.gz: 096ce237a96fe39032ff6e26839007148fb90ea8
+  data.tar.gz: 4a8b6154d4ef9c9be73f6c473d8edcd7eede1747
 SHA512:
-  metadata.gz: 33fbe1de4ca4dffebe7519d55b3214c604cf1c76537f5731d6c862cad864571f7620207eddb9b35e0a8e746254dadd389e1f0e586f1bd23b3314ed609700825f
-  data.tar.gz: d4097230c3f632ac55cdd8de180dd4f18cc96a5d0761f72cbc4a4d5868062adfe30c7eb5d9c2a81aecd9b240f113a6229f9f76f237cc29d0d1d6a9ed23e5d4ce
+  metadata.gz: 340fe46665f934cb4925d9ac63153107e322f06335753c753f09314515658ae8fd50d127084afc22904d9ee6730e9f933b27a9e8043fc8fc7df484ac722cc553
+  data.tar.gz: ce7e75586a31232cda3b5a61c7742ba9a1d5f82b6f9fad14d6da8d346f73e44505195ee8a5d50a444ec04218f25701665133fe0a31b67ec378e5ca877dc2cdbe

data/ext/rugged/rugged.c

@@ -310,12 +310,12 @@ void rugged_exception_raise(void)
 
 	error = giterr_last();
 
-	if (error && error->klass >= 0 && error->klass < RUGGED_ERROR_COUNT) {
+	if (error && error->klass > 0 && error->klass < RUGGED_ERROR_COUNT) {
 		err_klass = rb_eRuggedErrors[error->klass];
 		err_message = error->message;
 	} else {
-		err_klass = rb_eRuggedErrors[2]; /* InvalidError */
-		err_message = "Unknown Error";
+		err_klass = rb_eRuntimeError;
+		err_message = "Rugged operation failed";
 	}
 
 	err_obj = rb_exc_new2(err_klass, err_message);
@@ -409,11 +409,12 @@ void Init_rugged(void)
 
 		rb_eRuggedError = rb_define_class_under(rb_mRugged, "Error", rb_eStandardError);
 
-		rb_eRuggedErrors[0] = rb_define_class_under(rb_mRugged, RUGGED_ERROR_NAMES[0], rb_eNoMemError);
-		rb_eRuggedErrors[1] = rb_define_class_under(rb_mRugged, RUGGED_ERROR_NAMES[1], rb_eIOError);
-		rb_eRuggedErrors[2] = rb_define_class_under(rb_mRugged, RUGGED_ERROR_NAMES[2], rb_eArgError);
+		rb_eRuggedErrors[0] = Qnil; /* 0 return value -- no exception */
+		rb_eRuggedErrors[1] = rb_define_class_under(rb_mRugged, RUGGED_ERROR_NAMES[1], rb_eNoMemError);
+		rb_eRuggedErrors[2] = rb_define_class_under(rb_mRugged, RUGGED_ERROR_NAMES[2], rb_eIOError);
+		rb_eRuggedErrors[3] = rb_define_class_under(rb_mRugged, RUGGED_ERROR_NAMES[3], rb_eArgError);
 
-		for (i = 3; i < RUGGED_ERROR_COUNT; ++i) {
+		for (i = 4; i < RUGGED_ERROR_COUNT; ++i) {
 			rb_eRuggedErrors[i] = rb_define_class_under(rb_mRugged, RUGGED_ERROR_NAMES[i], rb_eRuggedError);
 		}
 	}

data/ext/rugged/rugged_note.c

@@ -171,9 +171,9 @@ static VALUE rb_git_note_create(VALUE self, VALUE rb_data)
 	error = git_note_create(
 			&note_oid,
 			repo,
+			notes_ref,
 			author,
 			committer,
-			notes_ref,
 			git_object_id(target),
 			StringValueCStr(rb_message),
 			force);

data/ext/rugged/rugged_remote.c

@@ -803,11 +803,6 @@ static VALUE rb_git_remote_push(int argc, VALUE *argv, VALUE self)
 	if ((error = git_push_finish(push)))
 		goto cleanup;
 
-	if (!git_push_unpack_ok(push)) {
-		rb_exception = rb_exc_new2(rb_eRuggedError, "the remote side did not unpack successfully");
-		goto cleanup;
-	}
-
 	if ((error = git_push_status_foreach(push, &push_status_cb, (void *)rb_result)) ||
 	    (error = git_push_update_tips(push, signature, log_message)))
 	    goto cleanup;

data/ext/rugged/rugged_tree.c

@@ -629,40 +629,42 @@ static void rb_git_treebuilder_free(git_treebuilder *bld)
 	git_treebuilder_free(bld);
 }
 
-static VALUE rb_git_treebuilder_allocate(VALUE klass)
-{
-	return Data_Wrap_Struct(klass, NULL, &rb_git_treebuilder_free, NULL);
-}
-
 /*
  *  call-seq:
- *    TreeBuilder.new([tree])
+ *    TreeBuilder.new(repository, [tree])
  *
- *  Create a new Rugged::Trebuilder instance.
+ *  Create a new Rugged::Trebuilder instance to write a tree to
+ *  the given +repository+.
  *
  *  If an optional +tree+ is given, the returned TreeBuilder will be
  *  initialized with the entry of +tree+. Otherwise, the TreeBuilder
  *  will be empty and has to be filled manually.
  */
-static VALUE rb_git_treebuilder_init(int argc, VALUE *argv, VALUE self)
+static VALUE rb_git_treebuilder_new(int argc, VALUE *argv, VALUE klass)
 {
 	git_treebuilder *builder;
+	git_repository *repo;
 	git_tree *tree = NULL;
-	VALUE rb_object;
+	VALUE rb_object, rb_builder, rb_repo;
 	int error;
 
-	if (rb_scan_args(argc, argv, "01", &rb_object) == 1) {
+	if (rb_scan_args(argc, argv, "11", &rb_repo, &rb_object) == 2) {
 		if (!rb_obj_is_kind_of(rb_object, rb_cRuggedTree))
 			rb_raise(rb_eTypeError, "A Rugged::Tree instance is required");
 
 		Data_Get_Struct(rb_object, git_tree, tree);
 	}
 
-	error = git_treebuilder_create(&builder, tree);
+	rugged_check_repo(rb_repo);
+	Data_Get_Struct(rb_repo, git_repository, repo);
+
+	error = git_treebuilder_create(&builder, repo, tree);
 	rugged_exception_check(error);
 
-	DATA_PTR(self) = builder;
-	return Qnil;
+	rb_builder = Data_Wrap_Struct(klass, NULL, &rb_git_treebuilder_free, builder);
+	rugged_set_owner(rb_builder, rb_repo);
+
+	return rb_builder;
 }
 
 /*
@@ -759,24 +761,21 @@ static VALUE rb_git_treebuilder_remove(VALUE self, VALUE path)
 
 /*
  *  call-seq:
- *    builder.write(repo) -> oid
+ *    builder.write -> oid
  *
- *  Write +builder+'s content as a tree to the given +repo+
- *  and return the +oid+ for the newly created tree.
+ *  Write +builder+'s content as a tree to the repository
+ *  that owns the builder and return the +oid+ for the
+ *  newly created tree.
  */
-static VALUE rb_git_treebuilder_write(VALUE self, VALUE rb_repo)
+static VALUE rb_git_treebuilder_write(VALUE self)
 {
 	git_treebuilder *builder;
-	git_repository *repo;
 	git_oid written_id;
 	int error;
 
-	rugged_check_repo(rb_repo);
-	Data_Get_Struct(rb_repo, git_repository, repo);
-
 	Data_Get_Struct(self, git_treebuilder, builder);
 
-	error = git_treebuilder_write(&written_id, repo, builder);
+	error = git_treebuilder_write(&written_id, builder);
 	rugged_exception_check(error);
 
 	return rugged_create_oid(&written_id);
@@ -827,13 +826,12 @@ void Init_rugged_tree(void)
 	rb_define_singleton_method(rb_cRuggedTree, "diff", rb_git_tree_diff_, -1);
 
 	rb_cRuggedTreeBuilder = rb_define_class_under(rb_cRuggedTree, "Builder", rb_cObject);
-	rb_define_alloc_func(rb_cRuggedTreeBuilder, rb_git_treebuilder_allocate);
-	rb_define_method(rb_cRuggedTreeBuilder, "initialize", rb_git_treebuilder_init, -1);
+	rb_define_singleton_method(rb_cRuggedTreeBuilder, "new", rb_git_treebuilder_new, -1);
 	rb_define_method(rb_cRuggedTreeBuilder, "clear", rb_git_treebuilder_clear, 0);
 	rb_define_method(rb_cRuggedTreeBuilder, "[]", rb_git_treebuilder_get, 1);
 	rb_define_method(rb_cRuggedTreeBuilder, "insert", rb_git_treebuilder_insert, 1);
 	rb_define_method(rb_cRuggedTreeBuilder, "<<", rb_git_treebuilder_insert, 1);
 	rb_define_method(rb_cRuggedTreeBuilder, "remove", rb_git_treebuilder_remove, 1);
-	rb_define_method(rb_cRuggedTreeBuilder, "write", rb_git_treebuilder_write, 1);
+	rb_define_method(rb_cRuggedTreeBuilder, "write", rb_git_treebuilder_write, 0);
 	rb_define_method(rb_cRuggedTreeBuilder, "reject!", rb_git_treebuilder_filter, 0);
 }

data/lib/rugged/version.rb

@@ -1,3 +1,3 @@
 module Rugged
-  Version = VERSION = '0.22.0b4'
+  Version = VERSION = '0.22.0b5'
 end

data/vendor/libgit2/include/git2/blame.h

@@ -67,7 +67,6 @@ typedef enum {
  *	- `max_line` is the last line in the file to blame.  The default is the last
  *	             line of the file.
  */
-
 typedef struct git_blame_options {
 	unsigned int version;
 

data/vendor/libgit2/include/git2/branch.h

@@ -244,7 +244,7 @@ GIT_EXTERN(int) git_branch_is_head(
 /**
  * Return the name of remote that the remote tracking branch belongs to.
  *
- * @param out Pointer to the user-allocated git_buf which will be filled iwth the name of the remote.
+ * @param out Pointer to the user-allocated git_buf which will be filled with the name of the remote.
  *
  * @param repo The repository where the branch lives.
  *

data/vendor/libgit2/include/git2/buffer.h

@@ -74,7 +74,7 @@ GIT_EXTERN(void) git_buf_free(git_buf *buffer);
 /**
  * Resize the buffer allocation to make more space.
  *
- * This will attempt to grow the buffer to accomodate the target size.
+ * This will attempt to grow the buffer to accommodate the target size.
  *
  * If the buffer refers to memory that was not allocated by libgit2 (i.e.
  * the `asize` field is zero), then `ptr` will be replaced with a newly

data/vendor/libgit2/include/git2/cherrypick.h

@@ -20,14 +20,17 @@
  */
 GIT_BEGIN_DECL
 
+/**
+ * Cherry-pick options
+ */
 typedef struct {
 	unsigned int version;
 
 	/** For merge commits, the "mainline" is treated as the parent. */
 	unsigned int mainline;
 
-	git_merge_options merge_opts;
-	git_checkout_options checkout_opts;
+	git_merge_options merge_opts; /*< Options for the merging */
+	git_checkout_options checkout_opts; /*< Options for the checkout */
 } git_cherrypick_options;
 
 #define GIT_CHERRYPICK_OPTIONS_VERSION 1

data/vendor/libgit2/include/git2/clone.h

@@ -100,7 +100,6 @@ typedef int (*git_repository_create_cb)(
  *
  *		git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
  */
-
 typedef struct git_clone_options {
 	unsigned int version;
 

data/vendor/libgit2/include/git2/common.h

@@ -123,7 +123,12 @@ typedef enum {
  */
 GIT_EXTERN(int) git_libgit2_features(void);
 
-
+/**
+ * Global library options
+ *
+ * These are used to select which global option to set or get and are
+ * used in `git_libgit2_opts()`.
+ */
 typedef enum {
 	GIT_OPT_GET_MWINDOW_SIZE,
 	GIT_OPT_SET_MWINDOW_SIZE,

data/vendor/libgit2/include/git2/config.h

@@ -55,15 +55,21 @@ typedef enum {
 	GIT_CONFIG_HIGHEST_LEVEL = -1,
 } git_config_level_t;
 
+/**
+ * An entry in a configuration file
+ */
 typedef struct {
-	const char *name;
-	const char *value;
-	git_config_level_t level;
+	const char *name; /*< Name of the entry (normalised) */
+	const char *value; /*< String value of the entry */
+	git_config_level_t level; /*< Which config file this was found in */
 } git_config_entry;
 
 typedef int  (*git_config_foreach_cb)(const git_config_entry *, void *);
 typedef struct git_config_iterator git_config_iterator;
 
+/**
+ * Config var type
+ */
 typedef enum {
 	GIT_CVAR_FALSE = 0,
 	GIT_CVAR_TRUE = 1,
@@ -71,6 +77,9 @@ typedef enum {
 	GIT_CVAR_STRING
 } git_cvar_t;
 
+/**
+ * Mapping from config variables to values.
+ */
 typedef struct {
 	git_cvar_t cvar_type;
 	const char *str_match;
@@ -270,7 +279,7 @@ GIT_EXTERN(int) git_config_get_entry(
  *
  * All config files will be looked into, in the order of their
  * defined level. A higher level means a higher priority. The
- * first occurence of the variable will be returned here.
+ * first occurrence of the variable will be returned here.
  *
  * @param out pointer to the variable where the value should be stored
  * @param cfg where to look for the variable

data/vendor/libgit2/include/git2/filter.h

@@ -35,6 +35,9 @@ typedef enum {
 	GIT_FILTER_CLEAN = GIT_FILTER_TO_ODB,
 } git_filter_mode_t;
 
+/**
+ * Filter option flags.
+ */
 typedef enum {
 	GIT_FILTER_OPT_DEFAULT = 0u,
 	GIT_FILTER_OPT_ALLOW_UNSAFE = (1u << 0),

data/vendor/libgit2/include/git2/global.h

@@ -17,9 +17,11 @@ GIT_BEGIN_DECL
  * This function must the called before any other libgit2 function in
  * order to set up global state and threading.
  *
- * This function may be called multiple times.
+ * This function may be called multiple times - it will return the number
+ * of times the initialization has been called (including this one) that have
+ * not subsequently been shutdown.
  *
- * @return 0 or an error code
+ * @return the number of initializations of the library, or an error code.
  */
 GIT_EXTERN(int) git_libgit2_init(void);
 
@@ -27,10 +29,14 @@ GIT_EXTERN(int) git_libgit2_init(void);
  * Shutdown the global state
  *
  * Clean up the global state and threading context after calling it as
- * many times as `git_libgit2_init()` was called.
+ * many times as `git_libgit2_init()` was called - it will return the
+ * number of remainining initializations that have not been shutdown
+ * (after this one).
  * 
+ * @return the number of remaining initializations of the library, or an
+ * error code.
  */
-GIT_EXTERN(void) git_libgit2_shutdown(void);
+GIT_EXTERN(int) git_libgit2_shutdown(void);
 
 /** @} */
 GIT_END_DECL

data/vendor/libgit2/include/git2/index.h

@@ -75,6 +75,9 @@ typedef struct git_index_entry {
 #define GIT_IDXENTRY_STAGEMASK (0x3000)
 #define GIT_IDXENTRY_STAGESHIFT 12
 
+/**
+ * Flags for index entries
+ */
 typedef enum {
 	GIT_IDXENTRY_EXTENDED  = (0x4000),
 	GIT_IDXENTRY_VALID     = (0x8000),

data/vendor/libgit2/include/git2/merge.h

@@ -110,20 +110,26 @@ typedef enum {
 	GIT_MERGE_FILE_FAVOR_UNION = 3,
 } git_merge_file_favor_t;
 
+/**
+ * File merging flags
+ */
 typedef enum {
-	/* Defaults */
+	/** Defaults */
 	GIT_MERGE_FILE_DEFAULT = 0,
 
-	/* Create standard conflicted merge files */
+	/** Create standard conflicted merge files */
 	GIT_MERGE_FILE_STYLE_MERGE = (1 << 0),
 
-	/* Create diff3-style files */
+	/** Create diff3-style files */
 	GIT_MERGE_FILE_STYLE_DIFF3 = (1 << 1),
 
-	/* Condense non-alphanumeric regions for simplified diff file */
+	/** Condense non-alphanumeric regions for simplified diff file */
 	GIT_MERGE_FILE_SIMPLIFY_ALNUM = (1 << 2),
 } git_merge_file_flags_t;
 
+/**
+ * Options for merging a file
+ */
 typedef struct {
 	unsigned int version;
 
@@ -168,6 +174,9 @@ GIT_EXTERN(int) git_merge_file_init_options(
 	git_merge_file_options *opts,
 	unsigned int version);
 
+/**
+ * Information about file-level merging
+ */
 typedef struct {
 	/**
 	 * True if the output was automerged, false if the output contains
@@ -191,6 +200,9 @@ typedef struct {
 	size_t len;
 } git_merge_file_result;
 
+/**
+ * Merging options
+ */
 typedef struct {
 	unsigned int version;
 	git_merge_tree_flag_t flags;
@@ -270,8 +282,11 @@ typedef enum {
 	GIT_MERGE_ANALYSIS_UNBORN = (1 << 3),
 } git_merge_analysis_t;
 
+/**
+ * The user's stated preference for merges.
+ */
 typedef enum {
-	/*
+	/**
 	 * No configuration was found that suggests a preferred behavior for
 	 * merge.
 	 */

data/vendor/libgit2/include/git2/net.h

@@ -21,12 +21,13 @@ GIT_BEGIN_DECL
 
 #define GIT_DEFAULT_PORT "9418"
 
-/*
+/**
+ * Direction of the connection.
+ *
  * We need this because we need to know whether we should call
  * git-upload-pack or git-receive-pack on the remote end when get_refs
  * gets called.
  */
-
 typedef enum {
 	GIT_DIRECTION_FETCH = 0,
 	GIT_DIRECTION_PUSH  = 1

data/vendor/libgit2/include/git2/notes.h

@@ -59,14 +59,12 @@ GIT_EXTERN(int) git_note_iterator_new(
 GIT_EXTERN(void) git_note_iterator_free(git_note_iterator *it);
 
 /**
- * Returns the current item (note_id and annotated_id) and advance the iterator
+ * Return the current item (note_id and annotated_id) and advance the iterator
  * internally to the next value
  *
- * The notes must not be freed manually by the user.
- *
- * @param it pointer to the iterator
  * @param note_id id of blob containing the message
  * @param annotated_id id of the git object being annotated
+ * @param it pointer to the iterator
  *
  * @return 0 (no error), GIT_ITEROVER (iteration is done) or an error code
  *         (negative value)
@@ -135,10 +133,10 @@ GIT_EXTERN(const git_oid *) git_note_id(const git_note *note);
  *
  * @param out pointer to store the OID (optional); NULL in case of error
  * @param repo repository where to store the note
- * @param author signature of the notes commit author
- * @param committer signature of the notes commit committer
  * @param notes_ref canonical name of the reference to use (optional);
  *					defaults to "refs/notes/commits"
+ * @param author signature of the notes commit author
+ * @param committer signature of the notes commit committer
  * @param oid OID of the git object to decorate
  * @param note Content of the note to add for object oid
  * @param force Overwrite existing note
@@ -148,9 +146,9 @@ GIT_EXTERN(const git_oid *) git_note_id(const git_note *note);
 GIT_EXTERN(int) git_note_create(
 	git_oid *out,
 	git_repository *repo,
+	const char *notes_ref,
 	const git_signature *author,
 	const git_signature *committer,
-	const char *notes_ref,
 	const git_oid *oid,
 	const char *note,
 	int force);