Squashed commit of the following:

commit f618e30b21401aca34f77c7b7e05c710528697ae
Author: CJ Harries <[email protected]>
Date:   Sun Mar 18 08:23:37 2018 -0500

    Pass decoded value via valua and raw value via raw_value

commit 5a4203b
Merge: 8ca94fc 0c1f2d8
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 21:08:12 2018 -0500

    Merge branch 'feature/update-docs' into feature/return-config-entry-from-iter

commit 0c1f2d8
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 21:06:51 2018 -0500

    Add ConfigEntry docs

commit 67701ed
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 21:05:59 2018 -0500

    Update __iter__ docs

commit cdd9566
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 21:04:24 2018 -0500

    Document properties

commit 8f74752
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 21:02:51 2018 -0500

    Document decode_as_string

commit f938b49
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 21:01:59 2018 -0500

    Document _from_c

commit 8ca94fc
Merge: 835e711 52de16a
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 20:15:49 2018 -0500

    Merge branch 'feature/iterate-over-config-entries' into feature/return-config-entry-from-iter

commit 52de16a
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 20:15:08 2018 -0500

    Update test_iterator to consume ConfigEntr[ies]

commit e7798bb
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 20:03:39 2018 -0500

    Return entry, a ConfigEntry from ConfigIterator.__next__

commit 835e711
Merge: bbcb464 55604ca
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 20:02:45 2018 -0500

    Merge branch 'feature/decode-name' into feature/return-config-entry-from-iter

commit 55604ca
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 19:57:25 2018 -0500

    Return properly decoded entry.name

commit 44326fa
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 19:57:06 2018 -0500

    Decode ConfigEntry name without prompting

commit bbcb464
Merge: 74544d6 1c47ece
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 19:56:29 2018 -0500

    Merge branch 'feature/decode-value' into feature/return-config-entry-from-iter

commit 1c47ece
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 19:54:45 2018 -0500

    Return entry.value_string from __getitem__

commit cb873be
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 19:52:14 2018 -0500

    Return entry.value_string from ConfigMultivarIterator

commit 2e14065
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 19:51:53 2018 -0500

    Add value_string property, decode_as_string(entry.value)

commit 9d10675
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 19:51:13 2018 -0500

    Add decode_as_string method

commit 74544d6
Merge: 3d76e44 ae6eead
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 19:28:08 2018 -0500

    Merge branch 'feature/expose-entry-properties' into feature/return-config-entry-from-iter

commit ae6eead
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 19:26:07 2018 -0500

    Return simplified name from __next__

commit 6ca5789
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 19:25:11 2018 -0500

    Add name property

commit c9fdd27
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 19:24:47 2018 -0500

    Add level property

commit 3d76e44
Merge: 0f64ac4 f471b6d
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 19:23:54 2018 -0500

    Merge branch 'feature/return-config-entry-name-from-iter' into feature/return-config-entry-from-iter

commit f471b6d
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 19:20:30 2018 -0500

    Expose the proper name (entry._entry.name)

commit 6ef0abb
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 19:20:17 2018 -0500

    Return a ConfigEntry from _next_entry

commit f48d0d8
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 19:19:27 2018 -0500

    Only free the entry if it did not come from an iterator

commit df0e8b6
Author: CJ Harries <[email protected]>
Date:   Fri Mar 16 19:19:00 2018 -0500

    Add from_iterator creation flag

commit 0f64ac4
Author: J. David Ibáñez <[email protected]>
Date:   Sat Mar 10 17:04:14 2018 +0100

    Fix segfault when calling repr(repo) before init

    Fixes #775

commit 2d4c1f5
Author: Brandon Milton <[email protected]>
Date:   Mon Mar 5 09:18:43 2018 -0800

    Remove Repository.parse_diff, remove repo check from Diff.merge

commit 711e9eb
Author: Brandon Milton <[email protected]>
Date:   Sat Mar 3 11:14:40 2018 -0800

    Add static Diff.parse_diff

commit f1e9c3b
Merge: e2eaa46 fefd09e
Author: J. David Ibáñez <[email protected]>
Date:   Sat Mar 3 14:29:53 2018 +0100

    Merge remote-tracking branch 'ZenSecurity/master'

commit fefd09e
Author: Mikhail Yushkovskiy <[email protected]>
Date:   Sat Mar 3 14:09:32 2018 +0300

    Add my name, for the fame

commit e2eaa46
Author: J. David Ibáñez <[email protected]>
Date:   Sat Mar 3 10:52:45 2018 +0100

    Fix compile warning

Author: thecjharries

.mailmap

@@ -25,3 +25,4 @@ Vlad Temian <[email protected]>
 Xavier Delannoy <[email protected]>
 Xu Tao <[email protected]> <[email protected]>
 Xu Tao <[email protected]>
+Mikhail Yushkovskiy <[email protected]>

README.rst

@@ -28,7 +28,7 @@ How to install
 Authors
 ==============
 
-125 developers have contributed at least 1 commit to pygit2::
+126 developers have contributed at least 1 commit to pygit2::
 
   J. David Ibáñez           Carlos Martín Nieto       Nico von Geyso
   W. Trevor King            Dave Borowitz             Matthias Bartelmeß
@@ -71,7 +71,7 @@ Authors
   Peter Dave Hello          Philippe Ombredanne       Ridge Kennedy
   Ross Nicoll               Rui Abreu Ferreira        Sheeo
   Soasme                    Vladimir Rutsky           Yu Jianjian
-  chengyuhang               earl
+  chengyuhang               earl                      Mikhail Yushkovskiy
 
 
 License

docs/config.rst

@@ -17,8 +17,7 @@ The Config type
 .. method:: Config.__iter__()
 
    The :class:`Config` class has an iterator which can be used to loop
-   through all the entries in the configuration. Each element is a tuple
-   containing the name and the value of each configuration variable. Be
+   through all the entries in the configuration. Each element is a ``ConfigEntry`` object containing the name, level, and value of each configuration variable. Be
    aware that this may return multiple versions of each entry if they are
    set multiple times in the configuration files.
 
@@ -32,3 +31,14 @@ string. In order to apply the git-config parsing rules, you can use
 
 .. automethod:: pygit2.Config.get_bool
 .. automethod:: pygit2.Config.get_int
+
+
+The ConfigEntry type
+====================
+
+.. automethod:: pygit2.ConfigEntry.decode_as_string
+.. automethod:: pygit2.ConfigEntry._from_c
+.. automethod:: pygit2.ConfigEntry.name
+.. automethod:: pygit2.ConfigEntry.level
+.. automethod:: pygit2.ConfigEntry.value
+.. automethod:: pygit2.ConfigEntry.value_string

pygit2/config.py

@@ -56,20 +56,20 @@ def _next_entry(self):
         err = C.git_config_next(centry, self._iter)
         check_error(err)
 
-        return centry[0]
+        return ConfigEntry._from_c(centry[0], True)
 
     def next(self):
         return self.__next__()
 
     def __next__(self):
         entry = self._next_entry()
-        return ffi.string(entry.name).decode('utf-8')
+        return entry
 
 
 class ConfigMultivarIterator(ConfigIterator):
     def __next__(self):
         entry = self._next_entry()
-        return ffi.string(entry.value).decode('utf-8')
+        return entry.value
 
 
 class Config(object):
@@ -128,7 +128,7 @@ def __contains__(self, key):
     def __getitem__(self, key):
         entry = self._get_entry(key)
 
-        return ffi.string(entry.value).decode('utf-8')
+        return entry.value
 
     def __setitem__(self, key, value):
         assert_string(key, "key")
@@ -195,7 +195,7 @@ def get_bool(self, key):
 
         entry = self._get_entry(key)
         res = ffi.new('int *')
-        err = C.git_config_parse_bool(res, entry.value)
+        err = C.git_config_parse_bool(res, entry.raw_value)
         check_error(err)
 
         return res[0] != 0
@@ -210,7 +210,7 @@ def get_int(self, key):
 
         entry = self._get_entry(key)
         res = ffi.new('int64_t *')
-        err = C.git_config_parse_int64(res, entry.value)
+        err = C.git_config_parse_int64(res, entry.raw_value)
         check_error(err)
 
         return res[0]
@@ -291,14 +291,46 @@ class ConfigEntry(object):
     """
 
     @classmethod
-    def _from_c(cls, ptr):
+    def _from_c(cls, ptr, from_iterator=False):
+        """Builds the entry from a ``git_config_entry`` pointer. ``from_iterator``
+        should be ``True`` when the entry was created during ``git_config_iterator``
+        actions
+        """
         entry = cls.__new__(cls)
         entry._entry = ptr
+        entry.from_iterator = from_iterator
         return entry
 
     def __del__(self):
-        C.git_config_entry_free(self._entry)
+        if not self.from_iterator:
+            C.git_config_entry_free(self._entry)
 
     @property
     def value(self):
+        """The entry's value as a string
+        """
+        return self.decode_as_string(self._entry.value)
+
+    @property
+    def level(self):
+        """The entry's ``git_config_level_t`` value
+        """
+        return self._entry.level
+
+    @property
+    def name(self):
+        """The entry's name
+        """
+        return self.decode_as_string(self._entry.name)
+
+    @property
+    def raw_value(self):
+        """The raw ``cData`` entry value
+        """
         return self._entry.value
+
+    @staticmethod
+    def decode_as_string(value):
+        """Returns ``value`` as a decoded ``utf-8`` string.
+        """
+        return ffi.string(value).decode('utf-8')

src/commit.c

@@ -73,9 +73,9 @@ Commit_gpg_signature__get__(Commit *commit)
     git_buf gpg_signature = { NULL }, signed_data = { NULL };
     PyObject *py_gpg_signature, *py_signed_data;
 
-    git_oid *oid = git_commit_id(commit->commit);
+    const git_oid *oid = git_commit_id(commit->commit);
     int err = git_commit_extract_signature(
-        &gpg_signature, &signed_data, commit->repo->repo, oid, NULL
+        &gpg_signature, &signed_data, commit->repo->repo, (git_oid*) oid, NULL
     );
 
     if (err != GIT_OK){

src/diff.c

@@ -54,7 +54,7 @@ wrap_diff(git_diff *diff, Repository *repo)
 
     py_diff = PyObject_New(Diff, &DiffType);
     if (py_diff) {
-        Py_INCREF(repo);
+        Py_XINCREF(repo);
         py_diff->repo = repo;
         py_diff->diff = diff;
     }
@@ -831,9 +831,6 @@ Diff_merge(Diff *self, PyObject *args)
     if (!PyArg_ParseTuple(args, "O!", &DiffType, &py_diff))
         return NULL;
 
-    if (py_diff->repo->repo != self->repo->repo)
-        return Error_set(GIT_ERROR);
-
     err = git_diff_merge(self->diff, py_diff->diff);
     if (err < 0)
         return Error_set(err);
@@ -901,6 +898,32 @@ Diff_stats__get__(Diff *self)
     return wrap_diff_stats(self->diff);
 }
 
+PyDoc_STRVAR(Diff_parse_diff__doc__,
+    "parse_diff(git_diff: str) -> Diff\n"
+    "\n"
+    "Parses a git unified diff into a diff object without a repository");
+
+static PyObject *
+Diff_parse_diff(PyObject *self, PyObject *args)
+{
+  /* A wrapper around
+   * git_diff_from_buffer
+  */
+  git_diff *diff;
+  const char *content = NULL;
+  Py_ssize_t content_len;
+  int err;
+
+  if (!PyArg_ParseTuple(args, "s#", &content, &content_len))
+    return NULL;
+
+  err = git_diff_from_buffer(&diff, content, content_len);
+  if (err < 0)
+    return Error_set(err);
+
+  return wrap_diff(diff, NULL);
+}
+
 static void
 Diff_dealloc(Diff *self)
 {
@@ -926,6 +949,8 @@ static PyMethodDef Diff_methods[] = {
     METHOD(Diff, merge, METH_VARARGS),
     METHOD(Diff, find_similar, METH_VARARGS | METH_KEYWORDS),
     METHOD(Diff, from_c, METH_STATIC | METH_VARARGS),
+    {"parse_diff", (PyCFunction) Diff_parse_diff,
+      METH_VARARGS | METH_STATIC, Diff_parse_diff__doc__},
     {NULL}
 };
 

src/repository.c

@@ -519,6 +519,9 @@ PyDoc_STRVAR(Repository_path__doc__,
 PyObject *
 Repository_path__get__(Repository *self, void *closure)
 {
+    if (self->repo == NULL)
+      Py_RETURN_NONE;
+
     return to_path(git_repository_path(self->repo));
 }
 
@@ -1465,32 +1468,6 @@ Repository_create_reference_symbolic(Repository *self,  PyObject *args,
     return wrap_reference(c_reference, self);
 }
 
-PyDoc_STRVAR(Repository_parse_diff__doc__,
-  "parse_diff(git_diff: str) -> Diff\n"
-  "\n"
-  "Parses a git unified diff into a diff object applied to the repository");
-
-PyObject *
-Repository_parse_diff(PyObject *self, PyObject *args)
-{
-  /* A wrapper around
-   * git_diff_from_buffer
-  */
-  git_diff *diff;
-  const char *content = NULL;
-  Py_ssize_t content_len;
-  int err;
-
-  if (!PyArg_ParseTuple(args, "s#", &content, &content_len))
-    return NULL;
-
-  err = git_diff_from_buffer(&diff, content, content_len);
-  if (err < 0)
-    return Error_set(err);
-
-  return wrap_diff(diff, (Repository *) self);
-}
-
 PyDoc_STRVAR(Repository_status__doc__,
   "status() -> {str: int}\n"
   "\n"
@@ -1839,7 +1816,6 @@ PyMethodDef Repository_methods[] = {
     METHOD(Repository, init_submodules, METH_VARARGS | METH_KEYWORDS),
     METHOD(Repository, lookup_reference, METH_O),
     METHOD(Repository, revparse_single, METH_O),
-    METHOD(Repository, parse_diff, METH_VARARGS),
     METHOD(Repository, status, METH_NOARGS),
     METHOD(Repository, status_file, METH_O),
     METHOD(Repository, notes, METH_VARARGS),

test/test_config.py

@@ -173,8 +173,9 @@ def test_iterator(self):
         config = self.repo.config
         lst = {}
 
-        for name in config:
-            lst[name] = config[name]
+        for entry in config:
+            self.assertGreater(entry.level, -1)
+            lst[entry.name] = entry.value
 
         self.assertTrue('core.bare' in lst)
         self.assertTrue(lst['core.bare'])

test/test_diff.py

@@ -29,6 +29,7 @@
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
+import textwrap
 import unittest
 import pygit2
 from pygit2 import GIT_DIFF_INCLUDE_UNMODIFIED
@@ -343,6 +344,33 @@ def test_deltas(self):
             # As explained in the libgit2 documentation, flags are not set
             #self.assertEqual(delta.flags, patch_delta.flags)
 
+    def test_diff_parse(self):
+        diff = pygit2.Diff.parse_diff(PATCH)
+
+        stats = diff.stats
+        self.assertEqual(2, stats.deletions)
+        self.assertEqual(1, stats.insertions)
+        self.assertEqual(2, stats.files_changed)
+
+        deltas = list(diff.deltas)
+        self.assertEqual(2, len(deltas))
+
+    def test_parse_diff_null(self):
+        with self.assertRaises(Exception):
+            self.repo.parse_diff(None)
+
+    def test_parse_diff_bad(self):
+        diff = textwrap.dedent(
+        """
+        diff --git a/file1 b/file1
+        old mode 0644
+        new mode 0644
+        @@ -1,1 +1,1 @@
+        -Hi!
+        """)
+        with self.assertRaises(Exception):
+            self.repo.parse_diff(diff)
+
 
 class BinaryDiffTest(utils.BinaryFileRepoTestCase):
     def test_binary_diff(self):

test/test_repository.py

@@ -35,7 +35,6 @@
 import binascii
 import unittest
 import tempfile
-import textwrap
 import os
 from os.path import join, realpath
 import sys
@@ -197,45 +196,6 @@ def test_hash(self):
         written_sha1 = self.repo.create_blob(data)
         self.assertEqual(hashed_sha1, written_sha1)
 
-    def test_parse_diff_null(self):
-        with self.assertRaises(Exception):
-            self.repo.parse_diff(None)
-
-    def test_parse_diff_bad(self):
-        diff = textwrap.dedent(
-        """
-        diff --git a/file1 b/file1
-        old mode 0644
-        new mode 0644
-        @@ -1,1 +1,1 @@
-        -Hi!
-        """)
-        with self.assertRaises(Exception):
-            self.repo.parse_diff(diff)
-
-    def test_parse_diff(self):
-        diff = textwrap.dedent(
-        """
-        diff --git a/file1 b/file1
-        old mode 0644
-        new mode 0644
-        @@ -1,1 +1,1 @@
-        -Hello, world!
-        +Hola, Mundo!
-        """
-        )
-        git_diff = self.repo.parse_diff(diff)
-        stats = git_diff.stats
-        deltas = list(git_diff.deltas)
-
-        self.assertEqual(1, stats.deletions)
-        self.assertEqual(1, stats.insertions)
-        self.assertEqual(1, stats.files_changed)
-
-        self.assertEqual(1, len(deltas))
-        self.assertEqual("file1", deltas[0].old_file.path)
-        self.assertEqual("file1", deltas[0].new_file.path)
-
     def test_hashfile(self):
         data = "bazbarfoo"
         handle, tempfile_path = tempfile.mkstemp()