[libgit2-glib] diff: rename print_patch to print



commit 820c8f25682fefc21707ebfa0d81541470b88c8e
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Fri Nov 22 08:36:18 2013 +0100

    diff: rename print_patch to print

 libgit2-glib/ggit-diff.c  |   18 ++++++++++--------
 libgit2-glib/ggit-diff.h  |    3 ++-
 libgit2-glib/ggit-types.c |    6 ++++++
 libgit2-glib/ggit-types.h |   18 ++++++++++++++++++
 4 files changed, 36 insertions(+), 9 deletions(-)
---
diff --git a/libgit2-glib/ggit-diff.c b/libgit2-glib/ggit-diff.c
index 89372c7..9dfcb29 100644
--- a/libgit2-glib/ggit-diff.c
+++ b/libgit2-glib/ggit-diff.c
@@ -405,8 +405,9 @@ ggit_diff_foreach (GgitDiff              *diff,
 }
 
 /**
- * ggit_diff_print_patch:
+ * ggit_diff_print:
  * @diff: a #GgitDiff.
+ * @type: a #GgitDiffFormatType.
  * @print_cb: (scope call) (closure user_data): a #GgitDiffLineCallback.
  * @user_data: callback user data.
  * @error: a #GError for error reporting, or %NULL.
@@ -414,10 +415,11 @@ ggit_diff_foreach (GgitDiff              *diff,
  * Iterates over @diff generating text output like "git diff".
  */
 void
-ggit_diff_print_patch (GgitDiff              *diff,
-                       GgitDiffLineCallback   print_cb,
-                       gpointer              *user_data,
-                       GError               **error)
+ggit_diff_print (GgitDiff              *diff,
+                 GgitDiffFormatType     type,
+                 GgitDiffLineCallback   print_cb,
+                 gpointer              *user_data,
+                 GError               **error)
 {
        gint ret;
        CallbackWrapperData wrapper_data;
@@ -429,9 +431,9 @@ ggit_diff_print_patch (GgitDiff              *diff,
        wrapper_data.user_data = user_data;
        wrapper_data.line_cb = print_cb;
 
-       ret = git_diff_print_patch (_ggit_native_get (diff),
-                                   ggit_diff_line_callback_wrapper,
-                                   &wrapper_data);
+       ret = git_diff_print (_ggit_native_get (diff), type,
+                             ggit_diff_line_callback_wrapper,
+                             &wrapper_data);
 
        if (ret != GIT_OK)
        {
diff --git a/libgit2-glib/ggit-diff.h b/libgit2-glib/ggit-diff.h
index 5e59a69..34c9c71 100644
--- a/libgit2-glib/ggit-diff.h
+++ b/libgit2-glib/ggit-diff.h
@@ -91,7 +91,8 @@ void           ggit_diff_foreach                   (GgitDiff              *diff,
                                                     GgitDiffLineCallback   line_cb,
                                                     gpointer              *user_data,
                                                     GError               **error);
-void           ggit_diff_print_patch               (GgitDiff              *diff,
+void           ggit_diff_print                     (GgitDiff              *diff,
+                                                    GgitDiffFormatType     type,
                                                     GgitDiffLineCallback   print_cb,
                                                     gpointer              *user_data,
                                                     GError               **error);
diff --git a/libgit2-glib/ggit-types.c b/libgit2-glib/ggit-types.c
index c4662ea..48f7e98 100644
--- a/libgit2-glib/ggit-types.c
+++ b/libgit2-glib/ggit-types.c
@@ -48,6 +48,12 @@ ASSERT_ENUM (GGIT_DELTA_COPIED,     GIT_DELTA_COPIED);
 ASSERT_ENUM (GGIT_DELTA_IGNORED,    GIT_DELTA_IGNORED);
 ASSERT_ENUM (GGIT_DELTA_UNTRACKED,  GIT_DELTA_UNTRACKED);
 
+ASSERT_ENUM (GGIT_DIFF_FORMAT_PATCH,         GIT_DIFF_FORMAT_PATCH);
+ASSERT_ENUM (GGIT_DIFF_FORMAT_PATCH_HEADER,  GIT_DIFF_FORMAT_PATCH_HEADER);
+ASSERT_ENUM (GGIT_DIFF_FORMAT_RAW,           GIT_DIFF_FORMAT_RAW);
+ASSERT_ENUM (GGIT_DIFF_FORMAT_NAME_ONLY,     GIT_DIFF_FORMAT_NAME_ONLY);
+ASSERT_ENUM (GGIT_DIFF_FORMAT_NAME_STATUS,   GIT_DIFF_FORMAT_NAME_STATUS);
+
 
 ASSERT_ENUM (GGIT_DIFF_NORMAL,                    GIT_DIFF_NORMAL);
 ASSERT_ENUM (GGIT_DIFF_REVERSE,                   GIT_DIFF_REVERSE);
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
index 3b0b2b5..bc5decc 100644
--- a/libgit2-glib/ggit-types.h
+++ b/libgit2-glib/ggit-types.h
@@ -426,6 +426,24 @@ typedef enum {
 } GgitDeltaType;
 
 /**
+ * GgitDiffFormatType:
+ * @GGIT_DIFF_FORMAT_PATCH: full git diff.
+ * @GGIT_DIFF_FORMAT_PATCH_HEADER: just the file headers of patch.
+ * @GGIT_DIFF_FORMAT_RAW: like git diff --raw.
+ * @GGIT_DIFF_FORMAT_NAME_ONLY: like git diff --name-only.
+ * @GGIT_DIFF_FORMAT_NAME_STATUS: like git diff --name-status.
+ *
+ * Possible output formats for diff data.
+ */
+typedef enum {
+       GGIT_DIFF_FORMAT_PATCH        = 1u,
+       GGIT_DIFF_FORMAT_PATCH_HEADER = 2u,
+       GGIT_DIFF_FORMAT_RAW          = 3u,
+       GGIT_DIFF_FORMAT_NAME_ONLY    = 4u,
+       GGIT_DIFF_FORMAT_NAME_STATUS  = 5u
+} GgitDiffFormatType;
+
+/**
  * GgitDiffOption:
  * @GGIT_DIFF_NORMAL: normal.
  * @GGIT_DIFF_REVERSE: reverse.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]