Rev 989: More crash fixes. in file:///data/jelmer/bzr-svn/pyrex/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 989
revision-id:jelmer at samba.org-20080316055659-m017wg353pvfe9ai
parent: jelmer at samba.org-20080316054130-9cxetonsebnsjeem
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Sun 2008-03-16 06:56:59 +0100
message:
  More crash fixes.
modified:
  branchprops.py                 branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
  client.pyx                     client.pyx-20080313235339-wbyjbw2namuiql8f-1
  ra.pyx                         ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
  tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
  wc.pyx                         wc.pyx-20080313142018-10l8l23vha2j9e6b-1
=== modified file 'branchprops.py'
--- a/branchprops.py	2008-03-16 02:16:20 +0000
+++ b/branchprops.py	2008-03-16 05:56:59 +0000
@@ -111,8 +111,6 @@
         if prev_path is None and prev_revnum == -1:
             previous = {}
         else:
-            import pdb
-            pdb.set_trace()
             previous = self.get_properties(prev_path.encode("utf-8"), 
                                            prev_revnum)
         ret = {}

=== modified file 'client.pyx'
--- a/client.pyx	2008-03-16 05:24:21 +0000
+++ b/client.pyx	2008-03-16 05:56:59 +0000
@@ -171,7 +171,15 @@
 cdef object py_commit_info_tuple(svn_commit_info_t *ci):
     if ci == NULL:
         return None
-    return (ci.revision, ci.date, ci.author)
+    if ci.author == NULL:
+        py_author = None
+    else:
+        py_author = ci.author
+    if ci.date == NULL:
+        py_date = None
+    else:
+        py_date = ci.date
+    return (ci.revision, py_date, py_author)
 
 cdef class Client:
     cdef svn_client_ctx_t *client
@@ -231,6 +239,7 @@
         cdef svn_commit_info_t *commit_info
         cdef svn_opt_revision_t c_src_rev
         to_opt_revision(src_rev, &c_src_rev)
+        commit_info = NULL
         check_error(svn_client_copy3(&commit_info, src_path, 
                     &c_src_rev, dst_path, self.client, self.pool))
         return py_commit_info_tuple(commit_info)

=== modified file 'ra.pyx'
--- a/ra.pyx	2008-03-16 05:24:21 +0000
+++ b/ra.pyx	2008-03-16 05:56:59 +0000
@@ -790,14 +790,15 @@
         return ret
 
     def do_switch(self, revision_to_update_to, update_target, recurse, 
-                  update_editor):
+                  switch_url, update_editor):
         cdef svn_ra_reporter2_t *reporter
         cdef void *report_baton
         cdef apr_pool_t *temp_pool
         cdef Reporter ret
         temp_pool = Pool(self.pool)
-        check_error(svn_ra_do_update(self.ra, &reporter, &report_baton, 
+        check_error(svn_ra_do_switch(self.ra, &reporter, &report_baton, 
                      revision_to_update_to, update_target, recurse, 
+                     switch_url,
                      &py_editor, update_editor, temp_pool))
         ret = Reporter()
         ret.reporter = reporter

=== modified file 'tests/__init__.py'
--- a/tests/__init__.py	2008-03-15 20:33:59 +0000
+++ b/tests/__init__.py	2008-03-16 05:56:59 +0000
@@ -161,7 +161,7 @@
         :param oldpath: Relative path to original file.
         :param newpath: Relative path to new file.
         """
-        self.client_ctx.copy(oldpath, revnum, newpath)
+        self.client_ctx.copy(oldpath, newpath, revnum)
 
     def client_update(self, path):
         self.client_ctx.update(path, None, True)

=== modified file 'wc.pyx'
--- a/wc.pyx	2008-03-16 05:41:30 +0000
+++ b/wc.pyx	2008-03-16 05:56:59 +0000
@@ -151,7 +151,11 @@
         self.incomplete = incomplete
 
 cdef py_entry(svn_wc_entry_t *entry):
-    ret = Entry(entry.name, entry.revision, entry.url, entry.repos, entry.uuid, entry.kind, entry.schedule, entry.copied, entry.deleted, entry.absent, entry.incomplete)
+    if entry.uuid == NULL:
+        uuid = None
+    else:
+        uuid = entry.uuid
+    ret = Entry(entry.name, entry.revision, entry.url, entry.repos, uuid, entry.kind, entry.schedule, entry.copied, entry.deleted, entry.absent, entry.incomplete)
     ret.cmt_rev = entry.cmt_rev
     # FIXME: entry.copyfrom_url, entry.copyfrom_rev, entry.conflict_old, entry.conflict_new, entry.conflict_wrk, entry.prejfile, entry.text_time, entry.prop_time, entry.checksum, entry.cmt_date, entry.cmt_author, entry.lock_token, entry.lock_owner, entry.lock_comment, entry.lock_creation_date, entry.has_props, entry.has_prop_mods, entry.cachable_props, entry.present_props)
     return ret