Merge pull request #628 from libgit2/arthur/add-patch-header

Add `Rugged::Patch#header`

Author: arthurschreiber

ext/rugged/rugged_patch.c

@@ -275,6 +275,7 @@ static VALUE rb_git_diff_patch_lines(int argc, VALUE *argv, VALUE self)
 
 	return INT2FIX(lines);
 }
+
 /*
  *  call-seq:
  *    patch.bytesize(options = {}) -> int
@@ -332,20 +333,36 @@ static int patch_print_cb(
 	const git_diff_line *line,
 	void *payload)
 {
-	VALUE rb_str = (VALUE)payload;
+	VALUE rb_buffer = (VALUE)payload;
 
 	switch (line->origin) {
 		case GIT_DIFF_LINE_CONTEXT:
 		case GIT_DIFF_LINE_ADDITION:
 		case GIT_DIFF_LINE_DELETION:
-			rb_str_cat(rb_str, &line->origin, 1);
+			rb_ary_push(rb_buffer, rb_str_new(&line->origin, 1));
 	}
 
-	rb_str_cat(rb_str, line->content, line->content_len);
+	rb_ary_push(rb_buffer, rb_str_new(line->content, line->content_len));
 
 	return GIT_OK;
 }
 
+static int patch_print_header_cb(
+	const git_diff_delta *delta,
+	const git_diff_hunk *hunk,
+	const git_diff_line *line,
+	void *payload)
+{
+	VALUE rb_buffer = (VALUE)payload;
+
+	if (line->origin == GIT_DIFF_LINE_FILE_HDR) {
+		rb_ary_push(rb_buffer, rb_str_new(line->content, line->content_len));
+		return GIT_OK;
+	} else {
+		return GIT_ITEROVER;
+	}
+}
+
 /*
  *  call-seq:
  *    patch.to_s -> str
@@ -355,14 +372,35 @@ static int patch_print_cb(
 static VALUE rb_git_diff_patch_to_s(VALUE self)
 {
 	git_patch *patch;
-	VALUE rb_str = rb_str_new(NULL, 0);
+	VALUE rb_buffer = rb_ary_new();
+	Data_Get_Struct(self, git_patch, patch);
+
+	rugged_exception_check(git_patch_print(patch, patch_print_cb, (void*)rb_buffer));
+
+	return rb_ary_join(rb_buffer, Qnil);
+}
+
+/*
+ *  call-seq:
+ *    patch.header -> str
+ *
+ *  Returns only the header of the patch as a string.
+ */
+static VALUE rb_git_diff_patch_header(VALUE self)
+{
+	git_patch *patch;
+	int error = 0;
+	VALUE rb_buffer = rb_ary_new();
 	Data_Get_Struct(self, git_patch, patch);
 
-	rugged_exception_check(git_patch_print(patch, patch_print_cb, (void*)rb_str));
+	error = git_patch_print(patch, patch_print_header_cb, (void*)rb_buffer);
+	if (error && error != GIT_ITEROVER)
+		rugged_exception_check(error);
 
-	return rb_str;
+	return rb_ary_join(rb_buffer, Qnil);
 }
 
+
 void Init_rugged_patch(void)
 {
 	rb_cRuggedPatch = rb_define_class_under(rb_mRugged, "Patch", rb_cObject);
@@ -375,6 +413,7 @@ void Init_rugged_patch(void)
 
 	rb_define_method(rb_cRuggedPatch, "delta", rb_git_diff_patch_delta, 0);
 
+	rb_define_method(rb_cRuggedPatch, "header", rb_git_diff_patch_header, 0);
 	rb_define_method(rb_cRuggedPatch, "to_s", rb_git_diff_patch_to_s, 0);
 
 	rb_define_method(rb_cRuggedPatch, "each_hunk", rb_git_diff_patch_each_hunk, 0);

test/patch_test.rb

@@ -76,4 +76,21 @@ def test_lines
 
     assert_equal 0, patch.lines(exclude_eofnl: true, exclude_additions: true, exclude_deletions: true, exclude_context: true)
   end
+
+  def test_header
+    repo = FixtureRepo.from_libgit2("diff")
+    repo.config['core.abbrev'] = 7
+
+    a = repo.lookup("d70d245ed97ed2aa596dd1af6536e4bfdb047b69")
+    b = repo.lookup("7a9e0b02e63179929fed24f0a3e0f19168114d10")
+
+    diff = a.tree.diff(b.tree, :context_lines => 0)
+
+    assert_equal <<-DIFF, diff.patches[1].header
+diff --git a/readme.txt b/readme.txt
+index 7b808f7..29ab705 100644
+--- a/readme.txt
++++ b/readme.txt
+    DIFF
+  end
 end