Rev 1008: Fix edxception in add_directory(), avoid using svn_ra_replay() for now. in file:///data/jelmer/bzr-svn/pyrex/
Jelmer Vernooij
jelmer at samba.org
Tue Mar 18 15:20:05 GMT 2008
At file:///data/jelmer/bzr-svn/pyrex/
------------------------------------------------------------
revno: 1008
revision-id:jelmer at samba.org-20080318152003-1iubuswnznx21nz0
parent: jelmer at samba.org-20080318024939-6jvacputylhrvmh4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Tue 2008-03-18 16:20:03 +0100
message:
Fix edxception in add_directory(), avoid using svn_ra_replay() for now.
modified:
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
ra.pyx ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
=== modified file 'fetch.py'
--- a/fetch.py 2008-03-18 02:06:56 +0000
+++ b/fetch.py 2008-03-18 15:20:03 +0000
@@ -240,7 +240,7 @@
def open_directory(self, path, base_revnum):
assert isinstance(path, str)
path = path.decode("utf-8")
- assert base_revnum >= 0
+ assert isinstance(base_revnum, int)
base_file_id = self.editor._get_old_id(self.old_id, path)
base_revid = self.editor.old_inventory[base_file_id].revision
file_id = self.editor._get_existing_id(self.old_id, self.new_id, path)
@@ -674,7 +674,7 @@
editor.start_revision(revid, parent_inv)
try:
- self._fetch_revision(editor, transport, repos_root, parent_revid)
+ self._fetch_revision_update(editor, transport, repos_root, parent_revid)
except:
editor.abort()
raise
=== modified file 'ra.pyx'
--- a/ra.pyx 2008-03-18 02:49:39 +0000
+++ b/ra.pyx 2008-03-18 15:20:03 +0000
@@ -424,10 +424,8 @@
c_copyfrom_path, copyfrom_rev, self.pool, &child_baton))
return new_dir_editor(self.editor, child_baton, self.pool)
- def open_directory(self, path, base_revision=None):
+ def open_directory(self, path, base_revision=-1):
cdef void *child_baton
- if base_revision is None:
- base_revision = -1
check_error(self.editor.open_directory(path, self.dir_baton,
base_revision, self.pool, &child_baton))
return new_dir_editor(self.editor, child_baton, self.pool)
@@ -548,7 +546,7 @@
if copyfrom_path == NULL:
ret = self.add_directory(path)
else:
- ret = self.add_directory(path, copyfrom_path, copy_revision)
+ ret = self.add_directory(path, copyfrom_path, copyfrom_revision)
Py_INCREF(ret)
child_baton[0] = <void *>ret
return NULL
More information about the bazaar-commits
mailing list