summaryrefslogtreecommitdiff
path: root/subvertpy
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@jelmer.uk>2016-07-24 16:06:04 +0000
committerJelmer Vernooij <jelmer@jelmer.uk>2016-07-24 16:06:04 +0000
commit9aeba95f892f92d813816fb5190017ae5b8d26e5 (patch)
treec9f7fccdd700ca5c9b81b1876e3d96a1278f091f /subvertpy
parent8552a36d368106dbcd9aedf9d5ffe115b83bc501 (diff)
More Python3 fixes.
Diffstat (limited to 'subvertpy')
-rw-r--r--subvertpy/client.c97
1 files changed, 49 insertions, 48 deletions
diff --git a/subvertpy/client.c b/subvertpy/client.c
index 0b9d2109..53e9580e 100644
--- a/subvertpy/client.c
+++ b/subvertpy/client.c
@@ -681,51 +681,52 @@ static PyObject *client_checkout(PyObject *self, PyObject *args, PyObject *kwarg
static PyObject *client_commit(PyObject *self, PyObject *args, PyObject *kwargs)
{
- PyObject *targets;
- ClientObject *client = (ClientObject *)self;
- bool recurse=true, keep_locks=true;
- apr_pool_t *temp_pool;
- svn_commit_info_t *commit_info = NULL;
- PyObject *ret;
- apr_array_header_t *apr_targets;
- PyObject *revprops = Py_None;
- char *kwnames[] = { "targets", "recurse", "keep_locks", "revprops", NULL };
+ PyObject *targets;
+ ClientObject *client = (ClientObject *)self;
+ bool recurse=true, keep_locks=true;
+ apr_pool_t *temp_pool;
+ svn_commit_info_t *commit_info = NULL;
+ PyObject *ret;
+ apr_array_header_t *apr_targets;
+ PyObject *revprops = Py_None;
+ char *kwnames[] = { "targets", "recurse", "keep_locks", "revprops", NULL };
#if ONLY_SINCE_SVN(1, 5)
- apr_hash_t *hash_revprops;
+ apr_hash_t *hash_revprops;
#endif
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|bbO", kwnames, &targets, &recurse, &keep_locks, &revprops))
- return NULL;
- temp_pool = Pool(NULL);
- if (temp_pool == NULL)
- return NULL;
- if (!path_list_to_apr_array(temp_pool, targets, &apr_targets)) {
- apr_pool_destroy(temp_pool);
- return NULL;
- }
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|bbO", kwnames, &targets, &recurse, &keep_locks, &revprops))
+ return NULL;
+ temp_pool = Pool(NULL);
+ if (temp_pool == NULL) {
+ return NULL;
+ }
+ if (!path_list_to_apr_array(temp_pool, targets, &apr_targets)) {
+ apr_pool_destroy(temp_pool);
+ return NULL;
+ }
- if (revprops != Py_None && !PyDict_Check(revprops)) {
- apr_pool_destroy(temp_pool);
- PyErr_SetString(PyExc_TypeError, "Expected dictionary with revision properties");
- return NULL;
- }
+ if (revprops != Py_None && !PyDict_Check(revprops)) {
+ apr_pool_destroy(temp_pool);
+ PyErr_SetString(PyExc_TypeError, "Expected dictionary with revision properties");
+ return NULL;
+ }
#if ONLY_SINCE_SVN(1, 5)
- if (revprops != Py_None) {
- hash_revprops = prop_dict_to_hash(temp_pool, revprops);
- if (hash_revprops == NULL) {
- apr_pool_destroy(temp_pool);
- return NULL;
- }
- } else {
- hash_revprops = NULL;
- }
+ if (revprops != Py_None) {
+ hash_revprops = prop_dict_to_hash(temp_pool, revprops);
+ if (hash_revprops == NULL) {
+ apr_pool_destroy(temp_pool);
+ return NULL;
+ }
+ } else {
+ hash_revprops = NULL;
+ }
- /* FIXME: Support keep_changelist and changelists */
- RUN_SVN_WITH_POOL(temp_pool, svn_client_commit4(&commit_info,
- apr_targets, recurse?svn_depth_infinity:svn_depth_files,
- keep_locks, false, NULL, hash_revprops,
- client->client, temp_pool));
+ /* FIXME: Support keep_changelist and changelists */
+ RUN_SVN_WITH_POOL(temp_pool, svn_client_commit4(&commit_info,
+ apr_targets, recurse?svn_depth_infinity:svn_depth_files,
+ keep_locks, false, NULL, hash_revprops,
+ client->client, temp_pool));
#else
if (revprops != Py_None && PyDict_Size(revprops) > 0) {
PyErr_SetString(PyExc_NotImplementedError,
@@ -1576,17 +1577,17 @@ static PyObject *client_log(PyObject *self, PyObject *args, PyObject *kwargs)
}
#endif
- if (!path_list_to_apr_array(temp_pool, paths, &apr_paths)) {
- apr_pool_destroy(temp_pool);
- return NULL;
- }
+ if (!path_list_to_apr_array(temp_pool, paths, &apr_paths)) {
+ apr_pool_destroy(temp_pool);
+ return NULL;
+ }
- if (revprops) {
- if (!path_list_to_apr_array(temp_pool, revprops, &apr_revprops)) {
- apr_pool_destroy(temp_pool);
- return NULL;
- }
- }
+ if (revprops) {
+ if (!path_list_to_apr_array(temp_pool, revprops, &apr_revprops)) {
+ apr_pool_destroy(temp_pool);
+ return NULL;
+ }
+ }
#if ONLY_SINCE_SVN(1, 6)
revision_range.start = c_start_rev;