Rev 1007: Use xml serialiser format name in only one place. in file:///data/jelmer/bzr-svn/pyrex/
Jelmer Vernooij
jelmer at samba.org
Tue Mar 18 02:49:40 GMT 2008
At file:///data/jelmer/bzr-svn/pyrex/
------------------------------------------------------------
revno: 1007
revision-id:jelmer at samba.org-20080318024939-6jvacputylhrvmh4
parent: jelmer at samba.org-20080318021538-3lcdpw11pb6u7ldt
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Tue 2008-03-18 03:49:39 +0100
message:
Use xml serialiser format name in only one place.
modified:
ra.pyx ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
=== modified file 'ra.pyx'
--- a/ra.pyx 2008-03-18 02:15:38 +0000
+++ b/ra.pyx 2008-03-18 02:49:39 +0000
@@ -19,7 +19,7 @@
from apr cimport apr_array_header_t, apr_array_make, apr_array_push
from apr cimport apr_file_t, apr_off_t, apr_size_t, apr_uint32_t
from apr cimport apr_initialize, apr_pstrdup
-from core cimport check_error, Pool, wrap_lock, string_list_to_apr_array, py_svn_log_wrapper, new_py_stream, prop_hash_to_dict
+from core cimport check_error, Pool, wrap_lock, string_list_to_apr_array, py_svn_log_wrapper, new_py_stream, prop_hash_to_dict, py_svn_error
from core import SubversionException
from constants import PROP_REVISION_LOG, PROP_REVISION_AUTHOR, PROP_REVISION_DATE
from types cimport svn_error_t, svn_revnum_t, svn_string_t, svn_version_t
@@ -53,74 +53,74 @@
svn_txdelta_op_t *ops
svn_string_t *new_data
- ctypedef svn_error_t *(*svn_txdelta_window_handler_t) (svn_txdelta_window_t *window, void *baton) except *
+ ctypedef svn_error_t *(*svn_txdelta_window_handler_t) (svn_txdelta_window_t *window, void *baton)
ctypedef struct svn_delta_editor_t:
svn_error_t *(*set_target_revision)(void *edit_baton,
- svn_revnum_t target_revision, apr_pool_t *pool) except *
+ svn_revnum_t target_revision, apr_pool_t *pool)
svn_error_t *(*open_root)(void *edit_baton, svn_revnum_t base_revision,
- apr_pool_t *dir_pool, void **root_baton) except *
+ apr_pool_t *dir_pool, void **root_baton)
svn_error_t *(*delete_entry)(char *path, long revision,
- void *parent_baton, apr_pool_t *pool) except *
+ void *parent_baton, apr_pool_t *pool)
svn_error_t *(*add_directory)(char *path,
void *parent_baton,
char *copyfrom_path,
long copyfrom_revision,
apr_pool_t *dir_pool,
- void **child_baton) except *
+ void **child_baton)
svn_error_t *(*open_directory)(char *path, void *parent_baton,
long base_revision,
apr_pool_t *dir_pool,
- void **child_baton) except *
+ void **child_baton)
svn_error_t *(*change_dir_prop)(void *dir_baton,
char *name,
svn_string_t *value,
- apr_pool_t *pool) except *
+ apr_pool_t *pool)
svn_error_t *(*close_directory)(void *dir_baton,
- apr_pool_t *pool) except *
+ apr_pool_t *pool)
svn_error_t *(*absent_directory)(char *path, void *parent_baton,
- apr_pool_t *pool) except *
+ apr_pool_t *pool)
svn_error_t *(*add_file)(char *path,
void *parent_baton,
char *copy_path,
long copy_revision,
apr_pool_t *file_pool,
- void **file_baton) except *
+ void **file_baton)
svn_error_t *(*open_file)(char *path,
void *parent_baton,
long base_revision,
apr_pool_t *file_pool,
- void **file_baton) except *
+ void **file_baton)
svn_error_t *(*apply_textdelta)(void *file_baton,
char *base_checksum,
apr_pool_t *pool,
svn_txdelta_window_handler_t *handler,
- void **handler_baton) except *
+ void **handler_baton)
svn_error_t *(*change_file_prop)(void *file_baton,
char *name,
svn_string_t *value,
- apr_pool_t *pool) except *
+ apr_pool_t *pool)
svn_error_t *(*close_file)(void *file_baton,
char *text_checksum,
- apr_pool_t *pool) except *
+ apr_pool_t *pool)
svn_error_t *(*absent_file)(char *path,
void *parent_baton,
- apr_pool_t *pool) except *
-
- svn_error_t *(*close_edit)(void *edit_baton, apr_pool_t *pool) except *
-
- svn_error_t *(*abort_edit)(void *edit_baton, apr_pool_t *pool) except *
+ apr_pool_t *pool)
+
+ svn_error_t *(*close_edit)(void *edit_baton, apr_pool_t *pool)
+
+ svn_error_t *(*abort_edit)(void *edit_baton, apr_pool_t *pool)
svn_error_t *svn_txdelta_send_stream(svn_stream_t *stream,
svn_txdelta_window_handler_t handler,
@@ -524,12 +524,12 @@
return (svn_ra_version().major, svn_ra_version().minor,
svn_ra_version().minor, svn_ra_version().tag)
-cdef svn_error_t *py_editor_set_target_revision(void *edit_baton, svn_revnum_t target_revision, apr_pool_t *pool) except *:
+cdef svn_error_t *py_editor_set_target_revision(void *edit_baton, svn_revnum_t target_revision, apr_pool_t *pool):
self = <object>edit_baton
self.set_target_revision(target_revision)
return NULL
-cdef svn_error_t *py_editor_open_root(void *edit_baton, svn_revnum_t base_revision, apr_pool_t *dir_pool, void **root_baton) except *:
+cdef svn_error_t *py_editor_open_root(void *edit_baton, svn_revnum_t base_revision, apr_pool_t *dir_pool, void **root_baton):
root_baton[0] = NULL
self = <object>edit_baton
ret = self.open_root(base_revision)
@@ -537,12 +537,12 @@
root_baton[0] = <void *>ret
return NULL
-cdef svn_error_t *py_editor_delete_entry(char *path, long revision, void *parent_baton, apr_pool_t *pool) except *:
+cdef svn_error_t *py_editor_delete_entry(char *path, long revision, void *parent_baton, apr_pool_t *pool):
self = <object>parent_baton
self.delete_entry(path, revision)
return NULL
-cdef svn_error_t *py_editor_add_directory(char *path, void *parent_baton, char *copyfrom_path, long copyfrom_revision, apr_pool_t *dir_pool, void **child_baton) except *:
+cdef svn_error_t *py_editor_add_directory(char *path, void *parent_baton, char *copyfrom_path, long copyfrom_revision, apr_pool_t *dir_pool, void **child_baton):
child_baton[0] = NULL
self = <object>parent_baton
if copyfrom_path == NULL:
@@ -553,7 +553,7 @@
child_baton[0] = <void *>ret
return NULL
-cdef svn_error_t *py_editor_open_directory(char *path, void *parent_baton, long base_revision, apr_pool_t *dir_pool, void **child_baton) except *:
+cdef svn_error_t *py_editor_open_directory(char *path, void *parent_baton, long base_revision, apr_pool_t *dir_pool, void **child_baton):
child_baton[0] = NULL
self = <object>parent_baton
ret = self.open_directory(path, base_revision)
@@ -561,7 +561,7 @@
child_baton[0] = <void *>ret
return NULL
-cdef svn_error_t *py_editor_change_dir_prop(void *dir_baton, char *name, svn_string_t *value, apr_pool_t *pool) except *:
+cdef svn_error_t *py_editor_change_dir_prop(void *dir_baton, char *name, svn_string_t *value, apr_pool_t *pool):
self = <object>dir_baton
if value != NULL:
self.change_prop(name, PyString_FromStringAndSize(value.data, value.len))
@@ -569,18 +569,18 @@
self.change_prop(name, None)
return NULL
-cdef svn_error_t *py_editor_close_directory(void *dir_baton, apr_pool_t *pool) except *:
+cdef svn_error_t *py_editor_close_directory(void *dir_baton, apr_pool_t *pool):
self = <object>dir_baton
self.close()
Py_DECREF(self)
return NULL
-cdef svn_error_t *py_editor_absent_directory(char *path, void *parent_baton, apr_pool_t *pool) except *:
+cdef svn_error_t *py_editor_absent_directory(char *path, void *parent_baton, apr_pool_t *pool):
self = <object>parent_baton
self.absent_directory(path)
return NULL
-cdef svn_error_t *py_editor_add_file(char *path, void *parent_baton, char *copy_path, long copy_revision, apr_pool_t *file_pool, void **file_baton) except *:
+cdef svn_error_t *py_editor_add_file(char *path, void *parent_baton, char *copy_path, long copy_revision, apr_pool_t *file_pool, void **file_baton):
file_baton[0] = NULL
self = <object>parent_baton
if copy_path == NULL:
@@ -591,7 +591,7 @@
file_baton[0] = <void *>ret
return NULL
-cdef svn_error_t *py_editor_open_file(char *path, void *parent_baton, long base_revision, apr_pool_t *file_pool, void **file_baton) except *:
+cdef svn_error_t *py_editor_open_file(char *path, void *parent_baton, long base_revision, apr_pool_t *file_pool, void **file_baton):
file_baton[0] = NULL
self = <object>parent_baton
ret = self.open_file(path, base_revision)
@@ -599,7 +599,7 @@
file_baton[0] = <void *>ret
return NULL
-cdef svn_error_t *py_txdelta_window_handler(svn_txdelta_window_t *window, void *baton) except *:
+cdef svn_error_t *py_txdelta_window_handler(svn_txdelta_window_t *window, void *baton):
fn = <object>baton
if window == NULL:
# Signals all delta windows have been received
@@ -615,7 +615,7 @@
return NULL
-cdef svn_error_t *py_editor_apply_textdelta(void *file_baton, char *base_checksum, apr_pool_t *pool, svn_txdelta_window_handler_t *handler, void **handler_baton) except *:
+cdef svn_error_t *py_editor_apply_textdelta(void *file_baton, char *base_checksum, apr_pool_t *pool, svn_txdelta_window_handler_t *handler, void **handler_baton):
handler_baton[0] = NULL
self = <object>file_baton
if base_checksum == NULL:
@@ -627,7 +627,7 @@
handler[0] = py_txdelta_window_handler
return NULL
-cdef svn_error_t *py_editor_change_file_prop(void *file_baton, char *name, svn_string_t *value, apr_pool_t *pool) except *:
+cdef svn_error_t *py_editor_change_file_prop(void *file_baton, char *name, svn_string_t *value, apr_pool_t *pool):
self = <object>file_baton
if value != NULL:
self.change_prop(name, PyString_FromStringAndSize(value.data, value.len))
@@ -635,7 +635,7 @@
self.change_prop(name, None)
return NULL
-cdef svn_error_t *py_editor_close_file(void *file_baton, char *text_checksum, apr_pool_t *pool) except *:
+cdef svn_error_t *py_editor_close_file(void *file_baton, char *text_checksum, apr_pool_t *pool):
self = <object>file_baton
if text_checksum != NULL:
self.close()
@@ -644,17 +644,17 @@
Py_DECREF(self)
return NULL
-cdef svn_error_t *py_editor_absent_file(char *path, void *parent_baton, apr_pool_t *pool) except *:
+cdef svn_error_t *py_editor_absent_file(char *path, void *parent_baton, apr_pool_t *pool):
self = <object>parent_baton
self.absent_file(path)
return NULL
-cdef svn_error_t *py_editor_close_edit(void *edit_baton, apr_pool_t *pool) except *:
+cdef svn_error_t *py_editor_close_edit(void *edit_baton, apr_pool_t *pool):
self = <object>edit_baton
self.close()
return NULL
-cdef svn_error_t *py_editor_abort_edit(void *edit_baton, apr_pool_t *pool) except *:
+cdef svn_error_t *py_editor_abort_edit(void *edit_baton, apr_pool_t *pool):
self = <object>edit_baton
self.abort()
return NULL
=== modified file 'repository.py'
--- a/repository.py 2008-03-16 06:11:05 +0000
+++ b/repository.py 2008-03-18 02:49:39 +0000
@@ -16,7 +16,7 @@
"""Subversion repository access."""
import bzrlib
-from bzrlib import osutils, ui, urlutils
+from bzrlib import osutils, ui, urlutils, xml5
from bzrlib.branch import Branch, BranchCheckResult
from bzrlib.errors import (InvalidRevisionId, NoSuchRevision, NotBranchError,
UninitializableFormat, UnrelatedBranches)
@@ -147,7 +147,7 @@
assert self.uuid is not None
self.base = transport.base
assert self.base is not None
- self._serializer = None
+ self._serializer = xml5.serializer_v5
self.dir_cache = {}
self.get_config().add_location(self.base)
cache_dir = self.create_cache_dir()
@@ -642,8 +642,7 @@
def get_inventory_xml(self, revision_id):
"""See Repository.get_inventory_xml()."""
- return bzrlib.xml5.serializer_v5.write_inventory_to_string(
- self.get_inventory(revision_id))
+ return self.serialise_inventory(self.get_inventory(revision_id))
def get_inventory_sha1(self, revision_id):
"""Get the sha1 for the XML representation of an inventory.
@@ -661,7 +660,7 @@
:param revision_id: Revision for which to return the XML.
:return: XML string
"""
- return bzrlib.xml5.serializer_v5.write_revision_to_string(
+ return self._serializer.write_revision_to_string(
self.get_revision(revision_id))
def follow_history(self, revnum, mapping):
More information about the bazaar-commits
mailing list