rugged 0.18.0.gh.de28323 → 0.19.0

data/ext/rugged/rugged_diff_delta.c

@@ -0,0 +1,94 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2012 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "rugged.h"
+
+extern VALUE rb_cRuggedDiff;
+VALUE rb_cRuggedDiffDelta;
+
+static VALUE rb_git_delta_file_fromC(const git_diff_file *file)
+{
+	VALUE rb_file;
+
+	if (!file)
+		return Qnil;
+
+	rb_file = rb_hash_new();
+
+	rb_hash_aset(rb_file, CSTR2SYM("oid"), rugged_create_oid(&file->oid));
+	rb_hash_aset(rb_file, CSTR2SYM("path"), file->path ? rb_str_new2(file->path) : Qnil);
+	rb_hash_aset(rb_file, CSTR2SYM("size"), INT2FIX(file->size));
+	rb_hash_aset(rb_file, CSTR2SYM("flags"), UINT2NUM(file->flags));
+	rb_hash_aset(rb_file, CSTR2SYM("mode"), UINT2NUM(file->mode));
+
+	return rb_file;
+}
+
+static VALUE rb_git_delta_status_fromC(git_delta_t status)
+{
+	switch(status) {
+		case GIT_DELTA_UNMODIFIED:
+			return CSTR2SYM("unmodified");
+		case GIT_DELTA_ADDED:
+			return CSTR2SYM("added");
+		case GIT_DELTA_DELETED:
+			return CSTR2SYM("deleted");
+		case GIT_DELTA_MODIFIED:
+			return CSTR2SYM("modified");
+		case GIT_DELTA_RENAMED:
+			return CSTR2SYM("renamed");
+		case GIT_DELTA_COPIED:
+			return CSTR2SYM("copied");
+		case GIT_DELTA_IGNORED:
+			return CSTR2SYM("ignored");
+		case GIT_DELTA_UNTRACKED:
+			return CSTR2SYM("untracked");
+		case GIT_DELTA_TYPECHANGE:
+			return CSTR2SYM("typechange");
+		default:
+			return CSTR2SYM("unknown");
+	}
+}
+
+VALUE rugged_diff_delta_new(VALUE owner, const git_diff_delta *delta)
+{
+	VALUE rb_delta = rb_class_new_instance(0, NULL, rb_cRuggedDiffDelta);
+
+	rugged_set_owner(rb_delta, owner);
+	rb_iv_set(rb_delta, "@old_file", rb_git_delta_file_fromC(&delta->old_file));
+	rb_iv_set(rb_delta, "@new_file", rb_git_delta_file_fromC(&delta->new_file));
+	rb_iv_set(rb_delta, "@similarity", INT2FIX(delta->similarity));
+	rb_iv_set(rb_delta, "@status", rb_git_delta_status_fromC(delta->status));
+	rb_iv_set(rb_delta, "@binary",
+		(!(delta->flags & GIT_DIFF_FLAG_NOT_BINARY) &&
+		 (delta->flags & GIT_DIFF_FLAG_BINARY)) ? Qtrue : Qfalse
+	);
+
+	return rb_delta;
+}
+
+void Init_rugged_diff_delta(void)
+{
+	rb_cRuggedDiffDelta = rb_define_class_under(rb_cRuggedDiff, "Delta", rb_cObject);
+}

data/ext/rugged/rugged_diff_hunk.c

@@ -0,0 +1,100 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2012 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "rugged.h"
+
+extern VALUE rb_cRuggedDiff;
+VALUE rb_cRuggedDiffHunk;
+
+VALUE rugged_diff_hunk_new(
+	VALUE owner, int hunk_idx,
+	const git_diff_range *range,
+	const char *header,
+	size_t header_len,
+	size_t lines_in_hunk)
+{
+	VALUE rb_hunk;
+	VALUE rb_range;
+
+	rb_hunk = rb_class_new_instance(0, NULL, rb_cRuggedDiffHunk);
+	rugged_set_owner(rb_hunk, owner);
+
+	rb_range = rb_hash_new();
+	rb_hash_aset(rb_range, CSTR2SYM("old_start"), INT2FIX(range->old_start));
+	rb_hash_aset(rb_range, CSTR2SYM("old_lines"), INT2FIX(range->old_lines));
+	rb_hash_aset(rb_range, CSTR2SYM("new_start"), INT2FIX(range->new_start));
+	rb_hash_aset(rb_range, CSTR2SYM("new_lines"), INT2FIX(range->new_lines));
+	rb_iv_set(rb_hunk, "@range", rb_range);
+
+	rb_iv_set(rb_hunk, "@header", rb_str_new(header, header_len));
+	rb_iv_set(rb_hunk, "@line_count", INT2FIX(lines_in_hunk));
+	rb_iv_set(rb_hunk, "@hunk_index", INT2FIX(hunk_idx));
+
+	return rb_hunk;
+}
+
+/*
+ *  call-seq:
+ *    hunk.each_line { |line| } -> self
+ *    hunk.each_line -> Enumerator
+ *
+ *  If given a block, yields each line that is part of the current hunk.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ */
+static VALUE rb_git_diff_hunk_each_line(VALUE self)
+{
+	git_diff_patch *patch;
+	char line_origin;
+	const char *content;
+	size_t content_len = 0;
+	int error = 0, l, old_lineno, new_lineno, lines_count, hunk_idx;
+
+	if (!rb_block_given_p()) {
+		return rb_funcall(self, rb_intern("to_enum"), 1, CSTR2SYM("each_line"), self);
+	}
+
+	Data_Get_Struct(rugged_owner(self), git_diff_patch, patch);
+
+	lines_count = FIX2INT(rb_iv_get(self, "@line_count"));
+	hunk_idx = FIX2INT(rb_iv_get(self, "@hunk_index"));
+
+	for (l = 0; l < lines_count; ++l) {
+		error = git_diff_patch_get_line_in_hunk(
+			&line_origin, &content, &content_len, &old_lineno, &new_lineno, patch, hunk_idx, l);
+		if (error) break;
+
+		rb_yield(rugged_diff_line_new(self, line_origin, content, content_len, old_lineno, new_lineno));
+	}
+	rugged_exception_check(error);
+
+	return self;
+}
+
+void Init_rugged_diff_hunk(void)
+{
+	rb_cRuggedDiffHunk = rb_define_class_under(rb_cRuggedDiff, "Hunk", rb_cObject);
+
+	rb_define_method(rb_cRuggedDiffHunk, "each_line", rb_git_diff_hunk_each_line, 0);
+}

data/ext/rugged/rugged_diff_line.c

@@ -0,0 +1,79 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2012 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "rugged.h"
+
+extern VALUE rb_cRuggedDiff;
+VALUE rb_cRuggedDiffLine;
+
+VALUE rugged_diff_line_new(
+	VALUE owner,
+	const char line_origin,
+	const char *content,
+	size_t content_len,
+	int old_lineno,
+	int new_lineno)
+{
+	VALUE rb_line;
+	VALUE rb_line_origin;
+
+	rb_line = rb_class_new_instance(0, NULL, rb_cRuggedDiffLine);
+	rugged_set_owner(rb_line, owner);
+
+	switch(line_origin) {
+		case GIT_DIFF_LINE_CONTEXT:
+			rb_line_origin = CSTR2SYM("context");
+			break;
+		case GIT_DIFF_LINE_ADDITION:
+			rb_line_origin = CSTR2SYM("addition");
+			break;
+		case GIT_DIFF_LINE_DELETION:
+			rb_line_origin = CSTR2SYM("deletion");
+			break;
+		case GIT_DIFF_LINE_CONTEXT_EOFNL: /* neither file has newline at the end */
+			rb_line_origin = CSTR2SYM("eof_no_newline");
+			break;
+		case GIT_DIFF_LINE_ADD_EOFNL: /* added at end of old file */
+			rb_line_origin = CSTR2SYM("eof_newline_added");
+			break;
+		case GIT_DIFF_LINE_DEL_EOFNL: /* removed at end of old file */
+			rb_line_origin = CSTR2SYM("eof_newline_removed");
+			break;
+		default:
+			/* FIXME: raise here instead? */
+			rb_line_origin = CSTR2SYM("unknown");
+	}
+
+	rb_iv_set(rb_line, "@line_origin", rb_line_origin);
+	rb_iv_set(rb_line, "@content", rb_str_new(content, content_len));
+	rb_iv_set(rb_line, "@old_lineno", INT2FIX(old_lineno));
+	rb_iv_set(rb_line, "@new_lineno", INT2FIX(new_lineno));
+
+	return rb_line;
+}
+
+void Init_rugged_diff_line(void)
+{
+	rb_cRuggedDiffLine = rb_define_class_under(rb_cRuggedDiff, "Line", rb_cObject);
+}

data/ext/rugged/rugged_diff_patch.c

@@ -0,0 +1,169 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2012 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "rugged.h"
+
+extern VALUE rb_cRuggedDiff;
+extern VALUE rb_cRuggedDiffDelta;
+VALUE rb_cRuggedDiffPatch;
+
+static void rb_git_diff_patch__free(git_diff_patch *patch)
+{
+	git_diff_patch_free(patch);
+}
+
+VALUE rugged_diff_patch_new(VALUE owner, git_diff_patch *patch)
+{
+	VALUE rb_patch = Data_Wrap_Struct(rb_cRuggedDiffPatch, NULL, rb_git_diff_patch__free, patch);
+	rugged_set_owner(rb_patch, owner);
+	return rb_patch;
+}
+
+/*
+ *  call-seq:
+ *    patch.each_hunk { |hunk| } -> self
+ *    patch.each_hunk -> enumerator
+ *
+ *  If given a block, yields each hunk that is part of the patch.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ */
+static VALUE rb_git_diff_patch_each_hunk(VALUE self)
+{
+	git_diff_patch *patch;
+	const git_diff_range *range;
+	const char *header;
+	size_t header_len, lines_in_hunk;
+	int error = 0, hooks_count, h;
+
+	if (!rb_block_given_p()) {
+		return rb_funcall(self, rb_intern("to_enum"), 1, CSTR2SYM("each_hunk"), self);
+	}
+
+	Data_Get_Struct(self, git_diff_patch, patch);
+
+	hooks_count = git_diff_patch_num_hunks(patch);
+	for (h = 0; h < hooks_count; ++h) {
+		error = git_diff_patch_get_hunk(&range, &header, &header_len, &lines_in_hunk, patch, h);
+		if (error) break;
+
+		rb_yield(rugged_diff_hunk_new(self, h, range, header, header_len, lines_in_hunk));
+	}
+	rugged_exception_check(error);
+
+	return self;
+}
+
+/*
+ *  call-seq:
+ *    patch.hunk_count -> int
+ *
+ *  Returns the number of hunks in the patch.
+ */
+static VALUE rb_git_diff_patch_hunk_count(VALUE self)
+{
+	git_diff_patch *patch;
+	Data_Get_Struct(self, git_diff_patch, patch);
+
+	return INT2FIX(git_diff_patch_num_hunks(patch));
+}
+
+/*
+ *  call-seq:
+ *    patch.delta -> delta
+ *
+ *  Returns the delta object associated with the patch.
+ */
+static VALUE rb_git_diff_patch_delta(VALUE self)
+{
+	git_diff_patch *patch;
+	Data_Get_Struct(self, git_diff_patch, patch);
+
+	return rugged_diff_delta_new(rugged_owner(self), git_diff_patch_delta(patch));
+}
+
+/*
+ *  call-seq:
+ *    patch.additions -> int
+ *
+ *  Returns the number of addition lines in the patch.
+ */
+static VALUE rb_git_diff_patch_additions(VALUE self)
+{
+	git_diff_patch *patch;
+	size_t additions;
+	Data_Get_Struct(self, git_diff_patch, patch);
+
+	git_diff_patch_line_stats(NULL, &additions, NULL, patch);
+
+	return INT2FIX(additions);
+}
+
+/*
+ *  call-seq:
+ *    patch.deletions -> int
+ *
+ *  Returns the number of deletion lines in the patch.
+ */
+static VALUE rb_git_diff_patch_deletions(VALUE self)
+{
+	git_diff_patch *patch;
+	size_t deletions;
+	Data_Get_Struct(self, git_diff_patch, patch);
+
+	git_diff_patch_line_stats(NULL, NULL, &deletions, patch);
+
+	return INT2FIX(deletions);
+}
+
+/*
+ *  call-seq:
+ *    patch.context -> int
+ *
+ *  Returns the number of context lines in the patch.
+ */
+static VALUE rb_git_diff_patch_context(VALUE self)
+{
+	git_diff_patch *patch;
+	size_t context;
+	Data_Get_Struct(self, git_diff_patch, patch);
+
+	git_diff_patch_line_stats(&context, NULL, NULL, patch);
+
+	return INT2FIX(context);
+}
+
+void Init_rugged_diff_patch(void)
+{
+	rb_cRuggedDiffPatch = rb_define_class_under(rb_cRuggedDiff, "Patch", rb_cObject);
+
+	rb_define_method(rb_cRuggedDiffPatch, "context", rb_git_diff_patch_context, 0);
+	rb_define_method(rb_cRuggedDiffPatch, "additions", rb_git_diff_patch_additions, 0);
+	rb_define_method(rb_cRuggedDiffPatch, "deletions", rb_git_diff_patch_deletions, 0);
+
+	rb_define_method(rb_cRuggedDiffPatch, "delta", rb_git_diff_patch_delta, 0);
+
+	rb_define_method(rb_cRuggedDiffPatch, "each_hunk", rb_git_diff_patch_each_hunk, 0);
+	rb_define_method(rb_cRuggedDiffPatch, "hunk_count", rb_git_diff_patch_hunk_count, 0);
+}

data/ext/rugged/rugged_index.c

@@ -24,8 +24,11 @@
 
 #include "rugged.h"
 
-extern VALUE rb_mRugged;
 VALUE rb_cRuggedIndex;
+extern VALUE rb_mRugged;
+extern VALUE rb_cRuggedCommit;
+extern VALUE rb_cRuggedDiff;
+extern VALUE rb_cRuggedTree;
 
 static void rb_git_indexentry_toC(git_index_entry *entry, VALUE rb_entry);
 static VALUE rb_git_indexentry_fromC(const git_index_entry *entry);
@@ -46,6 +49,15 @@ VALUE rugged_index_new(VALUE klass, VALUE owner, git_index *index)
 	return rb_index;
 }
 
+/*
+ *  call-seq:
+ *    Index.new([path])
+ *
+ *  Create a bare index object based on the index file at +path+.
+ *
+ *  Any index methods that rely on the ODB or a working directory (e.g. #add)
+ *  will raise a Rugged::IndexError.
+ */
 static VALUE rb_git_index_new(int argc, VALUE *argv, VALUE klass)
 {
 	git_index *index;
@@ -65,6 +77,13 @@ static VALUE rb_git_index_new(int argc, VALUE *argv, VALUE klass)
 	return rugged_index_new(klass, Qnil, index);
 }
 
+/*
+ *  call-seq:
+ *    index.clear -> nil
+ *
+ *  Clear the contents (remove all entries) of the index object. Changes are in-memory only
+ *  and can be saved by calling #write.
+ */
 static VALUE rb_git_index_clear(VALUE self)
 {
 	git_index *index;
@@ -73,6 +92,13 @@ static VALUE rb_git_index_clear(VALUE self)
 	return Qnil;
 }
 
+/*
+ *  call-seq:
+ *    index.reload -> nil
+ *
+ *  Reloads the index contents from the disk, discarding any changes that
+ *  have not been saved through #write.
+ */
 static VALUE rb_git_index_read(VALUE self)
 {
 	git_index *index;
@@ -86,6 +112,12 @@ static VALUE rb_git_index_read(VALUE self)
 	return Qnil;
 }
 
+/*
+ *  call-seq:
+ *    index.write -> nil
+ *
+ *  Writes the index object from memory back to the disk, persisting all changes.
+ */
 static VALUE rb_git_index_write(VALUE self)
 {
 	git_index *index;
@@ -99,6 +131,12 @@ static VALUE rb_git_index_write(VALUE self)
 	return Qnil;
 }
 
+/*
+ *  call-seq:
+ *    index.count -> int
+ *
+ *  Returns the number of entries currently in the index.
+ */
 static VALUE rb_git_index_count(VALUE self)
 {
 	git_index *index;
@@ -106,6 +144,18 @@ static VALUE rb_git_index_count(VALUE self)
 	return INT2FIX(git_index_entrycount(index));
 }
 
+/*
+ *  call-seq:
+ *    index[path[, stage = 0]]     -> entry or nil
+ *    index[position]              -> entry or nil
+ *    index.get(path[, stage = 0]) -> entry or nil
+ *    index.get(position)          -> entry or nil
+ *
+ *  Return a specific entry in the index.
+ *
+ *  The first two forms returns entries based on their +path+ in the index and an optional +stage+,
+ *  while the last two forms return entries based on their position in the index.
+ */
 static VALUE rb_git_index_get(int argc, VALUE *argv, VALUE self)
 {
 	git_index *index;
@@ -143,6 +193,15 @@ static VALUE rb_git_index_get(int argc, VALUE *argv, VALUE self)
 	return entry ? rb_git_indexentry_fromC(entry) : Qnil;
 }
 
+/*
+ *  call-seq:
+ *    index.each { |entry| } -> nil
+ *    index.each -> Enumerator
+ *
+ *  Passes each entry of the index to the given block.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ */
 static VALUE rb_git_index_each(VALUE self)
 {
 	git_index *index;
@@ -163,6 +222,13 @@ static VALUE rb_git_index_each(VALUE self)
 	return Qnil;
 }
 
+/*
+ *  call-seq:
+ *    index.remove(path[, stage = 0]) -> nil
+ *
+ *  Removes the entry at the given +path+ with the given +stage+
+ *  from the index.
+ */
 static VALUE rb_git_index_remove(int argc, VALUE *argv, VALUE self)
 {
 	git_index *index;
@@ -185,6 +251,59 @@ static VALUE rb_git_index_remove(int argc, VALUE *argv, VALUE self)
 	return Qnil;
 }
 
+/*
+ *  call-seq:
+ *    index.remove_dir(dir[, stage = 0]) -> nil
+ *
+ *  Removes all entries under the given +dir+ with the given +stage+
+ *  from the index.
+ */
+static VALUE rb_git_index_remove_directory(int argc, VALUE *argv, VALUE self)
+{
+	git_index *index;
+	int error, stage = 0;
+
+	VALUE rb_dir, rb_stage;
+
+	Data_Get_Struct(self, git_index, index);
+
+	if (rb_scan_args(argc, argv, "11", &rb_dir, &rb_stage) > 1) {
+		Check_Type(rb_stage, T_FIXNUM);
+		stage = FIX2INT(rb_stage);
+	}
+
+	Check_Type(rb_dir, T_STRING);
+
+	error = git_index_remove_directory(index, StringValueCStr(rb_dir), stage);
+	rugged_exception_check(error);
+
+	return Qnil;
+}
+
+/*
+ *  call-seq:
+ *    index << entry -> nil
+ *    index << path -> nil
+ *    index.add(entry) -> nil
+ *    index.add(path) -> nil
+ *    index.update(entry) -> nil
+ *    index.update(path) -> nil
+ *
+ *  Add a new entry to the index or update an existing entry in the index.
+ *
+ *  If passed a +path+ to an existing, readable file relative to the workdir,
+ *  creates a new index entry based on this file.
+ *
+ *  Alternatively, a new index entry can be created by passing a Hash containing
+ *  all key/value pairs of an index entry.
+ *
+ *  Any gitignore rules that might match +path+ (or the +:path+ value of the
+ *  entry hash) are ignored.
+ *
+ *  If the index entry at +path+ (or +:path+) currently contains a merge conflict,
+ *  it will no longer be marked as conflicting and the data about the conflict
+ *  will be moved into the "resolve undo" (REUC) section of the index.
+ */
 static VALUE rb_git_index_add(VALUE self, VALUE rb_entry)
 {
 	git_index *index;
@@ -212,6 +331,194 @@ static VALUE rb_git_index_add(VALUE self, VALUE rb_entry)
 	return Qnil;
 }
 
+int rugged__index_matched_path_cb(const char *path, const char *matched_pathspec, void *payload)
+{
+	int *exception = (int *)payload;
+
+	VALUE rb_result, rb_args = rb_ary_new2(2);
+	rb_ary_push(rb_args, rb_str_new2(path));
+	rb_ary_push(rb_args, matched_pathspec == NULL ? Qnil : rb_str_new2(matched_pathspec));
+
+	rb_result = rb_protect(rb_yield_splat, rb_args, exception);
+
+	if (*exception)
+		return GIT_ERROR;
+
+	return RTEST(rb_result) ? 0 : 1;
+}
+
+/*
+ *  call-seq:
+ *    index.add_all(pathspec = [][, options])                            -> nil
+ *    index.add_all(pathspec = [][, options]) { |path, pathspec| block } -> nil
+ *
+ *  Add or update index entries matching files in the working directory.
+ *
+ *  Searches the working directory for files that +pathspec+ and adds them
+ *  to +index+ (by updating an existing entry or adding a new entry).
+ *
+ *  +pathspec+ can either be a String, or an Array of Strings.
+ *  If +pathspec+ is empty, all entries in the index will be matched.
+ *
+ *  Files that are ignored due to +.gitignore+ rules will be skipped,
+ *  unless they're already have an entry in +index+.
+ *
+ *  Files that are marked as the result of a merge request, will have this
+ *  marking removed and the merge conflict information will be moved into the
+ *  "resolve undo" (REUC) section of +index+.
+ *
+ *  If a block is given, each matched +path+ and the +pathspec+ that matched
+ *  it will be passed to the block. If the return value of +block+ is
+ *  falsy, the matching item will not be added to the index.
+ *
+ *  This method will fail in bare index instances.
+ *
+ *  The following options can be passed in the +options+ Hash:
+ *
+ *  :force ::
+ *    If +true+, any +.gitignore+ rules will be ignored.
+ *
+ *  :disable_pathspec_match ::
+ *    If +true+, glob expansion will be disabled and exact matching will be forced.
+ *
+ *  :check_pathspec ::
+ *    If +true+, and the +:force+ options is +false+ or not given, exact matches
+ *    of ignored files or files that are not already in +index+ will raise a
+ *    Rugged::InvalidError. This emulates <code>git add -A</code>.
+ */
+static VALUE rb_git_index_add_all(int argc, VALUE *argv, VALUE self)
+{
+	VALUE rb_pathspecs, rb_options;
+
+	git_index *index;
+	git_strarray pathspecs;
+	int error, exception = 0;
+	unsigned int flags = GIT_INDEX_ADD_DEFAULT;
+
+	Data_Get_Struct(self, git_index, index);
+
+	if (rb_scan_args(argc, argv, "02", &rb_pathspecs, &rb_options) > 1) {
+		Check_Type(rb_options, T_HASH);
+
+		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("force"))))
+			flags |= GIT_INDEX_ADD_FORCE;
+
+		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("disable_pathspec_match"))))
+			flags |= GIT_INDEX_ADD_DISABLE_PATHSPEC_MATCH;
+
+		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("check_pathspec"))))
+			flags |= GIT_INDEX_ADD_CHECK_PATHSPEC;
+	}
+
+	rugged_rb_ary_to_strarray(rb_pathspecs, &pathspecs);
+
+	error = git_index_add_all(index, &pathspecs, flags,
+		rb_block_given_p() ? rugged__index_matched_path_cb : NULL, &exception);
+
+	xfree(pathspecs.strings);
+
+	if (exception)
+		rb_jump_tag(exception);
+
+	rugged_exception_check(error);
+	return Qnil;
+}
+
+/*
+ *  call-seq:
+ *    index.update_all(pathspec = [])                            -> nil
+ *    index.update_all(pathspec = []) { |path, pathspec| block } -> nil
+ *
+ *  Update all index entries to match the working directory.
+ *
+ *  Searches +index+ for entries that match +pathspec+ and synchronizes
+ *  them with the content of the working directory.
+ *
+ *  +pathspec+ can either be a String, or an Array of Strings.
+ *  If +pathspec+ is empty, all entries in the index will be matched.
+ *
+ *  Entries where the corresponding working directory file no longer exists
+ *  get deleted, all other matched entries will get updated to reflect their
+ *  working directory state (the latest version of the a file's content will
+ *  automatically be added to the ODB).
+ *
+ *  If a block is given, each matched +path+ and the +pathspec+ that matched
+ *  it will be passed to the block. If the return value of +block+ is
+ *  falsy, the matching item will not be updated in the index.
+ *
+ *  This method will fail in bare index instances.
+ */
+static VALUE rb_git_index_update_all(int argc, VALUE *argv, VALUE self)
+{
+	VALUE rb_pathspecs = rb_ary_new();;
+
+	git_index *index;
+	git_strarray pathspecs;
+	int error, exception = 0;
+
+	Data_Get_Struct(self, git_index, index);
+
+	rb_scan_args(argc, argv, "01", &rb_pathspecs);
+
+	rugged_rb_ary_to_strarray(rb_pathspecs, &pathspecs);
+
+	error = git_index_update_all(index, &pathspecs,
+		rb_block_given_p() ? rugged__index_matched_path_cb : NULL, &exception);
+
+	xfree(pathspecs.strings);
+
+	if (exception)
+		rb_jump_tag(exception);
+	rugged_exception_check(error);
+
+	return Qnil;
+}
+
+/*
+ *  call-seq:
+ *    index.remove_all(pathspec = []) -> nil
+ *    index.remove_all(pathspec = []) { |path, pathspec| block } -> nil
+ *
+ *  Remove all matching index entries.
+ *
+ *  Searches +index+ for entries that match +pathspec+ and removes them
+ *  from the index.
+ *
+ *  +pathspec+ can either be a String, or an Array of Strings.
+ *  If +pathspec+ is empty, all entries in the index will be matched.
+ *
+ *  If a block is given, each matched +path+ and the +pathspec+ that matched
+ *  it will be passed to the block. If the return value of +block+ is
+ *  falsy, the matching item will not be removed from the index.
+ */
+static VALUE rb_git_index_remove_all(int argc, VALUE *argv, VALUE self)
+{
+	VALUE rb_pathspecs = rb_ary_new();
+
+	git_index *index;
+	git_strarray pathspecs;
+	int error, exception = 0;
+
+	Data_Get_Struct(self, git_index, index);
+
+	rb_scan_args(argc, argv, "01", &rb_pathspecs);
+
+	if (NIL_P(rb_pathspecs))
+		rb_pathspecs = rb_ary_new();
+
+	rugged_rb_ary_to_strarray(rb_ary_to_ary(rb_pathspecs), &pathspecs);
+
+	error = git_index_remove_all(index, &pathspecs,
+		rb_block_given_p() ? rugged__index_matched_path_cb : NULL, &exception);
+
+	xfree(pathspecs.strings);
+
+	if (exception)
+		rb_jump_tag(exception);
+	rugged_exception_check(error);
+
+	return Qnil;
+}
 
 static VALUE rb_git_indexentry_fromC(const git_index_entry *entry)
 {
@@ -223,7 +530,7 @@ static VALUE rb_git_indexentry_fromC(const git_index_entry *entry)
 
 	rb_entry = rb_hash_new();
 
-	rb_hash_aset(rb_entry, CSTR2SYM("path"), rugged_str_new2(entry->path, NULL));
+	rb_hash_aset(rb_entry, CSTR2SYM("path"), rb_str_new_utf8(entry->path));
 	rb_hash_aset(rb_entry, CSTR2SYM("oid"), rugged_create_oid(&entry->oid));
 
 	rb_hash_aset(rb_entry, CSTR2SYM("dev"), INT2FIX(entry->dev));
@@ -322,6 +629,17 @@ static void rb_git_indexentry_toC(git_index_entry *entry, VALUE rb_entry)
 	}
 }
 
+/*
+ *  call-seq:
+ *    index.write_tree([repo]) -> oid
+ *
+ *  Write the index to a tree, either in the index's repository, or in
+ *  the given +repo+.
+ *
+ *  If the index contains any files in conflict, writing the tree will fail.
+ *
+ *  Returns the OID string of the written tree object.
+ */
 static VALUE rb_git_index_writetree(int argc, VALUE *argv, VALUE self)
 {
 	git_index *index;
@@ -346,13 +664,13 @@ static VALUE rb_git_index_writetree(int argc, VALUE *argv, VALUE self)
 }
 
 /*
- *	call-seq:
- *		index.read_tree(tree)
+ *  call-seq:
+ *    index.read_tree(tree)
  *
- *      Clear the current index and start the index again on top of +tree+
+ *  Clear the current index and start the index again on top of +tree+
  *
- *      Further index operations (+add+, +update+, +remove+, etc) will
- *      be considered changes on top of +tree+.
+ *  Further index operations (+add+, +update+, +remove+, etc) will
+ *  be considered changes on top of +tree+.
  */
 static VALUE rb_git_index_readtree(VALUE self, VALUE rb_tree)
 {
@@ -369,7 +687,212 @@ static VALUE rb_git_index_readtree(VALUE self, VALUE rb_tree)
 	return Qnil;
 }
 
-void Init_rugged_index()
+/*
+ *  call-seq:
+ *    index.diff([options]) -> diff
+ *    index.diff(diffable[, options]) -> diff
+ *
+ *  The first form returns a diff between the index and the current working
+ *  directory.
+ *
+ *  The second form returns a diff between the index and the given diffable object.
+ *  +diffable+ can either be a +Rugged::Commit+ or a +Rugged::Tree+.
+ *
+ *  The index will be used as the "old file" side of the diff, while the working
+ *  directory or the +diffable+ will be used for the "new file" side.
+ *
+ *  The following options can be passed in the +options+ Hash:
+ *
+ *  :paths ::
+ *    An array of paths / fnmatch patterns to constrain the diff to a specific
+ *    set of files. Also see +:disable_pathspec_match+.
+ *
+ *  :max_size ::
+ *    An integer specifying the maximum byte size of a file before a it will
+ *    be treated as binary. The default value is 512MB.
+ *
+ *  :context_lines ::
+ *    The number of unchanged lines that define the boundary of a hunk (and
+ *    to display before and after the actual changes). The default is 3.
+ *
+ *  :interhunk_lines ::
+ *    The maximum number of unchanged lines between hunk boundaries before the hunks
+ *    will be merged into a one. The default is 0.
+ *
+ *  :reverse ::
+ *    If true, the sides of the diff will be reversed.
+ *
+ *  :force_text ::
+ *    If true, all files will be treated as text, disabling binary attributes & detection.
+ *
+ *  :ignore_whitespace ::
+ *    If true, all whitespace will be ignored.
+ *
+ *  :ignore_whitespace_change ::
+ *    If true, changes in amount of whitespace will be ignored.
+ *
+ *  :ignore_whitespace_eol ::
+ *    If true, whitespace at end of line will be ignored.
+ *
+ *  :ignore_submodules ::
+ *    if true, submodules will be excluded from the diff completely.
+ *
+ *  :patience ::
+ *    If true, the "patience diff" algorithm will be used (currenlty unimplemented).
+ *
+ *  :include_ignored ::
+ *    If true, ignored files will be included in the diff.
+ *
+ *  :include_untracked ::
+ *   If true, untracked files will be included in the diff.
+ *
+ *  :include_unmodified ::
+ *    If true, unmodified files will be included in the diff.
+ *
+ *  :recurse_untracked_dirs ::
+ *    Even if +:include_untracked+ is true, untracked directories will only be
+ *    marked with a single entry in the diff. If this flag is set to true,
+ *    all files under ignored directories will be included in the di ff, too.
+ *
+ *  :disable_pathspec_match ::
+ *    If true, the given +:paths+ will be applied as exact matches, instead of
+ *    as fnmatch patterns.
+ *
+ *  :deltas_are_icase ::
+ *    If true, filename comparisons will be made with case-insensitivity.
+ *
+ *  :include_untracked_content ::
+ *    if true, untracked content will be contained in the the diff patch text.
+ *
+ *  :skip_binary_check ::
+ *    If true, diff deltas will be generated without spending time on binary
+ *    detection. This is useful to improve performance in cases where the actual
+ *    file content difference is not needed.
+ *
+ *  :include_typechange ::
+ *    If true, type changes for files will not be interpreted as deletion of
+ *    the "old file" and addition of the "new file", but will generate
+ *    typechange records.
+ *
+ *  :include_typechange_trees ::
+ *    Even if +:include_typechange+ is true, blob -> tree changes will still
+ *    usually be handled as a deletion of the blob. If this flag is set to true,
+ *    blob -> tree changes will be marked as typechanges.
+ *
+ *  :ignore_filemode ::
+ *    If true, file mode changes will be ignored.
+ *
+ *  :recurse_ignored_dirs ::
+ *    Even if +:include_ignored+ is true, ignored directories will only be
+ *    marked with a single entry in the diff. If this flag is set to true,
+ *    all files under ignored directories will be included in the diff, too.
+ */
+static VALUE rb_git_index_diff(int argc, VALUE *argv, VALUE self)
+{
+	git_index *index;
+	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
+	git_repository *repo;
+	git_diff_list *diff = NULL;
+	VALUE owner, rb_other, rb_options;
+	int error;
+
+	rb_scan_args(argc, argv, "01:", &rb_other, &rb_options);
+	rugged_parse_diff_options(&opts, rb_options);
+
+	Data_Get_Struct(self, git_index, index);
+	owner = rugged_owner(self);
+	Data_Get_Struct(owner, git_repository, repo);
+
+	if (NIL_P(rb_other)) {
+		error = git_diff_index_to_workdir(&diff, repo, index, &opts);
+	} else {
+		// Need to flip the reverse option, so that the index is by default
+		// the "old file" side of the diff.
+		opts.flags ^= GIT_DIFF_REVERSE;
+
+		if (rb_obj_is_kind_of(rb_other, rb_cRuggedCommit)) {
+			git_tree *other_tree;
+			git_commit *commit;
+			Data_Get_Struct(rb_other, git_commit, commit);
+			error = git_commit_tree(&other_tree, commit);
+
+			if (!error)
+				error = git_diff_tree_to_index(&diff, repo, other_tree, index, &opts);
+		} else if (rb_obj_is_kind_of(rb_other, rb_cRuggedTree)) {
+			git_tree *other_tree;
+			Data_Get_Struct(rb_other, git_tree, other_tree);
+			error = git_diff_tree_to_index(&diff, repo, other_tree, index, &opts);
+		} else {
+			xfree(opts.pathspec.strings);
+			rb_raise(rb_eTypeError, "A Rugged::Commit or Rugged::Tree instance is required");
+		}
+	}
+
+	xfree(opts.pathspec.strings);
+	rugged_exception_check(error);
+
+	return rugged_diff_new(rb_cRuggedDiff, self, diff);
+}
+
+/*
+ *  call-seq:
+ *    index.conflicts? -> true or false
+ *
+ *  Determines if the index contains entries representing conflicts.
+ */
+static VALUE rb_git_index_conflicts_p(VALUE self)
+{
+	git_index *index;
+	Data_Get_Struct(self, git_index, index);
+	return git_index_has_conflicts(index) ? Qtrue : Qfalse;
+}
+
+
+/*
+ *  Document-class: Rugged::Index
+ *
+ *  == Index Entries
+ *
+ *  Index entries are represented as Hash instances with the following key/value pairs:
+ *
+ *  path: ::
+ *    The entry's path in the index.
+ *
+ *  oid: ::
+ *    The oid of the entry's git object (blob / tree).
+ *
+ *  dev: ::
+ *    The device for the index entry.
+ *
+ *  ino: ::
+ *    The inode for the index entry.
+ *
+ *  mode: ::
+ *    The current permissions of the index entry.
+ *
+ *  gid: ::
+ *    Group ID of the index entry's owner.
+ *
+ *  uid: ::
+ *    User ID of the index entry's owner.
+ *
+ *  file_size: ::
+ *    The index entry's size, in bytes.
+ *
+ *  valid: ::
+ *    +true+ if the index entry is valid, +false+ otherwise.
+ *
+ *  stage: ::
+ *    The current stage of the index entry.
+ *
+ *  mtime: ::
+ *    A Time instance representing the index entry's time of last modification.
+ *
+ *  mtime: ::
+ *    A Time instance representing the index entry's time of last status change
+ *    (ie. change of owner, group, mode, etc.).
+ */
+void Init_rugged_index(void)
 {
 	/*
 	 * Index
@@ -384,12 +907,20 @@ void Init_rugged_index()
 	rb_define_method(rb_cRuggedIndex, "get", rb_git_index_get, -1);
 	rb_define_method(rb_cRuggedIndex, "[]", rb_git_index_get, -1);
 	rb_define_method(rb_cRuggedIndex, "each", rb_git_index_each, 0);
+	rb_define_method(rb_cRuggedIndex, "diff", rb_git_index_diff, -1);
+
+	rb_define_method(rb_cRuggedIndex, "conflicts?", rb_git_index_conflicts_p, 0);
 
 	rb_define_method(rb_cRuggedIndex, "add", rb_git_index_add, 1);
 	rb_define_method(rb_cRuggedIndex, "update", rb_git_index_add, 1);
 	rb_define_method(rb_cRuggedIndex, "<<", rb_git_index_add, 1);
 
 	rb_define_method(rb_cRuggedIndex, "remove", rb_git_index_remove, -1);
+	rb_define_method(rb_cRuggedIndex, "remove_dir", rb_git_index_remove_directory, -1);
+
+	rb_define_method(rb_cRuggedIndex, "add_all", rb_git_index_add_all, -1);
+	rb_define_method(rb_cRuggedIndex, "update_all", rb_git_index_update_all, -1);
+	rb_define_method(rb_cRuggedIndex, "remove_all", rb_git_index_remove_all, -1);
 
 	rb_define_method(rb_cRuggedIndex, "write_tree", rb_git_index_writetree, -1);
 	rb_define_method(rb_cRuggedIndex, "read_tree", rb_git_index_readtree, 1);