rugged 0.19.0 → 0.21.0

data/ext/rugged/rugged_revwalk.c

@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2013 GitHub, Inc
+ * Copyright (c) 2014 GitHub, Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -60,6 +60,74 @@ static VALUE rb_git_walker_new(VALUE klass, VALUE rb_repo)
 	return rugged_walker_new(klass, rb_repo, walk);;
 }
 
+static VALUE rb_git_walker_each_with_opts(int argc, VALUE *argv, VALUE self, int oid_only)
+{
+	git_revwalk *walk;
+	git_commit *commit;
+	git_repository *repo;
+	git_oid commit_oid;
+
+	int error, exception = 0;
+	uint64_t offset = 0, limit = UINT64_MAX;
+
+	VALUE rb_options;
+
+	rb_scan_args(argc, argv, "01", &rb_options);
+
+	if (!rb_block_given_p()) {
+		ID iter_method = ID2SYM(rb_intern(oid_only ? "each_oid" : "each"));
+		return rb_funcall(self, rb_intern("to_enum"), 2, iter_method, rb_options);
+	}
+
+	if (!NIL_P(rb_options)) {
+		VALUE rb_value = rb_hash_aref(rb_options, CSTR2SYM("offset"));
+		if (!NIL_P(rb_value)) {
+			Check_Type(rb_value, T_FIXNUM);
+			offset = FIX2ULONG(rb_value);
+		}
+
+		rb_value = rb_hash_aref(rb_options, CSTR2SYM("limit"));
+		if (!NIL_P(rb_value)) {
+			Check_Type(rb_value, T_FIXNUM);
+			limit = FIX2ULONG(rb_value);
+		}
+	}
+
+	Data_Get_Struct(self, git_revwalk, walk);
+	repo = git_revwalk_repository(walk);
+
+	while ((error = git_revwalk_next(&commit_oid, walk)) == 0) {
+		if (offset > 0) {
+			offset--;
+			continue;
+		}
+
+		if (oid_only) {
+			rb_protect(rb_yield,
+				rugged_create_oid(&commit_oid),
+				&exception);
+		} else {
+			error = git_commit_lookup(&commit, repo, &commit_oid);
+			rugged_exception_check(error);
+
+			rb_protect(rb_yield,
+				rugged_object_new(rugged_owner(self), (git_object *)commit),
+				&exception);
+		}
+
+		if (exception || --limit == 0)
+			break;
+	}
+
+	if (exception)
+		rb_jump_tag(exception);
+
+	if (error != GIT_ITEROVER)
+		rugged_exception_check(error);
+
+	return Qnil;
+}
+
 /*
  *  call-seq:
  *    walker.each { |commit| block }
@@ -85,31 +153,39 @@ static VALUE rb_git_walker_new(VALUE klass, VALUE rb_repo)
  *    cb75e05f0f8ac3407fb3bd0ebd5ff07573b16c9f
  *    ...
  */
-static VALUE rb_git_walker_each(VALUE self)
+static VALUE rb_git_walker_each(int argc, VALUE *argv, VALUE self)
 {
-	git_revwalk *walk;
-	git_commit *commit;
-	git_repository *repo;
-	git_oid commit_oid;
-	int error;
-
-	Data_Get_Struct(self, git_revwalk, walk);
-	repo = git_revwalk_repository(walk);
-
-	if (!rb_block_given_p())
-		return rb_funcall(self, rb_intern("to_enum"), 0);
-
-	while ((error = git_revwalk_next(&commit_oid, walk)) == 0) {
-		error = git_commit_lookup(&commit, repo, &commit_oid);
-		rugged_exception_check(error);
-
-		rb_yield(rugged_object_new(rugged_owner(self), (git_object *)commit));
-	}
-
-	if (error != GIT_ITEROVER)
-		rugged_exception_check(error);
+	return rb_git_walker_each_with_opts(argc, argv, self, 0);
+}
 
-	return Qnil;
+/*
+ *  call-seq:
+ *    walker.each_oid { |commit| block }
+ *    walker.each_oid -> Iterator
+ *
+ *  Perform the walk through the repository, yielding each
+ *  one of the commit oids found as a <tt>String</tt>
+ *  to +block+.
+ *
+ *  If no +block+ is given, an +Iterator+ will be returned.
+ *
+ *  The walker must have been previously set-up before a walk can be performed
+ *  (i.e. at least one commit must have been pushed).
+ *
+ *    walker.push("92b22bbcb37caf4f6f53d30292169e84f5e4283b")
+ *    walker.each { |commit_oid| puts commit_oid }
+ *
+ *  generates:
+ *
+ *    92b22bbcb37caf4f6f53d30292169e84f5e4283b
+ *    6b750d5800439b502de669465b385e5f469c78b6
+ *    ef9207141549f4ffcd3c4597e270d32e10d0a6bc
+ *    cb75e05f0f8ac3407fb3bd0ebd5ff07573b16c9f
+ *    ...
+ */
+static VALUE rb_git_walker_each_oid(int argc, VALUE *argv, VALUE self)
+{
+	return rb_git_walker_each_with_opts(argc, argv, self, 1);
 }
 
 /*
@@ -175,7 +251,7 @@ static VALUE rb_git_walker_hide(VALUE self, VALUE rb_commit)
 
 /*
  *  call-seq:
- *    walker.sorting = sort_mode
+ *    walker.sorting(sort_mode) -> nil
  *
  *  Change the sorting mode for the revision walk.
  *
@@ -189,6 +265,20 @@ static VALUE rb_git_walker_sorting(VALUE self, VALUE ruby_sort_mode)
 	return Qnil;
 }
 
+/*
+ *  call-seq:
+ *    walker.simplify_first_parent() -> nil
+ *
+ *  Simplify the walk to the first parent of each commit.
+ */
+static VALUE rb_git_walker_simplify_first_parent(VALUE self)
+{
+	git_revwalk *walk;
+	Data_Get_Struct(self, git_revwalk, walk);
+	git_revwalk_simplify_first_parent(walk);
+	return Qnil;
+}
+
 /*
  *  call-seq:
  *    walker.reset -> nil
@@ -210,9 +300,11 @@ void Init_rugged_revwalk(void)
 	rb_define_singleton_method(rb_cRuggedWalker, "new", rb_git_walker_new, 1);
 
 	rb_define_method(rb_cRuggedWalker, "push", rb_git_walker_push, 1);
-	rb_define_method(rb_cRuggedWalker, "each", rb_git_walker_each, 0);
-	rb_define_method(rb_cRuggedWalker, "walk", rb_git_walker_each, 0);
+	rb_define_method(rb_cRuggedWalker, "each", rb_git_walker_each, -1);
+	rb_define_method(rb_cRuggedWalker, "each_oid", rb_git_walker_each_oid, -1);
+	rb_define_method(rb_cRuggedWalker, "walk", rb_git_walker_each, -1);
 	rb_define_method(rb_cRuggedWalker, "hide", rb_git_walker_hide, 1);
 	rb_define_method(rb_cRuggedWalker, "reset", rb_git_walker_reset, 0);
 	rb_define_method(rb_cRuggedWalker, "sorting", rb_git_walker_sorting, 1);
+	rb_define_method(rb_cRuggedWalker, "simplify_first_parent", rb_git_walker_simplify_first_parent, 0);
 }

data/ext/rugged/rugged_settings.c

@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2013 GitHub, Inc
+ * Copyright (c) 2014 GitHub, Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -36,6 +36,29 @@
 
 extern VALUE rb_mRugged;
 
+static void set_search_path(int level, VALUE value)
+{
+	const char *path;
+
+	Check_Type(value, T_STRING);
+	path = StringValueCStr(value);
+
+	rugged_exception_check(git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, level, path));
+}
+
+static VALUE get_search_path(int level)
+{
+	git_buf buf = {NULL};
+	VALUE ret;
+
+	rugged_exception_check(git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH, level, &buf));
+
+	ret = rb_str_new_utf8(buf.ptr);
+	git_buf_free(&buf);
+
+	return ret;
+}
+
 /*
  *  call-seq:
  *    Settings[option] = value
@@ -63,6 +86,18 @@ static VALUE rb_git_set_option(VALUE self, VALUE option, VALUE value)
 		git_libgit2_opts(GIT_OPT_SET_MWINDOW_MAPPED_LIMIT, val);
 	}
 
+	else if (strcmp(opt, "search_path_global") == 0) {
+		set_search_path(GIT_CONFIG_LEVEL_GLOBAL, value);
+	}
+
+	else if (strcmp(opt, "search_path_xdg") == 0) {
+		set_search_path(GIT_CONFIG_LEVEL_XDG, value);
+	}
+
+	else if (strcmp(opt, "search_path_system") == 0) {
+		set_search_path(GIT_CONFIG_LEVEL_SYSTEM, value);
+	}
+
 	else {
 		rb_raise(rb_eArgError, "Unknown option specified");
 	}
@@ -95,6 +130,18 @@ static VALUE rb_git_get_option(VALUE self, VALUE option)
 		return SIZET2NUM(val);
 	}
 	
+	else if (strcmp(opt, "search_path_global") == 0) {
+		return get_search_path(GIT_CONFIG_LEVEL_GLOBAL);
+	}
+
+	else if (strcmp(opt, "search_path_xdg") == 0) {
+		return get_search_path(GIT_CONFIG_LEVEL_XDG);
+	}
+
+	else if (strcmp(opt, "search_path_system") == 0) {
+		return get_search_path(GIT_CONFIG_LEVEL_SYSTEM);
+	}
+
 	else {
 		rb_raise(rb_eArgError, "Unknown option specified");
 	}

data/ext/rugged/rugged_signature.c

@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2013 GitHub, Inc
+ * Copyright (c) 2014 GitHub, Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -52,12 +52,19 @@ VALUE rugged_signature_new(const git_signature *sig, const char *encoding_name)
 	return rb_sig;
 }
 
-git_signature *rugged_signature_get(VALUE rb_sig)
+git_signature *rugged_signature_get(VALUE rb_sig, git_repository *repo)
 {
 	int error;
 	VALUE rb_time, rb_unix_t, rb_offset, rb_name, rb_email, rb_time_offset;
 	git_signature *sig;
 
+	if (NIL_P(rb_sig)) {
+		rugged_exception_check(
+			git_signature_default(&sig, repo)
+		);
+		return sig;
+	}
+
 	Check_Type(rb_sig, T_HASH);
 
 	rb_name = rb_hash_aref(rb_sig, CSTR2SYM("name"));
@@ -67,26 +74,33 @@ git_signature *rugged_signature_get(VALUE rb_sig)
 
 	Check_Type(rb_name, T_STRING);
 	Check_Type(rb_email, T_STRING);
-	if (!rb_obj_is_kind_of(rb_time, rb_cTime))
-		rb_raise(rb_eTypeError, "expected Time object");
 
-	rb_unix_t = rb_funcall(rb_time, rb_intern("tv_sec"), 0);
 
-	if (NIL_P(rb_time_offset)) {
-		rb_offset = rb_funcall(rb_time, rb_intern("utc_offset"), 0);
+	if (NIL_P(rb_time)) {
+		error = git_signature_now(&sig,
+				StringValueCStr(rb_name),
+				StringValueCStr(rb_email));
 	} else {
-		Check_Type(rb_time_offset, T_FIXNUM);
-		rb_offset = rb_time_offset;
+		if (!rb_obj_is_kind_of(rb_time, rb_cTime))
+			rb_raise(rb_eTypeError, "expected Time object");
+
+		rb_unix_t = rb_funcall(rb_time, rb_intern("tv_sec"), 0);
+
+		if (NIL_P(rb_time_offset)) {
+			rb_offset = rb_funcall(rb_time, rb_intern("utc_offset"), 0);
+		} else {
+			Check_Type(rb_time_offset, T_FIXNUM);
+			rb_offset = rb_time_offset;
+		}
+
+		error = git_signature_new(&sig,
+				StringValueCStr(rb_name),
+				StringValueCStr(rb_email),
+				NUM2LONG(rb_unix_t),
+				FIX2INT(rb_offset) / 60);
 	}
 
-	error = git_signature_new(&sig,
-		StringValueCStr(rb_name),
-		StringValueCStr(rb_email),
-		NUM2LONG(rb_unix_t),
-		FIX2INT(rb_offset) / 60);
-
 	rugged_exception_check(error);
 
 	return sig;
 }
-