Rev 1380: Use ra set and get revprop functions. in http://people.samba.org/bzr/jelmer/bzr-svn/0.4
Jelmer Vernooij
jelmer at samba.org
Sun Jun 29 13:50:15 BST 2008
At http://people.samba.org/bzr/jelmer/bzr-svn/0.4
------------------------------------------------------------
revno: 1380
revision-id: jelmer at samba.org-20080629125013-wmt53sqxgninl4lx
parent: jelmer at samba.org-20080629124515-uup1u2ct8ltziy4m
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-06-29 14:50:13 +0200
message:
Use ra set and get revprop functions.
modified:
client.c client.pyx-20080313235339-wbyjbw2namuiql8f-1
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
=== modified file 'client.c'
--- a/client.c 2008-06-29 12:45:15 +0000
+++ b/client.c 2008-06-29 12:50:13 +0000
@@ -547,53 +547,6 @@
return ret;
}
-static PyObject *client_revprop_get(PyObject *self, PyObject *args)
-{
- PyObject *rev = Py_None;
- char *propname, *propval, *url;
- svn_revnum_t set_rev;
- svn_opt_revision_t c_rev;
- svn_string_t *c_val;
- ClientObject *client = (ClientObject *)self;
- apr_pool_t *temp_pool;
- PyObject *ret;
- if (!PyArg_ParseTuple(args, "sssO", &propname, &propval, &url, &rev))
- return NULL;
- if (!to_opt_revision(rev, &c_rev))
- return NULL;
- temp_pool = Pool(NULL);
- if (temp_pool == NULL)
- return NULL;
- RUN_SVN_WITH_POOL(temp_pool, svn_client_revprop_get(propname, &c_val, url,
- &c_rev, &set_rev, client->client, temp_pool));
- ret = Py_BuildValue("(z#i)", c_val->data, c_val->len, set_rev);
- apr_pool_destroy(temp_pool);
- return ret;
-}
-
-static PyObject *client_revprop_set(PyObject *self, PyObject *args)
-{
- PyObject *rev = Py_None;
- bool force = false;
- ClientObject *client = (ClientObject *)self;
- char *propname, *url;
- svn_revnum_t set_rev;
- svn_opt_revision_t c_rev;
- apr_pool_t *temp_pool;
- svn_string_t c_val;
- if (!PyArg_ParseTuple(args, "sz#s|Ob", &propname, &c_val.data, &c_val.len, &url, &rev, &force))
- return NULL;
- if (!to_opt_revision(rev, &c_rev))
- return NULL;
- temp_pool = Pool(NULL);
- if (temp_pool == NULL)
- return NULL;
- RUN_SVN_WITH_POOL(temp_pool, svn_client_revprop_set(propname, &c_val, url,
- &c_rev, &set_rev, force, client->client, temp_pool));
- apr_pool_destroy(temp_pool);
- return PyLong_FromLong(set_rev);
-}
-
static PyMethodDef client_methods[] = {
{ "add", (PyCFunction)client_add, METH_VARARGS|METH_KEYWORDS, NULL },
{ "checkout", (PyCFunction)client_checkout, METH_VARARGS|METH_KEYWORDS, NULL },
@@ -604,8 +557,6 @@
{ "propset", client_propset, METH_VARARGS, NULL },
{ "propget", client_propget, METH_VARARGS, NULL },
{ "update", client_update, METH_VARARGS, NULL },
- { "revprop_get", client_revprop_get, METH_VARARGS, NULL },
- { "revprop_set", client_revprop_set, METH_VARARGS, NULL },
{ NULL, }
};
=== modified file 'tests/__init__.py'
--- a/tests/__init__.py 2008-06-29 12:45:15 +0000
+++ b/tests/__init__.py 2008-06-29 12:50:13 +0000
@@ -202,10 +202,12 @@
return ret.values()[0]
def client_get_revprop(self, url, revnum, name):
- return self.client_ctx.revprop_get(name, url, revnum)[0]
+ r = ra.RemoteUrl(url)
+ return r.rev_proplist(revnum)[name]
def client_set_revprop(self, url, revnum, name, value):
- self.client_ctx.revprop_set(name, value, url, revnum, True)
+ r = ra.RemoteUrl(url)
+ r.change_rev_prop(revnum, name, value)
def client_commit(self, dir, message=None, recursive=True):
"""Commit current changes in specified working copy.
More information about the bazaar-commits
mailing list