Rev 1010: Fix some tests. in file:///data/jelmer/bzr-svn/pyrex/
Jelmer Vernooij
jelmer at samba.org
Tue Mar 18 19:33:32 GMT 2008
At file:///data/jelmer/bzr-svn/pyrex/
------------------------------------------------------------
revno: 1010
revision-id:jelmer at samba.org-20080318193331-74qkzmvt4s1wp6om
parent: jelmer at samba.org-20080318171959-v0t1pktlya2g1fs4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Tue 2008-03-18 20:33:31 +0100
message:
Fix some tests.
modified:
apr.pxd apr.pxd-20080313192457-r08q1i1681oz4fqp-1
core.pyx core.pyx-20080313210413-17k59slolpfe5kdq-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
ra.pyx ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
wc.pyx wc.pyx-20080313142018-10l8l23vha2j9e6b-1
=== modified file 'apr.pxd'
--- a/apr.pxd 2008-03-17 22:28:17 +0000
+++ b/apr.pxd 2008-03-18 19:33:31 +0000
@@ -19,6 +19,8 @@
cdef extern from "apr_errno.h":
ctypedef int apr_status_t
+ ctypedef unsigned long apr_size_t
+ char * apr_strerror(apr_status_t statcode, char *buf, apr_size_t bufsize)
cdef extern from "apr_general.h":
ctypedef unsigned long apr_uint32_t
@@ -30,7 +32,6 @@
cdef extern from "apr_pools.h":
ctypedef struct apr_pool_t
- ctypedef unsigned long apr_size_t
void apr_pool_destroy(apr_pool_t *)
apr_status_t apr_pool_create(apr_pool_t **newpool, apr_pool_t *parent)
void *apr_palloc(apr_pool_t *, apr_size_t)
=== modified file 'core.pyx'
--- a/core.pyx 2008-03-18 17:19:59 +0000
+++ b/core.pyx 2008-03-18 19:33:31 +0000
@@ -18,7 +18,7 @@
from apr cimport apr_initialize, apr_status_t, apr_time_t, apr_hash_t, apr_size_t
from apr cimport apr_pool_t, apr_pool_create, apr_pool_destroy
from apr cimport apr_array_header_t, apr_array_make, apr_array_push
-from apr cimport apr_hash_index_t, apr_hash_this, apr_hash_first, apr_hash_next
+from apr cimport apr_hash_index_t, apr_hash_this, apr_hash_first, apr_hash_next, apr_strerror
import constants
from constants import PROP_REVISION_LOG, PROP_REVISION_AUTHOR, PROP_REVISION_DATE
from types cimport svn_stream_set_read, svn_stream_set_write, svn_stream_set_close, svn_stream_from_stringbuf, svn_stream_create
@@ -70,11 +70,11 @@
cdef apr_pool_t *Pool(apr_pool_t *parent):
cdef apr_status_t status
cdef apr_pool_t *ret
+ cdef char errmsg[1024]
ret = NULL
status = apr_pool_create(&ret, parent)
if status != 0:
- # FIXME: Clearer error
- raise Exception("APR Error")
+ raise Exception(apr_strerror(status, errmsg, sizeof(errmsg)))
return ret
@@ -83,7 +83,7 @@
svn_error_t *svn_time_from_cstring(apr_time_t *when, char *data,
apr_pool_t *pool)
-def time_to_cstring(int when):
+def time_to_cstring(apr_time_t when):
"""Convert a UNIX timestamp to a Subversion CString."""
cdef apr_pool_t *pool
pool = Pool(NULL)
=== modified file 'fetch.py'
--- a/fetch.py 2008-03-18 15:20:03 +0000
+++ b/fetch.py 2008-03-18 19:33:31 +0000
@@ -616,7 +616,7 @@
reporter = transport.do_update(editor.revnum, True, editor)
# Report status of existing paths
- reporter.set_path("", editor.revnum, True, None)
+ reporter.set_path("", editor.revnum, True)
else:
(parent_branch, parent_revnum, mapping) = \
self.source.lookup_revision_id(parent_revid)
@@ -629,7 +629,7 @@
reporter = transport.do_update(editor.revnum, True, editor)
# Report status of existing paths
- reporter.set_path("", parent_revnum, False, None)
+ reporter.set_path("", parent_revnum, False)
lock = transport.lock_read(".")
reporter.finish_report()
=== modified file 'logwalker.py'
--- a/logwalker.py 2008-03-17 20:25:54 +0000
+++ b/logwalker.py 2008-03-18 19:33:31 +0000
@@ -305,7 +305,7 @@
root_repos = transport.get_svn_repos_root()
reporter = transport.do_switch(revnum, True,
urlutils.join(root_repos, path), editor)
- reporter.set_path("", 0, True, None)
+ reporter.set_path("", 0, True)
reporter.finish_report()
return editor.files
=== modified file 'ra.pyx'
--- a/ra.pyx 2008-03-18 17:19:59 +0000
+++ b/ra.pyx 2008-03-18 19:33:31 +0000
@@ -235,15 +235,15 @@
apr_pool_t *pool)
svn_error_t *svn_ra_replay(svn_ra_session_t *session,
- long revision,
- long low_water_mark,
+ svn_revnum_t revision,
+ svn_revnum_t low_water_mark,
int send_deltas,
svn_delta_editor_t *editor,
edit_baton,
apr_pool_t *pool)
svn_error_t *svn_ra_rev_proplist(svn_ra_session_t *session,
- long rev,
+ svn_revnum_t rev,
apr_hash_t **props,
apr_pool_t *pool)
@@ -258,17 +258,17 @@
apr_pool_t *pool)
svn_error_t *svn_ra_change_rev_prop(svn_ra_session_t *session,
- long rev,
+ svn_revnum_t rev,
char *name,
svn_string_t *value,
apr_pool_t *pool)
svn_error_t *svn_ra_get_dir2(svn_ra_session_t *session,
apr_hash_t **dirents,
- long *fetched_rev,
+ svn_revnum_t *fetched_rev,
apr_hash_t **props,
char *path,
- long revision,
+ svn_revnum_t revision,
long dirent_fields,
apr_pool_t *pool)
@@ -336,7 +336,7 @@
cdef void *report_baton
cdef apr_pool_t *pool
- def set_path(self, char *path, int revision, int start_empty, char *lock_token):
+ def set_path(self, char *path, svn_revnum_t revision, int start_empty, lock_token=None):
check_error(self.reporter.set_path(self.report_baton, path, revision,
start_empty, c_lock_token(lock_token), self.pool))
@@ -344,7 +344,7 @@
check_error(self.reporter.delete_path(self.report_baton, path,
self.pool))
- def link_path(self, char *path, char *url, int revision, int start_empty, char *lock_token):
+ def link_path(self, char *path, char *url, svn_revnum_t revision, int start_empty, lock_token=None):
check_error(self.reporter.link_path(self.report_baton, path, url,
revision, start_empty, c_lock_token(lock_token), self.pool))
@@ -367,7 +367,7 @@
cdef svn_delta_editor_t *editor
cdef apr_pool_t *pool
- def apply_textdelta(self, char *base_checksum=NULL):
+ def apply_textdelta(self, base_checksum=None):
cdef char *c_base_checksum
cdef svn_txdelta_window_handler_t txdelta_handler
cdef void *txdelta_baton
@@ -395,7 +395,7 @@
check_error(self.editor.change_file_prop(self.file_baton, name,
p_c_value, self.pool))
- def close(self, char *checksum=NULL):
+ def close(self, checksum=None):
cdef char *c_checksum
if checksum is None:
c_checksum = NULL
@@ -409,11 +409,11 @@
cdef void *dir_baton
cdef apr_pool_t *pool
- def delete_entry(self, char *path, int revision=-1):
+ def delete_entry(self, char *path, svn_revnum_t revision=-1):
check_error(self.editor.delete_entry(path, revision, self.dir_baton,
self.pool))
- def add_directory(self, char *path, char *copyfrom_path=NULL, int copyfrom_rev=-1):
+ def add_directory(self, char *path, copyfrom_path=None, int copyfrom_rev=-1):
cdef void *child_baton
cdef char *c_copyfrom_path
if copyfrom_path is None:
@@ -448,7 +448,7 @@
check_error(self.editor.absent_directory(path, self.dir_baton,
self.pool))
- def add_file(self, char *path, char *copy_path=NULL, int copy_rev=-1):
+ def add_file(self, char *path, copy_path=None, int copy_rev=-1):
cdef void *file_baton
cdef FileEditor py_file_editor
cdef char *c_copy_path
@@ -730,7 +730,7 @@
apr_pool_destroy(temp_pool)
return latest_revnum
- def get_log(self, callback, paths, int start, int end, int limit=0,
+ def get_log(self, callback, paths, svn_revnum_t start, svn_revnum_t end, int limit=0,
int discover_changed_paths=True, int strict_node_history=True,
revprops=[PROP_REVISION_LOG,PROP_REVISION_AUTHOR,PROP_REVISION_DATE]):
cdef apr_pool_t *temp_pool
@@ -751,7 +751,7 @@
apr_pool_destroy(temp_pool)
return root
- def do_update(self, int revision_to_update_to, char *update_target, int recurse,
+ def do_update(self, svn_revnum_t revision_to_update_to, char *update_target, int recurse,
update_editor):
cdef svn_ra_reporter2_t *reporter
cdef void *report_baton
@@ -767,7 +767,7 @@
ret.pool = temp_pool
return ret
- def do_switch(self, int revision_to_update_to, char *update_target, int recurse,
+ def do_switch(self, svn_revnum_t revision_to_update_to, char *update_target, int recurse,
char *switch_url, update_editor):
cdef svn_ra_reporter2_t *reporter
cdef void *report_baton
@@ -784,14 +784,14 @@
ret.pool = temp_pool
return ret
- def replay(self, int revision, int low_water_mark, update_editor, int send_deltas=True):
+ def replay(self, svn_revnum_t revision, svn_revnum_t low_water_mark, update_editor, int send_deltas=True):
cdef apr_pool_t *temp_pool
temp_pool = Pool(self.pool)
check_error(svn_ra_replay(self.ra, revision, low_water_mark,
send_deltas, &py_editor, update_editor, temp_pool))
apr_pool_destroy(temp_pool)
- def rev_proplist(self, int rev):
+ def rev_proplist(self, svn_revnum_t rev):
cdef apr_pool_t *temp_pool
cdef apr_hash_t *props
temp_pool = Pool(self.pool)
@@ -823,7 +823,7 @@
py_editor.pool = temp_pool
return py_editor
- def change_rev_prop(self, int rev, char *name, char *value):
+ def change_rev_prop(self, svn_revnum_t rev, char *name, char *value):
cdef apr_pool_t *temp_pool
cdef svn_string_t *val_string
temp_pool = Pool(self.pool)
@@ -832,7 +832,7 @@
val_string, temp_pool))
apr_pool_destroy(temp_pool)
- def get_dir(self, char *path, int revision=-1, int dirent_fields=0):
+ def get_dir(self, char *path, svn_revnum_t revision=-1, int dirent_fields=0):
cdef apr_pool_t *temp_pool
cdef apr_hash_t *dirents
cdef apr_hash_index_t *idx
@@ -880,7 +880,7 @@
apr_pool_destroy(temp_pool)
return wrap_lock(lock)
- def check_path(self, char *path, int revision):
+ def check_path(self, char *path, svn_revnum_t revision):
cdef svn_node_kind_t kind
cdef apr_pool_t *temp_pool
temp_pool = Pool(self.pool)
=== modified file 'tree.py'
--- a/tree.py 2008-03-18 02:07:16 +0000
+++ b/tree.py 2008-03-18 19:33:31 +0000
@@ -45,7 +45,7 @@
reporter = repository.transport.do_switch(
self.revnum, True,
urlutils.join(root_repos, self.branch_path), editor)
- reporter.set_path("", 0, True, None)
+ reporter.set_path("", 0, True)
reporter.finish_report()
def get_file_lines(self, file_id):
=== modified file 'wc.pyx'
--- a/wc.pyx 2008-03-18 17:19:59 +0000
+++ b/wc.pyx 2008-03-18 19:33:31 +0000
@@ -378,7 +378,7 @@
apr_pool_destroy(temp_pool)
return (py_propchanges, py_orig_props)
- def add(self, char *path, char *copyfrom_url=NULL, int copyfrom_rev=-1, cancel_func=None,
+ def add(self, char *path, copyfrom_url=None, int copyfrom_rev=-1, cancel_func=None,
notify_func=None):
cdef apr_pool_t *temp_pool
cdef char *c_copyfrom_url
@@ -437,7 +437,7 @@
apr_pool_destroy(self.pool)
-def revision_status(char *wc_path, char *trail_url=NULL, int committed=False, cancel_func=None):
+def revision_status(char *wc_path, trail_url=None, int committed=False, cancel_func=None):
"""Determine the revision status of a specified working copy.
:return: Tuple with minimum and maximum revnums found, whether the
More information about the bazaar-commits
mailing list