Cosmetic review

Author: jdavid

pygit2/repository.py

@@ -374,6 +374,30 @@ def set_head(self, target):
     #
     # Diff
     #
+    def __whatever_to_tree_or_blob(self, obj):
+        if obj is None:
+            return None
+
+        # If it's a string, then it has to be valid revspec
+        if isinstance(obj, str):
+            obj = self.revparse_single(obj)
+        elif isinstance(obj, Oid):
+            obj = self[obj]
+
+        # First we try to get to a blob
+        try:
+            obj = obj.peel(Blob)
+        except Exception:
+            # And if that failed, try to get a tree, raising a type
+            # error if that still doesn't work
+            try:
+                obj = obj.peel(Tree)
+            except Exception:
+                raise TypeError('unexpected "%s"' % type(obj))
+
+        return obj
+
+
     def diff(self, a=None, b=None, cached=False, flags=GIT_DIFF_NORMAL,
              context_lines=3, interhunk_lines=0):
         """
@@ -433,29 +457,8 @@ def diff(self, a=None, b=None, cached=False, flags=GIT_DIFF_NORMAL,
         API (Tree.diff_to_tree()) directly.
         """
 
-        def whatever_to_tree_or_blob(obj):
-            if obj is None:
-                return None
-
-            # If it's a string, then it has to be valid revspec
-            if isinstance(obj, str):
-                obj = self.revparse_single(obj)
-
-            # First we try to get to a blob
-            try:
-                obj = obj.peel(Blob)
-            except Exception:
-                # And if that failed, try to get a tree, raising a type
-                # error if that still doesn't work
-                try:
-                    obj = obj.peel(Tree)
-                except Exception:
-                    raise TypeError('unexpected "%s"' % type(obj))
-
-            return obj
-
-        a = whatever_to_tree_or_blob(a)
-        b = whatever_to_tree_or_blob(b)
+        a = self.__whatever_to_tree_or_blob(a)
+        b = self.__whatever_to_tree_or_blob(b)
 
         opt_keys = ['flags', 'context_lines', 'interhunk_lines']
         opt_values = [flags, context_lines, interhunk_lines]

src/note.c

@@ -71,13 +71,15 @@ Note_message__get__(Note *self)
 {
     int err;
 
-    if (self->note)
-        return to_unicode(git_note_message(self->note), NULL, NULL);
-
-    err = git_note_read(&self->note, self->repo->repo, self->ref,
-                        &((Oid *)self->annotated_id)->oid);
-    if (err < 0)
-        return Error_set(err);
+    // Lazy load
+    if (self->note == NULL) {
+        err = git_note_read(&self->note,
+                            self->repo->repo,
+                            self->ref,
+                            &((Oid *)self->annotated_id)->oid);
+        if (err < 0)
+            return Error_set(err);
+    }
 
     return to_unicode(git_note_message(self->note), NULL, NULL);
 }

src/repository.c

@@ -347,12 +347,12 @@ Repository_revparse_single(Repository *self, PyObject *py_spec)
 
     /* 2- Lookup */
     err = git_revparse_single(&c_obj, self->repo, c_spec);
-
     if (err < 0) {
         PyObject *err_obj = Error_set_str(err, c_spec);
         Py_DECREF(tspec);
         return err_obj;
     }
+
     Py_DECREF(tspec);
 
     return wrap_object(c_obj, self, NULL);
@@ -678,28 +678,27 @@ Repository_walk(Repository *self, PyObject *args)
     /* Push */
     if (value != Py_None) {
         err = py_oid_to_git_oid_expand(self->repo, value, &oid);
-        if (err < 0) {
-            git_revwalk_free(walk);
-            return NULL;
-        }
+        if (err < 0)
+            goto error;
 
         err = git_revwalk_push(walk, &oid);
         if (err < 0) {
-            git_revwalk_free(walk);
-            return Error_set(err);
+            Error_set(err);
+            goto error;
         }
     }
 
     py_walker = PyObject_New(Walker, &WalkerType);
-    if (!py_walker) {
-        git_revwalk_free(walk);
-        return NULL;
+    if (py_walker) {
+        Py_INCREF(self);
+        py_walker->repo = self;
+        py_walker->walk = walk;
+        return (PyObject*)py_walker;
     }
 
-    Py_INCREF(self);
-    py_walker->repo = self;
-    py_walker->walk = walk;
-    return (PyObject*)py_walker;
+error:
+    git_revwalk_free(walk);
+    return NULL;
 }
 
 

src/types.h

@@ -107,10 +107,10 @@ SIMPLE_TYPE(Worktree, git_worktree, worktree)
 typedef struct {
     PyObject_HEAD
     Repository *repo;
-    git_note *note;
-    PyObject* annotated_id;
-    PyObject* id;
     const char *ref;
+    PyObject *annotated_id;
+    PyObject *id;
+    git_note *note;
 } Note;
 
 typedef struct {