diff master to douban

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vendor/libgit2"]
+	path = vendor/libgit2
+	url = https://github.com/libgit2/libgit2.git

docs/objects.rst

@@ -216,6 +216,7 @@ committer and others.
 .. autoattribute:: pygit2.Commit.committer
 .. autoattribute:: pygit2.Commit.message
 .. autoattribute:: pygit2.Commit.message_encoding
+.. autoattribute:: pygit2.Commit.raw_message
 .. autoattribute:: pygit2.Commit.tree
 .. autoattribute:: pygit2.Commit.parents
 .. autoattribute:: pygit2.Commit.commit_time
@@ -232,7 +233,9 @@ objects::
     <pygit2.Signature object at 0x7f75e9b1f5f8>
 
 .. autoattribute:: pygit2.Signature.name
+.. autoattribute:: pygit2.Signature.raw_name
 .. autoattribute:: pygit2.Signature.email
+.. autoattribute:: pygit2.Signature.raw_email
 .. autoattribute:: pygit2.Signature.time
 .. autoattribute:: pygit2.Signature.offset
 
@@ -267,6 +270,8 @@ A tag is a static label for a commit. See references for more information.
 .. autoattribute:: pygit2.Tag.tagger
 .. autoattribute:: pygit2.Tag.message
 
+.. automethod:: pygit2.Tag.get_object
+
 
 Creating tags
 --------------------

docs/recipes/git-log.rst

@@ -16,7 +16,7 @@ Show HEAD commit
 
 .. code-block:: python
 
-    >>> commit = repo[repo.head.oid]
+    >>> commit = repo[repo.head.target]
     >>> commit.message
     'commit message'
 
@@ -30,7 +30,7 @@ Traverse commit history
 
 .. code-block:: python
 
-    >>> last = repo[repo.head.oid]
+    >>> last = repo[repo.head.target]
     >>> for commit in repo.walk(last.oid, pygit2.GIT_SORT_TIME):
     >>>     print(commit.message) # or some other operation
 

docs/references.rst

@@ -38,7 +38,7 @@ Example. These two lines are equivalent::
 
 .. autoattribute:: pygit2.Repository.head
 .. autoattribute:: pygit2.Repository.head_is_detached
-.. autoattribute:: pygit2.Repository.head_is_orphaned
+.. autoattribute:: pygit2.Repository.head_is_unborn
 
 Branches
 ====================

docs/remotes.rst

@@ -15,4 +15,5 @@ The Remote type
 .. autoattribute:: pygit2.Remote.refspec_count
 .. automethod:: pygit2.Remote.get_refspec
 .. automethod:: pygit2.Remote.fetch
+.. automethod:: pygit2.Remote.push
 .. automethod:: pygit2.Remote.save

pygit2/repository.py

@@ -134,7 +134,7 @@ def checkout(self, refname=None, strategy=GIT_CHECKOUT_SAFE_CREATE):
     # Diff
     #
     def diff(self, a=None, b=None, cached=False, flags=GIT_DIFF_NORMAL,
-             context_lines=3, interhunk_lines=0):
+             context_lines=3, interhunk_lines=0, paths=None):
         """
         Show changes between the working tree and the index or a tree,
         changes between the index and a tree, changes between two trees, or
@@ -156,6 +156,9 @@ def diff(self, a=None, b=None, cached=False, flags=GIT_DIFF_NORMAL,
             the maximum number of unchanged lines between hunk
             boundaries before the hunks will be merged into a one
 
+        paths
+            paths to diff
+
         Examples::
 
           # Changes in the working tree not yet staged for the next commit
@@ -192,8 +195,8 @@ def treeish_to_tree(obj):
         a = treeish_to_tree(a) or a
         b = treeish_to_tree(b) or b
 
-        opt_keys = ['flags', 'context_lines', 'interhunk_lines']
-        opt_values = [flags, context_lines, interhunk_lines]
+        opt_keys = ['flags', 'context_lines', 'interhunk_lines', 'paths']
+        opt_values = [flags, context_lines, interhunk_lines, paths]
 
         # Case 1: Diff tree to tree
         if isinstance(a, Tree) and isinstance(b, Tree):

setup.py

@@ -40,6 +40,7 @@
 from subprocess import Popen, PIPE
 import sys
 import unittest
+import shutil
 
 # Read version from local pygit2/version.py without pulling in
 # pygit2/__init__.py
@@ -53,19 +54,46 @@
 else:
     u = str
 
+print('checkout libgit2 source')
+popen = Popen(['git', 'submodule', 'update', '--init'], stdout=PIPE, stderr=PIPE)
+stdoutdata, stderrdata = popen.communicate()
+if popen.returncode != 0:
+    print(stderrdata)
+    sys.exit()
 
+pygit2_libs = ['git2']
 # Use environment variable LIBGIT2 to set your own libgit2 configuration.
 libgit2_path = os.getenv("LIBGIT2")
-if libgit2_path is None:
+if libgit2_path:
+    libgit2_bin = os.path.join(libgit2_path, 'bin')
+    libgit2_include = os.path.join(libgit2_path, 'include')
+    libgit2_lib = os.getenv('LIBGIT2_LIB', os.path.join(libgit2_path, 'lib'))
+else:
     if os.name == 'nt':
         program_files = os.getenv("ProgramFiles")
         libgit2_path = '%s\libgit2' % program_files
     else:
-        libgit2_path = '/usr/local'
+        # use libgit2 embed
+        cwd = os.path.dirname(os.path.realpath(__file__))
+        libgit2_dir = os.path.join(cwd, 'vendor', 'libgit2')
+        libgit2_lib_path = cwd + "/libgit2_embed.a"
+        if os.path.isfile(libgit2_lib_path):
+            os.remove(libgit2_lib_path)
+        if not os.path.isfile(libgit2_lib_path):
+            os.chdir(libgit2_dir)
+            print('build libgit2 embed')
+            popen = Popen(['make', '-f', 'Makefile.embed'], stdout=PIPE, stderr=PIPE)
+            stdoutdata, stderrdata = popen.communicate()
+            if popen.returncode != 0:
+                print(stderrdata)
+                sys.exit()
+            shutil.copy('libgit2.a', libgit2_lib_path)
+            os.chdir(cwd)
+        libgit2_bin = ''
+        libgit2_include = os.path.join(libgit2_dir, 'include')
+        libgit2_lib = cwd
+        pygit2_libs = ['git2_embed']
 
-libgit2_bin = os.path.join(libgit2_path, 'bin')
-libgit2_include = os.path.join(libgit2_path, 'include')
-libgit2_lib = os.getenv('LIBGIT2_LIB', os.path.join(libgit2_path, 'lib'))
 pygit2_exts = [os.path.join('src', name) for name in os.listdir('src')
                if name.endswith('.c')]
 
@@ -188,6 +216,6 @@ def get_file_list(self):
           Extension('_pygit2', pygit2_exts,
                     include_dirs=[libgit2_include, 'include'],
                     library_dirs=[libgit2_lib],
-                    libraries=['git2']),
+                    libraries=pygit2_libs),
       ],
       cmdclass=cmdclass)

src/blob.c

@@ -41,12 +41,24 @@ Blob_size__get__(Blob *self)
 }
 
 
+PyDoc_STRVAR(Blob_binary__doc__, "Binary.");
+
+PyObject *
+Blob_binary__get__(Blob *self)
+{
+    if (git_blob_is_binary(self->blob))
+        Py_RETURN_TRUE;
+    Py_RETURN_FALSE;
+}
+
+
 PyDoc_STRVAR(Blob_data__doc__,
   "The contents of the blob, a bytes string. This is the same as\n"
   "Blob.read_raw()");
 
 PyGetSetDef Blob_getseters[] = {
     GETTER(Blob, size),
+    GETTER(Blob, binary),
     {"data", (getter)Object_read_raw, NULL, Blob_data__doc__, NULL},
     {NULL}
 };