[libgit2-glib] Rename GgitDiffRange to GgitDiffLine

[Ignacio Casal Quinteiro <icq src gnome org>]

commit d705fa63361d542a66ba015c8c2004cf50020145
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Thu Nov 21 17:21:25 2013 +0100

    Rename GgitDiffRange to GgitDiffLine

 libgit2-glib/Makefile.am       |    4 +-
 libgit2-glib/ggit-diff-line.c  |  194 ++++++++++++++++++++++++++++++++++++++++
 libgit2-glib/ggit-diff-line.h  |   49 ++++++++++
 libgit2-glib/ggit-diff-range.c |  157 --------------------------------
 libgit2-glib/ggit-diff-range.h |   47 ----------
 libgit2-glib/ggit-diff.c       |    2 +-
 6 files changed, 246 insertions(+), 207 deletions(-)
---
diff --git a/libgit2-glib/Makefile.am b/libgit2-glib/Makefile.am
index 09de9ce..fef6467 100644
--- a/libgit2-glib/Makefile.am
+++ b/libgit2-glib/Makefile.am
@@ -30,8 +30,8 @@ INST_H_FILES =                                \
        ggit-diff.h                     \
        ggit-diff-delta.h               \
        ggit-diff-file.h                \
+       ggit-diff-line.h                \
        ggit-diff-options.h             \
-       ggit-diff-range.h               \
        ggit-diff-similarity-metric.h   \
        ggit-error.h                    \
        ggit-index.h                    \
@@ -84,8 +84,8 @@ C_FILES =                             \
        ggit-diff.c                     \
        ggit-diff-delta.c               \
        ggit-diff-file.c                \
+       ggit-diff-line.c                \
        ggit-diff-options.c             \
-       ggit-diff-range.c               \
        ggit-diff-similarity-metric.c   \
        ggit-error.c                    \
        ggit-index.c                    \
diff --git a/libgit2-glib/ggit-diff-line.c b/libgit2-glib/ggit-diff-line.c
new file mode 100644
index 0000000..cfaa5c1
--- /dev/null
+++ b/libgit2-glib/ggit-diff-line.c
@@ -0,0 +1,194 @@
+/*
+ * ggit-diff-line.c
+ * This file is part of libgit2-glib
+ *
+ * Copyright (C) 2012 - Garrett Regier
+ *
+ * libgit2-glib is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * libgit2-glib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libgit2-glib. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <glib-object.h>
+#include <git2.h>
+
+#include "ggit-diff-line.h"
+
+struct _GgitDiffLine {
+       gint ref_count;
+
+       gchar origin;
+       gint old_lineno;
+       gint new_lineno;
+       gint num_lines;
+       gsize content_len;
+       gint64 content_offset;
+       const gchar *content;
+};
+
+G_DEFINE_BOXED_TYPE (GgitDiffLine, ggit_diff_line,
+                     ggit_diff_line_ref, ggit_diff_line_unref)
+
+
+GgitDiffLine *
+_ggit_diff_line_wrap (const git_diff_line *line)
+{
+       GgitDiffLine *gline;
+
+       g_return_val_if_fail (line != NULL, NULL);
+
+       gline = g_slice_new (GgitDiffLine);
+       gline->ref_count = 1;
+       gline->origin = line->origin;
+       gline->old_lineno = line->old_lineno;
+       gline->new_lineno = line->new_lineno;
+       gline->content_len = line->content_len;
+       gline->content_offset = line->content_offset;
+       gline->content = line->content;
+
+       return gline;
+}
+
+/**
+ * ggit_diff_line_ref:
+ * @line: a #GgitDiffLine.
+ *
+ * Atomically increments the reference count of @line by one.
+ * This function is MT-safe and may be called from any thread.
+ *
+ * Returns: a #GgitDiffLine.
+ **/
+GgitDiffLine *
+ggit_diff_line_ref (GgitDiffLine *line)
+{
+       g_return_val_if_fail (line != NULL, NULL);
+
+       g_atomic_int_inc (&line->ref_count);
+
+       return line;
+}
+
+/**
+ * ggit_diff_line_unref:
+ * @line: a #GgitDiffLine.
+ *
+ * Atomically decrements the reference count of @line by one.
+ * If the reference count drops to 0, @line is freed.
+ **/
+void
+ggit_diff_line_unref (GgitDiffLine *line)
+{
+       g_return_if_fail (line != NULL);
+
+       if (g_atomic_int_dec_and_test (&line->ref_count))
+       {
+               g_slice_free (GgitDiffLine, line);
+       }
+}
+
+/**
+ * ggit_diff_line_get_origin:
+ * @line: a #GgitDiffLine.
+ *
+ * Gets the #GgitDiffLineType value.
+ *
+ * Returns: the #GgitDiffLineType value.
+ */
+gchar
+ggit_diff_line_get_origin (GgitDiffLine *line)
+{
+       g_return_val_if_fail (line != NULL, 0);
+
+       return line->origin;
+}
+
+/**
+ * ggit_diff_line_get_old_lineno:
+ * @line: a #GgitDiffLine.
+ *
+ * Gets the line number in old file or -1 for added line.
+ *
+ * Returns: the line's old line number.
+ */
+gint
+ggit_diff_line_get_old_lineno (GgitDiffLine *line)
+{
+       g_return_val_if_fail (line != NULL, 0);
+
+       return line->old_lineno;
+}
+
+/**
+ * ggit_diff_line_get_new_lineno:
+ * @line: a #GgitDiffLine.
+ *
+ * Gets the Line number in new file or -1 for deleted line.
+ *
+ * Returns: the line's old number of lines.
+ */
+gint
+ggit_diff_line_get_new_lineno (GgitDiffLine *line)
+{
+       g_return_val_if_fail (line != NULL, 0);
+
+       return line->new_lineno;
+}
+
+/**
+ * ggit_diff_line_get_content_len:
+ * @line: a #GgitDiffLine.
+ *
+ * Gets the content length.
+ *
+ * Returns: the content length.
+ */
+gsize
+ggit_diff_line_get_content_len (GgitDiffLine *line)
+{
+       g_return_val_if_fail (line != NULL, 0);
+
+       return line->content_len;
+}
+
+/**
+ * ggit_diff_line_get_content_offset:
+ * @line: a #GgitDiffLine.
+ *
+ * Gets the content offset.
+ *
+ * Returns: the content offset.
+ */
+gint64
+ggit_diff_line_get_content_offset (GgitDiffLine *line)
+{
+       g_return_val_if_fail (line != NULL, 0);
+
+       return line->content_offset;
+}
+
+/**
+ * ggit_diff_line_get_content:
+ * @line: a #GgitDiffLine.
+ *
+ * Gets the content.
+ *
+ * Returns: the content.
+ */
+const gchar *
+ggit_diff_line_get_content (GgitDiffLine *line)
+{
+       g_return_val_if_fail (line != NULL, 0);
+
+       return line->content;
+}
+
+/* ex:set ts=8 noet: */
diff --git a/libgit2-glib/ggit-diff-line.h b/libgit2-glib/ggit-diff-line.h
new file mode 100644
index 0000000..31ba20c
--- /dev/null
+++ b/libgit2-glib/ggit-diff-line.h
@@ -0,0 +1,49 @@
+/*
+ * ggit-diff-line.h
+ * This file is part of libgit2-glib
+ *
+ * Copyright (C) 2012 - Garrett Regier
+ *
+ * libgit2-glib is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * libgit2-glib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libgit2-glib. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GGIT_DIFF_LINE_H__
+#define __GGIT_DIFF_LINE_H__
+
+#include "ggit-types.h"
+
+G_BEGIN_DECLS
+
+#define GGIT_TYPE_DIFF_LINE       (ggit_diff_line_get_type ())
+#define GGIT_DIFF_LINE(obj)       ((GgitDiffLine *)obj)
+
+GType           ggit_diff_line_get_type           (void) G_GNUC_CONST;
+
+GgitDiffLine  *_ggit_diff_line_wrap               (const git_diff_line *line);
+
+GgitDiffLine   *ggit_diff_line_ref                (GgitDiffLine        *line);
+void            ggit_diff_line_unref              (GgitDiffLine        *line);
+
+gchar           ggit_diff_line_get_origin         (GgitDiffLine        *line);
+gint            ggit_diff_line_get_old_lineno     (GgitDiffLine        *line);
+gint            ggit_diff_line_get_new_lineno     (GgitDiffLine        *line);
+gsize           ggit_diff_line_get_content_len    (GgitDiffLine        *line);
+gint64          ggit_diff_line_get_content_offset (GgitDiffLine        *line);
+const gchar    *ggit_diff_line_get_content        (GgitDiffLine        *line);
+
+G_END_DECLS
+
+#endif /* __GGIT_DIFF_LINE_H__ */
+
+/* ex:set ts=8 noet: */
diff --git a/libgit2-glib/ggit-diff.c b/libgit2-glib/ggit-diff.c
index 24ed3e2..43d078c 100644
--- a/libgit2-glib/ggit-diff.c
+++ b/libgit2-glib/ggit-diff.c
@@ -23,7 +23,7 @@
 #include "ggit-diff.h"
 #include "ggit-diff-delta.h"
 #include "ggit-diff-options.h"
-#include "ggit-diff-range.h"
+#include "ggit-diff-line.h"
 #include "ggit-patch.h"
 #include "ggit-error.h"
 #include "ggit-repository.h"