rugged 0.22.2 → 0.23.0b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abca236e3268bc314b36598c2745031738e9711b
-  data.tar.gz: dd4156ca02aff6e7cec599fd53f99d945080e7cc
+  metadata.gz: a3ccaada5f69a36af35645687caa0f1a638a4b0b
+  data.tar.gz: c4bce14c10e3fe2a221414f741b165c7e66d7172
 SHA512:
-  metadata.gz: 6d673c0721ec99e5589219ce2c6a21791d6ae37536888c36c17ff888dc6760d08f5d7f0c6d8fc91a1558ebecb1ba33fdb63c6e67ce744bdb63d5c3b3a3da1a8f
-  data.tar.gz: ca34fafae0486a29f7a015f12fc7f0a51fca43ad3251231d9f109966c327601f5736a4d2f9c0db2891ad86ceb6d985f17ab524afb75f6b093c7af82084d07bcc
+  metadata.gz: 6fa91bf79f6400ec811298aab161e8204606e203dd9aa90e7f723a02d0ee84cd15dbb9b337a8d4f2ad0d8e635403a372cb81540ee4335163d9867a92de81c50d
+  data.tar.gz: db2139a478a8c3d357fabd5ff73a8206628b21feb6e8fef06124346da4b3b796cf38320ec50b18f0e8d5dae69aa05b1ea7ead18cb902803ca407f05c749a9fac

data/ext/rugged/rugged.c

@@ -175,7 +175,7 @@ static VALUE rb_git_prettify_message(int argc, VALUE *argv, VALUE self)
 	rb_scan_args(argc, argv, "11", &rb_message, &rb_strip);
 
 	Check_Type(rb_message, T_STRING);
-	
+
 	switch (TYPE(rb_strip)) {
 	case T_FALSE:
 		strip_comments = 0;
@@ -495,4 +495,3 @@ void Init_rugged(void)
 	rb_mShutdownHook = Data_Wrap_Struct(rb_cObject, NULL, &cleanup_cb, NULL);
 	rb_global_variable(&rb_mShutdownHook);
 }
-

data/ext/rugged/rugged_branch_collection.c

@@ -51,7 +51,7 @@ static inline int rugged_branch_lookup(git_reference **branch, git_repository *r
 
 		if (strncmp(branch_name, "refs/heads/", strlen("refs/heads/")) == 0 ||
 		    strncmp(branch_name, "refs/remotes/", strlen("refs/remotes/")) == 0)
-			return git_reference_lookup(branch, repo, branch_name);			
+			return git_reference_lookup(branch, repo, branch_name);
 
 		if ((error = git_branch_lookup(branch, repo, branch_name, GIT_BRANCH_LOCAL)) == GIT_OK ||
 		    error != GIT_ENOTFOUND)
@@ -70,7 +70,7 @@ static inline int rugged_branch_lookup(git_reference **branch, git_repository *r
 
 		return error;
 	} else {
-		rb_raise(rb_eTypeError, "Expecting a String or Rugged::Branch instance");		
+		rb_raise(rb_eTypeError, "Expecting a String or Rugged::Branch instance");
 	}
 }
 
@@ -120,12 +120,6 @@ static git_branch_t parse_branch_type(VALUE rb_filter)
  *    Overwrites the branch with the given +name+, if it already exists,
  *    instead of raising an exception.
  *
- *  :message ::
- *    A single line log message to be appended to the reflog.
- *
- *  :signature ::
- *    The signature to be used for populating the reflog entry.
- *
  *  If a branch with the given +name+ already exists and +:force+ is not +true+,
  *  an exception will be raised.
  *
@@ -137,8 +131,6 @@ static VALUE rb_git_branch_collection_create(int argc, VALUE *argv, VALUE self)
 	git_repository *repo;
 	git_reference *branch;
 	git_commit *target;
-	git_signature *signature = NULL;
-	char *log_message = NULL;
 	int error, force = 0;
 
 	rb_scan_args(argc, argv, "20:", &rb_name, &rb_target, &rb_options);
@@ -150,25 +142,14 @@ static VALUE rb_git_branch_collection_create(int argc, VALUE *argv, VALUE self)
 	Check_Type(rb_target, T_STRING);
 
 	if (!NIL_P(rb_options)) {
-		VALUE rb_val;
-
 		force = RTEST(rb_hash_aref(rb_options, CSTR2SYM("force")));
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("signature"));
-		if (!NIL_P(rb_val))
-			signature = rugged_signature_get(rb_val, repo);
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
-		if (!NIL_P(rb_val))
-			log_message = StringValueCStr(rb_val);
 	}
 
 	target = (git_commit *)rugged_object_get(repo, rb_target, GIT_OBJ_COMMIT);
 
-	error = git_branch_create(&branch, repo, StringValueCStr(rb_name), target, force, signature, log_message);
+	error = git_branch_create(&branch, repo, StringValueCStr(rb_name), target, force);
 
 	git_commit_free(target);
-	git_signature_free(signature);
 
 	rugged_exception_check(error);
 
@@ -300,7 +281,7 @@ static VALUE rb_git_branch_collection_each_name(int argc, VALUE *argv, VALUE sel
  *
  *  Delete the specified branch.
  *
- *  If a Rugged::Branch object was passed, the object will become 
+ *  If a Rugged::Branch object was passed, the object will become
  *  invalidated and won't be able to be used for any other operations.
  */
 static VALUE rb_git_branch_collection_delete(VALUE self, VALUE rb_name_or_branch)
@@ -342,12 +323,6 @@ static VALUE rb_git_branch_collection_delete(VALUE self, VALUE rb_name_or_branch
  *    Overwrites the branch with the given +name+, if it already exists,
  *    instead of raising an exception.
  *
- *  :message ::
- *    A single line log message to be appended to the reflog.
- *
- *  :signature ::
- *    The signature to be used for populating the reflog entry.
- *
  *  If a branch with the given +new_name+ already exists and +:force+ is not +true+,
  *  an exception will be raised.
  *
@@ -359,8 +334,6 @@ static VALUE rb_git_branch_collection_move(int argc, VALUE *argv, VALUE self)
 	VALUE rb_repo = rugged_owner(self), rb_name_or_branch, rb_new_branch_name, rb_options;
 	git_reference *old_branch = NULL, *new_branch = NULL;
 	git_repository *repo;
-	git_signature *signature = NULL;
-	char *log_message = NULL;
 	int error, force = 0;
 
 	rb_scan_args(argc, argv, "20:", &rb_name_or_branch, &rb_new_branch_name, &rb_options);
@@ -368,27 +341,16 @@ static VALUE rb_git_branch_collection_move(int argc, VALUE *argv, VALUE self)
 
 	rugged_check_repo(rb_repo);
 	Data_Get_Struct(rb_repo, git_repository, repo);
-	
+
 	error = rugged_branch_lookup(&old_branch, repo, rb_name_or_branch);
 	rugged_exception_check(error);
 
 	if (!NIL_P(rb_options)) {
-		VALUE rb_val;
-
 		force = RTEST(rb_hash_aref(rb_options, CSTR2SYM("force")));
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("signature"));
-		if (!NIL_P(rb_val))
-			signature = rugged_signature_get(rb_val, repo);
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
-		if (!NIL_P(rb_val))
-			log_message = StringValueCStr(rb_val);
 	}
 
-	error = git_branch_move(&new_branch, old_branch, StringValueCStr(rb_new_branch_name), force, signature, log_message);
+	error = git_branch_move(&new_branch, old_branch, StringValueCStr(rb_new_branch_name), force);
 
-	git_signature_free(signature);
 	git_reference_free(old_branch);
 
 	rugged_exception_check(error);

data/ext/rugged/rugged_config.c

@@ -87,18 +87,22 @@ static VALUE rb_git_config_new(VALUE klass, VALUE rb_path)
 static VALUE rb_git_config_get(VALUE self, VALUE rb_key)
 {
 	git_config *config;
-	const char *value;
+	git_buf buf = { NULL };
 	int error;
+	VALUE rb_result;
 
 	Data_Get_Struct(self, git_config, config);
 	Check_Type(rb_key, T_STRING);
 
-	error = git_config_get_string(&value, config, StringValueCStr(rb_key));
+	error = git_config_get_string_buf(&buf, config, StringValueCStr(rb_key));
 	if (error == GIT_ENOTFOUND)
 		return Qnil;
 
 	rugged_exception_check(error);
-	return rb_str_new_utf8(value);
+	rb_result = rb_str_new_utf8(buf.ptr);
+	git_buf_free(&buf);
+
+	return rb_result;
 }
 
 /*

data/ext/rugged/rugged_diff_delta.c

@@ -74,7 +74,7 @@ static VALUE rb_git_delta_status_fromC(git_delta_t status)
 static VALUE rb_git_delta_status_char_fromC(git_delta_t status)
 {
 	char status_char[2];
-	
+
 	status_char[0] = git_diff_status_char(status);
 	status_char[1] = '\0';
 

data/ext/rugged/rugged_diff_line.c

@@ -58,7 +58,7 @@ VALUE rugged_diff_line_new(const git_diff_line *line)
 			break;
 		case GIT_DIFF_LINE_BINARY:
 			rb_line_origin = CSTR2SYM("binary");
-			break;			
+			break;
 		default:
 			/* FIXME: raise here instead? */
 			rb_line_origin = CSTR2SYM("unknown");

data/ext/rugged/rugged_object.c

@@ -285,7 +285,7 @@ VALUE rugged_object_rev_parse(VALUE rb_repo, VALUE rb_spec, int as_obj)
  *  Find and return a single object inside +repo+ as specified by the
  *  git revision string +str+.
  *
- *  See http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions or 
+ *  See http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions or
  *  <code>man gitrevisions</code> for information on the accepted syntax.
  *
  *  Raises a Rugged::InvalidError if +str+ does not contain a valid revision string.
@@ -301,7 +301,7 @@ VALUE rb_git_object_rev_parse(VALUE klass, VALUE rb_repo, VALUE rb_spec)
  *  Find and return the id of the object inside +repo+ as specified by the
  *  git revision string +str+.
  *
- *  See http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions or 
+ *  See http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions or
  *  <code>man gitrevisions</code> for information on the accepted syntax.
  *
  *  Raises a Rugged::InvalidError if +str+ does not contain a valid revision string.

data/ext/rugged/rugged_reference_collection.c

@@ -58,18 +58,8 @@ static VALUE rb_git_reference_collection_initialize(VALUE self, VALUE repo)
  *    Overwrites the reference with the given +name+, if it already exists,
  *    instead of raising an exception.
  *
- *  :message ::
- *    A single line log message to be appended to the reflog.
- *
- *  :signature ::
- *    The signature to be used for populating the reflog entry.
- *
  *  If a reference with the given +name+ already exists and +:force+ is not +true+,
  *  an exception will be raised.
- *
- *  The +:message+ and +:signature+ options are ignored if the reference does not
- *  belong to the standard set (+HEAD+, +refs/heads/*+, +refs/remotes/*+ or +refs/notes/*+)
- *  and it does not have a reflog.
  */
 static VALUE rb_git_reference_collection_create(int argc, VALUE *argv, VALUE self)
 {
@@ -77,7 +67,6 @@ static VALUE rb_git_reference_collection_create(int argc, VALUE *argv, VALUE sel
 	git_repository *repo;
 	git_reference *ref;
 	git_oid oid;
-	git_signature *signature = NULL;
 	char *log_message = NULL;
 	int error, force = 0;
 
@@ -89,28 +78,21 @@ static VALUE rb_git_reference_collection_create(int argc, VALUE *argv, VALUE sel
 	Check_Type(rb_target, T_STRING);
 
 	if (!NIL_P(rb_options)) {
-		VALUE rb_val;
-
-		force = RTEST(rb_hash_aref(rb_options, CSTR2SYM("force")));
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("signature"));
-		if (!NIL_P(rb_val))
-			signature = rugged_signature_get(rb_val, repo);
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
+		VALUE rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
 		if (!NIL_P(rb_val))
 			log_message = StringValueCStr(rb_val);
+
+		force = RTEST(rb_hash_aref(rb_options, CSTR2SYM("force")));
 	}
 
 	if (git_oid_fromstr(&oid, StringValueCStr(rb_target)) == GIT_OK) {
 		error = git_reference_create(
-			&ref, repo, StringValueCStr(rb_name), &oid, force, signature, log_message);
+			&ref, repo, StringValueCStr(rb_name), &oid, force, log_message);
 	} else {
 		error = git_reference_symbolic_create(
-			&ref, repo, StringValueCStr(rb_name), StringValueCStr(rb_target), force, signature, log_message);
+			&ref, repo, StringValueCStr(rb_name), StringValueCStr(rb_target), force, log_message);
 	}
 
-	git_signature_free(signature);
 	rugged_exception_check(error);
 
 	return rugged_ref_new(rb_cRuggedReference, rb_repo, ref);
@@ -284,18 +266,8 @@ static VALUE rb_git_reference_collection_exist_p(VALUE self, VALUE rb_name_or_re
  *    Overwrites the reference with the given +name+, if it already exists,
  *    instead of raising an exception.
  *
- *  :message ::
- *    A single line log message to be appended to the reflog.
- *
- *  :signature ::
- *    The signature to be used for populating the reflog entry.
- *
  *  If a reference with the given +new_name+ already exists and +:force+ is not +true+,
  *  an exception will be raised.
- *
- *  The +:message+ and +:signature+ options are ignored if the reference does not
- *  belong to the standard set (+HEAD+, +refs/heads/*+, +refs/remotes/*+ or +refs/notes/*+)
- *  and it does not have a reflog.
  */
 static VALUE rb_git_reference_collection_rename(int argc, VALUE *argv, VALUE self)
 {
@@ -303,7 +275,6 @@ static VALUE rb_git_reference_collection_rename(int argc, VALUE *argv, VALUE sel
 	VALUE rb_repo = rugged_owner(self);
 	git_reference *ref, *out = NULL;
 	git_repository *repo;
-	git_signature *signature = NULL;
 	char *log_message = NULL;
 	int error, force = 0;
 
@@ -320,24 +291,17 @@ static VALUE rb_git_reference_collection_rename(int argc, VALUE *argv, VALUE sel
 	Data_Get_Struct(rb_repo, git_repository, repo);
 
 	if (!NIL_P(rb_options)) {
-		VALUE rb_val;
-
-		force = RTEST(rb_hash_aref(rb_options, CSTR2SYM("force")));
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("signature"));
-		if (!NIL_P(rb_val))
-			signature = rugged_signature_get(rb_val, repo);
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
+		VALUE rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
 		if (!NIL_P(rb_val))
 			log_message = StringValueCStr(rb_val);
+
+		force = RTEST(rb_hash_aref(rb_options, CSTR2SYM("force")));
 	}
 
 	if ((error = git_reference_lookup(&ref, repo, StringValueCStr(rb_name_or_ref))) == GIT_OK)
-		error = git_reference_rename(&out, ref, StringValueCStr(rb_new_name), force, signature, log_message);
+		error = git_reference_rename(&out, ref, StringValueCStr(rb_new_name), force, log_message);
 
 	git_reference_free(ref);
-	git_signature_free(signature);
 
 	rugged_exception_check(error);
 
@@ -371,7 +335,6 @@ static VALUE rb_git_reference_collection_update(int argc, VALUE *argv, VALUE sel
 {
 	VALUE rb_repo = rugged_owner(self), rb_name_or_ref, rb_target, rb_options;
 	git_repository *repo = NULL;
-	git_signature *signature = NULL;
 	git_reference *ref = NULL, *out = NULL;
 	char *log_message = NULL;
 	int error;
@@ -391,13 +354,7 @@ static VALUE rb_git_reference_collection_update(int argc, VALUE *argv, VALUE sel
 		rb_raise(rb_eTypeError, "Expecting a String or Rugged::Reference instance");
 
 	if (!NIL_P(rb_options)) {
-		VALUE rb_val;
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("signature"));
-		if (!NIL_P(rb_val))
-			signature = rugged_signature_get(rb_val, repo);
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
+		VALUE rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
 		if (!NIL_P(rb_val))
 			log_message = StringValueCStr(rb_val);
 	}
@@ -414,15 +371,14 @@ static VALUE rb_git_reference_collection_update(int argc, VALUE *argv, VALUE sel
 		error = git_oid_fromstr(&target, StringValueCStr(rb_target));
 		if (error) goto cleanup;
 
-		error = git_reference_set_target(&out, ref, &target, signature, log_message);
+		error = git_reference_set_target(&out, ref, &target, log_message);
 	} else {
-		error = git_reference_symbolic_set_target(&out, ref, StringValueCStr(rb_target), signature, log_message);
+		error = git_reference_symbolic_set_target(&out, ref, StringValueCStr(rb_target), log_message);
 	}
 
 cleanup:
 
 	git_reference_free(ref);
-	git_signature_free(signature);
 	rugged_exception_check(error);
 
 	return rugged_ref_new(rb_cRuggedReference, rb_repo, out);

data/ext/rugged/rugged_remote.c

@@ -608,9 +608,6 @@ cleanup:
  *  :message ::
  *    The message to insert into the reflogs. Defaults to "fetch".
  *
- *  :signature ::
- *    The signature to be used for updating the reflogs.
- *
  *  Example:
  *
  *    remote = Rugged::Remote.lookup(@repo, 'origin')
@@ -624,7 +621,6 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
 {
 	git_remote *remote;
 	git_repository *repo;
-	git_signature *signature = NULL;
 	git_strarray refspecs;
 	git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
 	struct rugged_remote_cb_payload payload = { Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, 0 };
@@ -645,11 +641,7 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &callbacks, &payload);
 
 	if (!NIL_P(rb_options)) {
-		VALUE rb_val = rb_hash_aref(rb_options, CSTR2SYM("signature"));
-		if (!NIL_P(rb_val))
-			signature = rugged_signature_get(rb_val, repo);
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
+		VALUE rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
 		if (!NIL_P(rb_val))
 			log_message = StringValueCStr(rb_val);
 	}
@@ -657,7 +649,7 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
 	if ((error = git_remote_set_callbacks(remote, &callbacks)))
 		goto cleanup;
 
-	if ((error = git_remote_fetch(remote, &refspecs, signature, log_message)) == GIT_OK) {
+	if ((error = git_remote_fetch(remote, &refspecs, log_message)) == GIT_OK) {
 		const git_transfer_progress *stats = git_remote_stats(remote);
 
 		rb_result = rb_hash_new();
@@ -673,7 +665,6 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
 	cleanup:
 
 	xfree(refspecs.strings);
-	git_signature_free(signature);
 
 	if (payload.exception)
 		rb_jump_tag(payload.exception);
@@ -705,13 +696,6 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
  *    A callback that will be executed each time a reference is updated remotely. It will be
  *    passed the +refname+, +old_oid+ and +new_oid+.
  *
- *  :message ::
- *    A single line log message to be appended to the reflog of each local remote-tracking
- *    branch that gets updated. Defaults to: "fetch".
- *
- *  :signature ::
- *    The signature to be used for populating the reflog entries.
- *
  *  Example:
  *
  *    remote = Rugged::Remote.lookup(@repo, 'origin')
@@ -719,18 +703,16 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
  */
 static VALUE rb_git_remote_push(int argc, VALUE *argv, VALUE self)
 {
-	VALUE rb_refspecs, rb_options, rb_val;
+	VALUE rb_refspecs, rb_options;
 	VALUE rb_repo = rugged_owner(self);
 
 	git_repository *repo;
 	git_remote *remote;
 	git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
-	git_signature *signature = NULL;
 	git_strarray refspecs;
 	git_push_options opts = GIT_PUSH_OPTIONS_INIT;
 
 	int error = 0;
-	char *log_message = NULL;
 
 	struct rugged_remote_cb_payload payload = { Qnil, Qnil, Qnil, Qnil, Qnil, rb_hash_new(), 0 };
 
@@ -744,24 +726,13 @@ static VALUE rb_git_remote_push(int argc, VALUE *argv, VALUE self)
 
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &callbacks, &payload);
 
-	if (!NIL_P(rb_options)) {
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
-		if (!NIL_P(rb_val))
-			log_message = StringValueCStr(rb_val);
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("signature"));
-		if (!NIL_P(rb_val))
-			signature = rugged_signature_get(rb_val, repo);
-	}
-
 	if ((error = git_remote_set_callbacks(remote, &callbacks)))
 	    goto cleanup;
 
-	error = git_remote_push(remote, &refspecs, &opts, signature, log_message);
+	error = git_remote_push(remote, &refspecs, &opts);
 
 cleanup:
 	xfree(refspecs.strings);
-	git_signature_free(signature);
 
 	if (payload.exception)
 		rb_jump_tag(payload.exception);