openstack/deb-python-pygit2
Code Issues Proposed changes

Merge remote-tracking branch 'xtao/binary'

Browse Source 
Conflicts:
	src/types.h
This commit is contained in:
J. David Ibáñez
2013-10-31 09:16:33 +01:00
parent c6d2a65d9f d0b366e866
commit b382d3c3c1
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/diff.c
View File

@@ -81,6 +81,7 @@ diff_get_patch_byindex(git_diff_list* list, size_t idx)
py_patch->new_file_path = delta->new_file.path; py_patch->new_file_path = delta->new_file.path;
py_patch->status = git_diff_status_char(delta->status); py_patch->status = git_diff_status_char(delta->status);
py_patch->similarity = delta->similarity; py_patch->similarity = delta->similarity;
py_patch->flags = delta->flags;
py_patch->old_oid = git_oid_allocfmt(&delta->old_file.oid); py_patch->old_oid = git_oid_allocfmt(&delta->old_file.oid);
py_patch->new_oid = git_oid_allocfmt(&delta->new_file.oid); py_patch->new_oid = git_oid_allocfmt(&delta->new_file.oid);
@@ -160,6 +161,22 @@ PyMemberDef Patch_members[] = {
{NULL} {NULL}
}; };
PyDoc_STRVAR(Patch_binary__doc__, "Binary.");
PyObject *
Patch_binary__get__(Patch *self)
{
if (!(self->flags & GIT_DIFF_FLAG_NOT_BINARY) &&
(self->flags & GIT_DIFF_FLAG_BINARY))
Py_RETURN_TRUE;
Py_RETURN_FALSE;
}
PyGetSetDef Patch_getseters[] = {
GETTER(Patch, binary),
{NULL}
};
PyDoc_STRVAR(Patch__doc__, "Diff patch object."); PyDoc_STRVAR(Patch__doc__, "Diff patch object.");
PyTypeObject PatchType = { PyTypeObject PatchType = {
@@ -192,7 +209,7 @@ PyTypeObject PatchType = {
0, /* tp_iternext */ 0, /* tp_iternext */
0, /* tp_methods */ 0, /* tp_methods */
Patch_members, /* tp_members */ Patch_members, /* tp_members */
0, /* tp_getset */ Patch_getseters, /* tp_getset */
0, /* tp_base */ 0, /* tp_base */
0, /* tp_dict */ 0, /* tp_dict */
0, /* tp_descr_get */ 0, /* tp_descr_get */

1
src/types.h
View File

@@ -115,6 +115,7 @@ typedef struct {
unsigned similarity; unsigned similarity;
unsigned additions; unsigned additions;
unsigned deletions; unsigned deletions;
unsigned flags;
} Patch; } Patch;
typedef struct { typedef struct {

1
test/test_diff.py
View File

@@ -175,6 +175,7 @@ class DiffTest(utils.BareRepoTestCase):
self.assertEqual(patch.old_file_path, 'a') self.assertEqual(patch.old_file_path, 'a')
self.assertEqual(patch.new_file_path, 'a') self.assertEqual(patch.new_file_path, 'a')
self.assertEqual(patch.binary, False)
_test(commit_a.tree.diff_to_tree(commit_b.tree)) _test(commit_a.tree.diff_to_tree(commit_b.tree))
_test(self.repo.diff(COMMIT_SHA1_1, COMMIT_SHA1_2)) _test(self.repo.diff(COMMIT_SHA1_1, COMMIT_SHA1_2))