[libgit2-glib] Add missing diff options



commit bbb7169238030e474580cc8c4bbf7d9fe3fbbfe5
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Wed Jul 3 17:08:52 2013 +0200

    Add missing diff options

 libgit2-glib/ggit-types.c |   34 +++++++++++++++++++++-----------
 libgit2-glib/ggit-types.h |   46 +++++++++++++++++++++++++++++++++-----------
 2 files changed, 56 insertions(+), 24 deletions(-)
---
diff --git a/libgit2-glib/ggit-types.c b/libgit2-glib/ggit-types.c
index 86a1215..c4662ea 100644
--- a/libgit2-glib/ggit-types.c
+++ b/libgit2-glib/ggit-types.c
@@ -49,18 +49,28 @@ ASSERT_ENUM (GGIT_DELTA_IGNORED,    GIT_DELTA_IGNORED);
 ASSERT_ENUM (GGIT_DELTA_UNTRACKED,  GIT_DELTA_UNTRACKED);
 
 
-ASSERT_ENUM (GGIT_DIFF_NORMAL,                   GIT_DIFF_NORMAL);
-ASSERT_ENUM (GGIT_DIFF_REVERSE,                  GIT_DIFF_REVERSE);
-ASSERT_ENUM (GGIT_DIFF_FORCE_TEXT,               GIT_DIFF_FORCE_TEXT);
-ASSERT_ENUM (GGIT_DIFF_IGNORE_WHITESPACE,        GIT_DIFF_IGNORE_WHITESPACE);
-ASSERT_ENUM (GGIT_DIFF_IGNORE_WHITESPACE_CHANGE, GIT_DIFF_IGNORE_WHITESPACE_CHANGE);
-ASSERT_ENUM (GGIT_DIFF_IGNORE_WHITESPACE_EOL,    GIT_DIFF_IGNORE_WHITESPACE_EOL);
-ASSERT_ENUM (GGIT_DIFF_IGNORE_SUBMODULES,        GIT_DIFF_IGNORE_SUBMODULES);
-ASSERT_ENUM (GGIT_DIFF_PATIENCE,                 GIT_DIFF_PATIENCE);
-ASSERT_ENUM (GGIT_DIFF_INCLUDE_IGNORED,          GIT_DIFF_INCLUDE_IGNORED);
-ASSERT_ENUM (GGIT_DIFF_INCLUDE_UNTRACKED,        GIT_DIFF_INCLUDE_UNTRACKED);
-ASSERT_ENUM (GGIT_DIFF_INCLUDE_UNMODIFIED,       GIT_DIFF_INCLUDE_UNMODIFIED);
-ASSERT_ENUM (GGIT_DIFF_RECURSE_UNTRACKED_DIRS,   GIT_DIFF_RECURSE_UNTRACKED_DIRS);
+ASSERT_ENUM (GGIT_DIFF_NORMAL,                    GIT_DIFF_NORMAL);
+ASSERT_ENUM (GGIT_DIFF_REVERSE,                   GIT_DIFF_REVERSE);
+ASSERT_ENUM (GGIT_DIFF_FORCE_TEXT,                GIT_DIFF_FORCE_TEXT);
+ASSERT_ENUM (GGIT_DIFF_IGNORE_WHITESPACE,         GIT_DIFF_IGNORE_WHITESPACE);
+ASSERT_ENUM (GGIT_DIFF_IGNORE_WHITESPACE_CHANGE,  GIT_DIFF_IGNORE_WHITESPACE_CHANGE);
+ASSERT_ENUM (GGIT_DIFF_IGNORE_WHITESPACE_EOL,     GIT_DIFF_IGNORE_WHITESPACE_EOL);
+ASSERT_ENUM (GGIT_DIFF_IGNORE_SUBMODULES,         GIT_DIFF_IGNORE_SUBMODULES);
+ASSERT_ENUM (GGIT_DIFF_PATIENCE,                  GIT_DIFF_PATIENCE);
+ASSERT_ENUM (GGIT_DIFF_INCLUDE_IGNORED,           GIT_DIFF_INCLUDE_IGNORED);
+ASSERT_ENUM (GGIT_DIFF_INCLUDE_UNTRACKED,         GIT_DIFF_INCLUDE_UNTRACKED);
+ASSERT_ENUM (GGIT_DIFF_INCLUDE_UNMODIFIED,        GIT_DIFF_INCLUDE_UNMODIFIED);
+ASSERT_ENUM (GGIT_DIFF_RECURSE_UNTRACKED_DIRS,    GIT_DIFF_RECURSE_UNTRACKED_DIRS);
+ASSERT_ENUM (GGIT_DIFF_DISABLE_PATHSPEC_MATCH,    GIT_DIFF_DISABLE_PATHSPEC_MATCH);
+ASSERT_ENUM (GGIT_DIFF_DELTAS_ARE_ICASE,          GIT_DIFF_DELTAS_ARE_ICASE);
+ASSERT_ENUM (GGIT_DIFF_INCLUDE_UNTRACKED_CONTENT, GIT_DIFF_INCLUDE_UNTRACKED_CONTENT);
+ASSERT_ENUM (GGIT_DIFF_SKIP_BINARY_CHECK,         GIT_DIFF_SKIP_BINARY_CHECK);
+ASSERT_ENUM (GGIT_DIFF_INCLUDE_TYPECHANGE,        GIT_DIFF_INCLUDE_TYPECHANGE);
+ASSERT_ENUM (GGIT_DIFF_INCLUDE_TYPECHANGE_TREES,  GIT_DIFF_INCLUDE_TYPECHANGE_TREES);
+ASSERT_ENUM (GGIT_DIFF_IGNORE_FILE_MODE,          GIT_DIFF_IGNORE_FILEMODE);
+ASSERT_ENUM (GGIT_DIFF_RECURSE_IGNORED_DIRS,      GIT_DIFF_RECURSE_IGNORED_DIRS);
+ASSERT_ENUM (GGIT_DIFF_FAST_UNTRACKED_DIRS,       GIT_DIFF_FAST_UNTRACKED_DIRS);
+ASSERT_ENUM (GGIT_DIFF_FORCE_BINARY,              GIT_DIFF_FORCE_BINARY);
 
 
 ASSERT_ENUM (GGIT_DIFF_FLAG_VALID_OID,  GIT_DIFF_FLAG_VALID_OID);
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
index a42fb44..85e0d83 100644
--- a/libgit2-glib/ggit-types.h
+++ b/libgit2-glib/ggit-types.h
@@ -418,22 +418,44 @@ typedef enum {
  * @GGIT_DIFF_INCLUDE_UNTRACKED: include untracked files.
  * @GGIT_DIFF_INCLUDE_UNMODIFIED: include unmodified files.
  * @GGIT_DIFF_RECURSE_UNTRACKED_DIRS: recurse to untracked directories.
+ * @GGIT_DIFF_DISABLE_PATHSPEC_MATCH: use exact path matching.
+ * @GGIT_DIFF_DELTAS_ARE_ICASE: use case insensitive filename comparisons.
+ * @GGIT_DIFF_INCLUDE_UNTRACKED_CONTENT: include content of untracked files.
+ * this implies GGIT_DIFF_INCLUDE_UNTRACKED but not GGIT_DIFF_RECURSE_UNTRACKED_DIRS.
+ * @GGIT_DIFF_SKIP_BINARY_CHECK: disable updating the binary flag in delta records.
+ * @GGIT_DIFF_INCLUDE_TYPECHANGE: enable generation of typechange detal records.
+ * @GGIT_DIFF_INCLUDE_TYPECHANGE_TREES:
+ * @GGIT_DIFF_IGNORE_FILE_MODE: ignore file mode changes.
+ * @GGIT_DIFF_RECURSE_IGNORED_DIRS:
+ * @GGIT_DIFF_FAST_UNTRACKED_DIRS: immediately label untracked directories as
+ * untracked, without checking inside.
+ * @GGIT_DIFF_FORCE_BINARY: treat all files as binary, disabling text diffs.
  *
  * How the diff should be generated.
  */
 typedef enum {
-       GGIT_DIFF_NORMAL                   = 0,
-       GGIT_DIFF_REVERSE                  = 1 << 0,
-       GGIT_DIFF_FORCE_TEXT               = 1 << 1,
-       GGIT_DIFF_IGNORE_WHITESPACE        = 1 << 2,
-       GGIT_DIFF_IGNORE_WHITESPACE_CHANGE = 1 << 3,
-       GGIT_DIFF_IGNORE_WHITESPACE_EOL    = 1 << 4,
-       GGIT_DIFF_IGNORE_SUBMODULES        = 1 << 5,
-       GGIT_DIFF_PATIENCE                 = 1 << 6,
-       GGIT_DIFF_INCLUDE_IGNORED          = 1 << 7,
-       GGIT_DIFF_INCLUDE_UNTRACKED        = 1 << 8,
-       GGIT_DIFF_INCLUDE_UNMODIFIED       = 1 << 9,
-       GGIT_DIFF_RECURSE_UNTRACKED_DIRS   = 1 << 10
+       GGIT_DIFF_NORMAL                    = 0,
+       GGIT_DIFF_REVERSE                   = 1 << 0,
+       GGIT_DIFF_FORCE_TEXT                = 1 << 1,
+       GGIT_DIFF_IGNORE_WHITESPACE         = 1 << 2,
+       GGIT_DIFF_IGNORE_WHITESPACE_CHANGE  = 1 << 3,
+       GGIT_DIFF_IGNORE_WHITESPACE_EOL     = 1 << 4,
+       GGIT_DIFF_IGNORE_SUBMODULES         = 1 << 5,
+       GGIT_DIFF_PATIENCE                  = 1 << 6,
+       GGIT_DIFF_INCLUDE_IGNORED           = 1 << 7,
+       GGIT_DIFF_INCLUDE_UNTRACKED         = 1 << 8,
+       GGIT_DIFF_INCLUDE_UNMODIFIED        = 1 << 9,
+       GGIT_DIFF_RECURSE_UNTRACKED_DIRS    = 1 << 10,
+       GGIT_DIFF_DISABLE_PATHSPEC_MATCH    = 1 << 11,
+       GGIT_DIFF_DELTAS_ARE_ICASE          = 1 << 12,
+       GGIT_DIFF_INCLUDE_UNTRACKED_CONTENT = 1 << 13,
+       GGIT_DIFF_SKIP_BINARY_CHECK         = 1 << 14,
+       GGIT_DIFF_INCLUDE_TYPECHANGE        = 1 << 15,
+       GGIT_DIFF_INCLUDE_TYPECHANGE_TREES  = 1 << 16,
+       GGIT_DIFF_IGNORE_FILE_MODE          = 1 << 17,
+       GGIT_DIFF_RECURSE_IGNORED_DIRS      = 1 << 18,
+       GGIT_DIFF_FAST_UNTRACKED_DIRS       = 1 << 19,
+       GGIT_DIFF_FORCE_BINARY              = 1 << 20,
 } GgitDiffOption;
 
 /**


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