802976535a
Adding the binary diff flag GIT_DIFF_SHOW_BINARY to pygit2. libgit2 0.23.0 already supports this constant to be used in diff flags and produces properly formated binary diffs.
421 lines
13 KiB
C
421 lines
13 KiB
C
/*
|
|
* Copyright 2010-2014 The pygit2 contributors
|
|
*
|
|
* This file is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License, version 2,
|
|
* as published by the Free Software Foundation.
|
|
*
|
|
* In addition to the permissions in the GNU General Public License,
|
|
* the authors give you unlimited permission to link the compiled
|
|
* version of this file into combinations with other programs,
|
|
* and to distribute those combinations without any restriction
|
|
* coming from the use of this file. (The General Public License
|
|
* restrictions do apply in other respects; for example, they cover
|
|
* modification of the file, and distribution when not linked into
|
|
* a combined executable.)
|
|
*
|
|
* This file 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
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, 51 Franklin Street, Fifth Floor,
|
|
* Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
#define PY_SSIZE_T_CLEAN
|
|
#include <Python.h>
|
|
|
|
#include <git2.h>
|
|
#include "error.h"
|
|
#include "types.h"
|
|
#include "utils.h"
|
|
#include "repository.h"
|
|
#include "oid.h"
|
|
#include "options.h"
|
|
|
|
extern PyObject *GitError;
|
|
|
|
extern PyTypeObject RepositoryType;
|
|
extern PyTypeObject OidType;
|
|
extern PyTypeObject ObjectType;
|
|
extern PyTypeObject CommitType;
|
|
extern PyTypeObject DiffType;
|
|
extern PyTypeObject DiffIterType;
|
|
extern PyTypeObject DiffDeltaType;
|
|
extern PyTypeObject DiffFileType;
|
|
extern PyTypeObject DiffHunkType;
|
|
extern PyTypeObject DiffLineType;
|
|
extern PyTypeObject DiffStatsType;
|
|
extern PyTypeObject PatchType;
|
|
extern PyTypeObject TreeType;
|
|
extern PyTypeObject TreeBuilderType;
|
|
extern PyTypeObject TreeEntryType;
|
|
extern PyTypeObject TreeIterType;
|
|
extern PyTypeObject BlobType;
|
|
extern PyTypeObject TagType;
|
|
extern PyTypeObject WalkerType;
|
|
extern PyTypeObject ReferenceType;
|
|
extern PyTypeObject RefLogIterType;
|
|
extern PyTypeObject RefLogEntryType;
|
|
extern PyTypeObject BranchType;
|
|
extern PyTypeObject SignatureType;
|
|
extern PyTypeObject RemoteType;
|
|
extern PyTypeObject RefspecType;
|
|
extern PyTypeObject NoteType;
|
|
extern PyTypeObject NoteIterType;
|
|
|
|
|
|
PyDoc_STRVAR(discover_repository__doc__,
|
|
"discover_repository(path[, across_fs[, ceiling_dirs]]) -> str\n"
|
|
"\n"
|
|
"Look for a git repository and return its path.");
|
|
|
|
PyObject *
|
|
discover_repository(PyObject *self, PyObject *args)
|
|
{
|
|
git_buf repo_path = {NULL};
|
|
const char *path;
|
|
PyObject *py_repo_path;
|
|
int across_fs = 0;
|
|
const char *ceiling_dirs = NULL;
|
|
int err;
|
|
|
|
if (!PyArg_ParseTuple(args, "s|Is", &path, &across_fs, &ceiling_dirs))
|
|
return NULL;
|
|
|
|
memset(&repo_path, 0, sizeof(git_buf));
|
|
err = git_repository_discover(&repo_path, path, across_fs, ceiling_dirs);
|
|
if (err < 0)
|
|
return Error_set_str(err, path);
|
|
|
|
py_repo_path = to_path(repo_path.ptr);
|
|
git_buf_free(&repo_path);
|
|
|
|
return py_repo_path;
|
|
};
|
|
|
|
PyDoc_STRVAR(hashfile__doc__,
|
|
"hashfile(path) -> Oid\n"
|
|
"\n"
|
|
"Returns the oid of a new blob from a file path without actually writing\n"
|
|
"to the odb.");
|
|
PyObject *
|
|
hashfile(PyObject *self, PyObject *args)
|
|
{
|
|
git_oid oid;
|
|
const char* path;
|
|
int err;
|
|
|
|
if (!PyArg_ParseTuple(args, "s", &path))
|
|
return NULL;
|
|
|
|
err = git_odb_hashfile(&oid, path, GIT_OBJ_BLOB);
|
|
if (err < 0)
|
|
return Error_set(err);
|
|
|
|
return git_oid_to_python(&oid);
|
|
}
|
|
|
|
PyDoc_STRVAR(hash__doc__,
|
|
"hash(data) -> Oid\n"
|
|
"\n"
|
|
"Returns the oid of a new blob from a string without actually writing to\n"
|
|
"the odb.");
|
|
PyObject *
|
|
hash(PyObject *self, PyObject *args)
|
|
{
|
|
git_oid oid;
|
|
const char *data;
|
|
Py_ssize_t size;
|
|
int err;
|
|
|
|
if (!PyArg_ParseTuple(args, "s#", &data, &size))
|
|
return NULL;
|
|
|
|
err = git_odb_hash(&oid, data, size, GIT_OBJ_BLOB);
|
|
if (err < 0) {
|
|
return Error_set(err);
|
|
}
|
|
|
|
return git_oid_to_python(&oid);
|
|
}
|
|
|
|
|
|
PyMethodDef module_methods[] = {
|
|
{"discover_repository", discover_repository, METH_VARARGS,
|
|
discover_repository__doc__},
|
|
{"hashfile", hashfile, METH_VARARGS, hashfile__doc__},
|
|
{"hash", hash, METH_VARARGS, hash__doc__},
|
|
{"option", option, METH_VARARGS, option__doc__},
|
|
{NULL}
|
|
};
|
|
|
|
PyObject *
|
|
moduleinit(PyObject* m)
|
|
{
|
|
if (m == NULL)
|
|
return NULL;
|
|
|
|
/* libgit2 version info */
|
|
ADD_CONSTANT_INT(m, LIBGIT2_VER_MAJOR)
|
|
ADD_CONSTANT_INT(m, LIBGIT2_VER_MINOR)
|
|
ADD_CONSTANT_INT(m, LIBGIT2_VER_REVISION)
|
|
ADD_CONSTANT_STR(m, LIBGIT2_VERSION)
|
|
|
|
/* libgit2 options */
|
|
ADD_CONSTANT_INT(m, GIT_OPT_GET_SEARCH_PATH);
|
|
ADD_CONSTANT_INT(m, GIT_OPT_SET_SEARCH_PATH);
|
|
ADD_CONSTANT_INT(m, GIT_OPT_GET_MWINDOW_SIZE);
|
|
ADD_CONSTANT_INT(m, GIT_OPT_SET_MWINDOW_SIZE);
|
|
|
|
/* Errors */
|
|
GitError = PyErr_NewException("_pygit2.GitError", NULL, NULL);
|
|
Py_INCREF(GitError);
|
|
PyModule_AddObject(m, "GitError", GitError);
|
|
|
|
/* Repository */
|
|
INIT_TYPE(RepositoryType, NULL, PyType_GenericNew)
|
|
ADD_TYPE(m, Repository)
|
|
|
|
/* Oid */
|
|
INIT_TYPE(OidType, NULL, PyType_GenericNew)
|
|
ADD_TYPE(m, Oid)
|
|
ADD_CONSTANT_INT(m, GIT_OID_RAWSZ)
|
|
ADD_CONSTANT_INT(m, GIT_OID_HEXSZ)
|
|
ADD_CONSTANT_STR(m, GIT_OID_HEX_ZERO)
|
|
ADD_CONSTANT_INT(m, GIT_OID_MINPREFIXLEN)
|
|
|
|
/*
|
|
* Objects
|
|
*/
|
|
INIT_TYPE(ObjectType, NULL, NULL)
|
|
INIT_TYPE(CommitType, &ObjectType, NULL)
|
|
INIT_TYPE(SignatureType, NULL, PyType_GenericNew)
|
|
INIT_TYPE(TreeType, &ObjectType, NULL)
|
|
INIT_TYPE(TreeEntryType, NULL, NULL)
|
|
INIT_TYPE(TreeIterType, NULL, NULL)
|
|
INIT_TYPE(TreeBuilderType, NULL, NULL)
|
|
INIT_TYPE(BlobType, &ObjectType, NULL)
|
|
INIT_TYPE(TagType, &ObjectType, NULL)
|
|
ADD_TYPE(m, Object)
|
|
ADD_TYPE(m, Commit)
|
|
ADD_TYPE(m, Signature)
|
|
ADD_TYPE(m, Tree)
|
|
ADD_TYPE(m, TreeEntry)
|
|
ADD_TYPE(m, TreeBuilder)
|
|
ADD_TYPE(m, Blob)
|
|
ADD_TYPE(m, Tag)
|
|
ADD_CONSTANT_INT(m, GIT_OBJ_ANY)
|
|
ADD_CONSTANT_INT(m, GIT_OBJ_COMMIT)
|
|
ADD_CONSTANT_INT(m, GIT_OBJ_TREE)
|
|
ADD_CONSTANT_INT(m, GIT_OBJ_BLOB)
|
|
ADD_CONSTANT_INT(m, GIT_OBJ_TAG)
|
|
/* Valid modes for index and tree entries. */
|
|
ADD_CONSTANT_INT(m, GIT_FILEMODE_TREE)
|
|
ADD_CONSTANT_INT(m, GIT_FILEMODE_BLOB)
|
|
ADD_CONSTANT_INT(m, GIT_FILEMODE_BLOB_EXECUTABLE)
|
|
ADD_CONSTANT_INT(m, GIT_FILEMODE_LINK)
|
|
ADD_CONSTANT_INT(m, GIT_FILEMODE_COMMIT)
|
|
|
|
/*
|
|
* Log
|
|
*/
|
|
INIT_TYPE(WalkerType, NULL, NULL)
|
|
ADD_TYPE(m, Walker);
|
|
ADD_CONSTANT_INT(m, GIT_SORT_NONE)
|
|
ADD_CONSTANT_INT(m, GIT_SORT_TOPOLOGICAL)
|
|
ADD_CONSTANT_INT(m, GIT_SORT_TIME)
|
|
ADD_CONSTANT_INT(m, GIT_SORT_REVERSE)
|
|
|
|
/*
|
|
* Reset
|
|
*/
|
|
ADD_CONSTANT_INT(m, GIT_RESET_SOFT)
|
|
ADD_CONSTANT_INT(m, GIT_RESET_MIXED)
|
|
ADD_CONSTANT_INT(m, GIT_RESET_HARD)
|
|
|
|
/*
|
|
* References
|
|
*/
|
|
INIT_TYPE(ReferenceType, NULL, NULL)
|
|
INIT_TYPE(RefLogEntryType, NULL, NULL)
|
|
INIT_TYPE(RefLogIterType, NULL, NULL)
|
|
INIT_TYPE(NoteType, NULL, NULL)
|
|
INIT_TYPE(NoteIterType, NULL, NULL)
|
|
ADD_TYPE(m, Reference)
|
|
ADD_TYPE(m, RefLogEntry)
|
|
ADD_TYPE(m, Note)
|
|
ADD_CONSTANT_INT(m, GIT_REF_INVALID)
|
|
ADD_CONSTANT_INT(m, GIT_REF_OID)
|
|
ADD_CONSTANT_INT(m, GIT_REF_SYMBOLIC)
|
|
ADD_CONSTANT_INT(m, GIT_REF_LISTALL)
|
|
|
|
/*
|
|
* Branches
|
|
*/
|
|
INIT_TYPE(BranchType, &ReferenceType, NULL);
|
|
ADD_TYPE(m, Branch)
|
|
ADD_CONSTANT_INT(m, GIT_BRANCH_LOCAL)
|
|
ADD_CONSTANT_INT(m, GIT_BRANCH_REMOTE)
|
|
|
|
/*
|
|
* Index & Working copy
|
|
*/
|
|
/* Status */
|
|
ADD_CONSTANT_INT(m, GIT_STATUS_CURRENT)
|
|
ADD_CONSTANT_INT(m, GIT_STATUS_INDEX_NEW)
|
|
ADD_CONSTANT_INT(m, GIT_STATUS_INDEX_MODIFIED)
|
|
ADD_CONSTANT_INT(m, GIT_STATUS_INDEX_DELETED)
|
|
ADD_CONSTANT_INT(m, GIT_STATUS_WT_NEW)
|
|
ADD_CONSTANT_INT(m, GIT_STATUS_WT_MODIFIED)
|
|
ADD_CONSTANT_INT(m, GIT_STATUS_WT_DELETED)
|
|
ADD_CONSTANT_INT(m, GIT_STATUS_IGNORED) /* Flags for ignored files */
|
|
ADD_CONSTANT_INT(m, GIT_STATUS_CONFLICTED)
|
|
/* Different checkout strategies */
|
|
ADD_CONSTANT_INT(m, GIT_CHECKOUT_NONE)
|
|
ADD_CONSTANT_INT(m, GIT_CHECKOUT_SAFE)
|
|
ADD_CONSTANT_INT(m, GIT_CHECKOUT_RECREATE_MISSING)
|
|
ADD_CONSTANT_INT(m, GIT_CHECKOUT_FORCE)
|
|
ADD_CONSTANT_INT(m, GIT_CHECKOUT_ALLOW_CONFLICTS)
|
|
ADD_CONSTANT_INT(m, GIT_CHECKOUT_REMOVE_UNTRACKED)
|
|
ADD_CONSTANT_INT(m, GIT_CHECKOUT_REMOVE_IGNORED)
|
|
ADD_CONSTANT_INT(m, GIT_CHECKOUT_UPDATE_ONLY)
|
|
ADD_CONSTANT_INT(m, GIT_CHECKOUT_DONT_UPDATE_INDEX)
|
|
ADD_CONSTANT_INT(m, GIT_CHECKOUT_NO_REFRESH)
|
|
ADD_CONSTANT_INT(m, GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH)
|
|
|
|
/*
|
|
* Diff
|
|
*/
|
|
INIT_TYPE(DiffType, NULL, NULL)
|
|
INIT_TYPE(DiffIterType, NULL, NULL)
|
|
INIT_TYPE(DiffDeltaType, NULL, NULL)
|
|
INIT_TYPE(DiffFileType, NULL, NULL)
|
|
INIT_TYPE(DiffHunkType, NULL, NULL)
|
|
INIT_TYPE(DiffLineType, NULL, NULL)
|
|
INIT_TYPE(DiffStatsType, NULL, NULL)
|
|
INIT_TYPE(PatchType, NULL, NULL)
|
|
ADD_TYPE(m, Diff)
|
|
ADD_TYPE(m, DiffDelta)
|
|
ADD_TYPE(m, DiffFile)
|
|
ADD_TYPE(m, DiffHunk)
|
|
ADD_TYPE(m, DiffLine)
|
|
ADD_TYPE(m, DiffStats)
|
|
ADD_TYPE(m, Patch)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_NORMAL)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_REVERSE)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_FORCE_TEXT)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_IGNORE_WHITESPACE)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_IGNORE_WHITESPACE_CHANGE)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_IGNORE_WHITESPACE_EOL)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_IGNORE_SUBMODULES)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_PATIENCE)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_MINIMAL)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_INCLUDE_IGNORED)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_INCLUDE_UNTRACKED)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_INCLUDE_UNMODIFIED)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_RECURSE_UNTRACKED_DIRS)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_RECURSE_UNTRACKED_DIRS)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_DISABLE_PATHSPEC_MATCH)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_IGNORE_CASE)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_SHOW_UNTRACKED_CONTENT)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_SKIP_BINARY_CHECK)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_SHOW_BINARY)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_INCLUDE_TYPECHANGE)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_INCLUDE_TYPECHANGE_TREES)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_RECURSE_IGNORED_DIRS)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_STATS_NONE)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_STATS_FULL)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_STATS_SHORT)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_STATS_NUMBER)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_STATS_INCLUDE_SUMMARY)
|
|
/* Flags for diff find similar */
|
|
/* --find-renames */
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_FIND_RENAMES)
|
|
/* --break-rewrites=N */
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_FIND_RENAMES_FROM_REWRITES)
|
|
/* --find-copies */
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_FIND_COPIES)
|
|
/* --find-copies-harder */
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED)
|
|
/* --break-rewrites=/M */
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_FIND_AND_BREAK_REWRITES)
|
|
|
|
/* DiffDelta and DiffFile flags */
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_FLAG_BINARY)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_FLAG_NOT_BINARY)
|
|
ADD_CONSTANT_INT(m, GIT_DIFF_FLAG_VALID_ID)
|
|
|
|
/* DiffDelta.status */
|
|
ADD_CONSTANT_INT(m, GIT_DELTA_UNMODIFIED)
|
|
ADD_CONSTANT_INT(m, GIT_DELTA_ADDED)
|
|
ADD_CONSTANT_INT(m, GIT_DELTA_DELETED)
|
|
ADD_CONSTANT_INT(m, GIT_DELTA_MODIFIED)
|
|
ADD_CONSTANT_INT(m, GIT_DELTA_RENAMED)
|
|
ADD_CONSTANT_INT(m, GIT_DELTA_COPIED)
|
|
ADD_CONSTANT_INT(m, GIT_DELTA_IGNORED)
|
|
ADD_CONSTANT_INT(m, GIT_DELTA_UNTRACKED)
|
|
ADD_CONSTANT_INT(m, GIT_DELTA_TYPECHANGE)
|
|
ADD_CONSTANT_INT(m, GIT_DELTA_UNREADABLE)
|
|
|
|
/* Config */
|
|
ADD_CONSTANT_INT(m, GIT_CONFIG_LEVEL_LOCAL);
|
|
ADD_CONSTANT_INT(m, GIT_CONFIG_LEVEL_GLOBAL);
|
|
ADD_CONSTANT_INT(m, GIT_CONFIG_LEVEL_XDG);
|
|
ADD_CONSTANT_INT(m, GIT_CONFIG_LEVEL_SYSTEM);
|
|
|
|
/* Blame */
|
|
ADD_CONSTANT_INT(m, GIT_BLAME_NORMAL)
|
|
ADD_CONSTANT_INT(m, GIT_BLAME_TRACK_COPIES_SAME_FILE)
|
|
ADD_CONSTANT_INT(m, GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES)
|
|
ADD_CONSTANT_INT(m, GIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES)
|
|
ADD_CONSTANT_INT(m, GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES)
|
|
|
|
/* Merge */
|
|
ADD_CONSTANT_INT(m, GIT_MERGE_ANALYSIS_NONE)
|
|
ADD_CONSTANT_INT(m, GIT_MERGE_ANALYSIS_NORMAL)
|
|
ADD_CONSTANT_INT(m, GIT_MERGE_ANALYSIS_UP_TO_DATE)
|
|
ADD_CONSTANT_INT(m, GIT_MERGE_ANALYSIS_FASTFORWARD)
|
|
ADD_CONSTANT_INT(m, GIT_MERGE_ANALYSIS_UNBORN)
|
|
|
|
/* Global initialization of libgit2 */
|
|
git_libgit2_init();
|
|
|
|
return m;
|
|
}
|
|
|
|
|
|
#if PY_MAJOR_VERSION < 3
|
|
PyMODINIT_FUNC
|
|
init_pygit2(void)
|
|
{
|
|
PyObject* m;
|
|
m = Py_InitModule3("_pygit2", module_methods,
|
|
"Python bindings for libgit2.");
|
|
moduleinit(m);
|
|
}
|
|
#else
|
|
struct PyModuleDef moduledef = {
|
|
PyModuleDef_HEAD_INIT,
|
|
"_pygit2", /* m_name */
|
|
"Python bindings for libgit2.", /* m_doc */
|
|
-1, /* m_size */
|
|
module_methods, /* m_methods */
|
|
NULL, /* m_reload */
|
|
NULL, /* m_traverse */
|
|
NULL, /* m_clear */
|
|
NULL, /* m_free */
|
|
};
|
|
|
|
PyMODINIT_FUNC
|
|
PyInit__pygit2(void)
|
|
{
|
|
PyObject* m;
|
|
m = PyModule_Create(&moduledef);
|
|
return moduleinit(m);
|
|
}
|
|
#endif
|