Rev 1066: fix names in workingtree. in file:///data/jelmer/bzr-svn/cext/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/cext/

------------------------------------------------------------
revno: 1066
revision-id: jelmer at samba.org-20080603081355-uam9563226b7jweq
parent: jelmer at samba.org-20080603074309-gto9mwplhx59wb16
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Tue 2008-06-03 10:13:55 +0200
message:
  fix names in workingtree.
modified:
  client.c                       client.pyx-20080313235339-wbyjbw2namuiql8f-1
  wc.c                           wc.pyx-20080313142018-10l8l23vha2j9e6b-1
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'client.c'
--- a/client.c	2008-06-03 07:43:09 +0000
+++ b/client.c	2008-06-03 08:13:55 +0000
@@ -136,8 +136,9 @@
 static PyObject *client_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 {
     ClientObject *ret;
-    char *kwnames[] = { NULL };
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "", kwnames))
+	PyObject *config = Py_None;
+    char *kwnames[] = { "config", NULL };
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O", kwnames, &config))
         return NULL;
 
     ret = PyObject_New(ClientObject, &Client_Type);
@@ -155,6 +156,11 @@
 		PyObject_Del(ret);
         return NULL;
 	}
+
+	if (config != Py_None) {
+		PyErr_SetString(PyExc_NotImplementedError, "custom config not supported yet");
+	}
+
     return (PyObject *)ret;
 }
 

=== modified file 'wc.c'
--- a/wc.c	2008-06-03 05:32:05 +0000
+++ b/wc.c	2008-06-03 08:13:55 +0000
@@ -134,10 +134,17 @@
 static void entry_dealloc(PyObject *self)
 {
 	apr_pool_destroy(((EntryObject *)self)->pool);
+	PyObject_Del(self);
 }
 
 static PyMemberDef entry_members[] = {
+	{ "copyfrom_url", T_STRING, offsetof(EntryObject, entry.copyfrom_url), READONLY, NULL },
 	{ "url", T_STRING, offsetof(EntryObject, entry.url), READONLY, NULL },
+	{ "repos", T_STRING, offsetof(EntryObject, entry.repos), READONLY, NULL },
+	{ "schedule", T_INT, offsetof(EntryObject, entry.schedule), READONLY, NULL },
+	{ "kind", T_INT, offsetof(EntryObject, entry.kind), READONLY, NULL },
+	{ "revision", T_LONG, offsetof(EntryObject, entry.revision), READONLY, NULL },
+	{ "cmt_rev", T_LONG, offsetof(EntryObject, entry.cmt_rev), READONLY, NULL },
 	{ NULL, }
 };
 
@@ -145,6 +152,7 @@
 	PyObject_HEAD_INIT(&PyType_Type) 0,
 	.tp_name = "wc.Entry",
 	.tp_basicsize = sizeof(EntryObject),
+	.tp_flags = Py_TPFLAGS_HAVE_GC,
 	.tp_dealloc = entry_dealloc,
 	.tp_members = entry_members,
 };
@@ -517,6 +525,7 @@
 static void adm_dealloc(PyObject *self)
 {
 	apr_pool_destroy(((AdmObject *)self)->pool);
+	PyObject_Del(self);
 }
 
 static PyMethodDef adm_methods[] = { 
@@ -542,6 +551,7 @@
 	.tp_name = "wc.WorkingCopy",
 	.tp_basicsize = sizeof(AdmObject),
 	.tp_new = adm_init,
+	.tp_flags = Py_TPFLAGS_HAVE_GC,
 	.tp_dealloc = adm_dealloc,
 	.tp_methods = adm_methods,
 };

=== modified file 'workingtree.py'
--- a/workingtree.py	2008-05-31 02:14:56 +0000
+++ b/workingtree.py	2008-06-03 08:13:55 +0000
@@ -79,15 +79,14 @@
         self.bzrdir = bzrdir
         self._branch = branch
         self._get_wc()
-        status = svn.wc.revision_status(self.basedir, None, True, None, None)
-        self.base_revnum = status.max_rev
+        (min_rev, max_rev, switch, modified) = wc.revision_status(self.basedir, None, True, None)
+        self.base_revnum = max_rev
         self.base_tree = SvnBasisTree(self)
         self.base_revid = branch.generate_revision_id(self.base_revnum)
 
         self.read_working_inventory()
 
-        self.controldir = os.path.join(self.basedir, svn.wc.get_adm_dir(), 
-                                       'bzr')
+        self.controldir = os.path.join(self.basedir, wc.get_adm_dir(), 'bzr')
         try:
             os.makedirs(self.controldir)
             os.makedirs(os.path.join(self.controldir, 'lock'))