Rev 1038: Fix some tests. in file:///data/jelmer/bzr-svn/pyrex/
Jelmer Vernooij
jelmer at samba.org
Sat May 31 05:01:48 BST 2008
At file:///data/jelmer/bzr-svn/pyrex/
------------------------------------------------------------
revno: 1038
revision-id: jelmer at samba.org-20080531040148-506iktegixl0rpk3
parent: jelmer at samba.org-20080531021456-a3ti8t4olg7ufet2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Sat 2008-05-31 06:01:48 +0200
message:
Fix some tests.
modified:
apr.pxd apr.pxd-20080313192457-r08q1i1681oz4fqp-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
constants.py constants.py-20080313210342-fuq3eruf2102bwml-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'apr.pxd'
--- a/apr.pxd 2008-03-18 19:33:31 +0000
+++ b/apr.pxd 2008-05-31 04:01:48 +0000
@@ -1,4 +1,5 @@
-# Copyright (C) 2008 Jelmer Vernooij <jelmer at samba.org>
+# Copyright © 2008 Jelmer Vernooij <jelmer at samba.org>
+# -*- coding: utf-8 -*-
# vim: ft=pyrex
# This program is free software; you can redistribute it and/or modify
@@ -62,5 +63,3 @@
cdef extern from "apr_time.h":
ctypedef unsigned long long apr_time_t
-
-
=== modified file 'commit.py'
--- a/commit.py 2008-05-30 02:38:27 +0000
+++ b/commit.py 2008-05-31 04:01:48 +0000
@@ -442,7 +442,7 @@
if self._config.get_log_strip_trailing_newline():
self.base_mapping.export_message(message, self._svn_revprops, self._svnprops)
message = message.rstrip("\n")
- self._svn_revprops[constants.SVN_PROP_REVISION_LOG] = message.encode("utf-8")
+ self._svn_revprops[constants.PROP_REVISION_LOG] = message.encode("utf-8")
try:
existing_bp_parts = _check_dirs_exist(self.repository.transport,
@@ -516,10 +516,10 @@
override_svn_revprops = self._config.get_override_svn_revprops()
if override_svn_revprops is not None:
new_revprops = {}
- if svn.core.SVN_PROP_REVISION_AUTHOR in override_svn_revprops:
- new_revprops[svn.core.SVN_PROP_REVISION_AUTHOR] = self._committer.encode("utf-8")
- if svn.core.SVN_PROP_REVISION_DATE in override_svn_revprops:
- new_revprops[svn.core.SVN_PROP_REVISION_DATE] = svn_time_to_cstring(1000000*self._timestamp)
+ if constants.PROP_REVISION_AUTHOR in override_svn_revprops:
+ new_revprops[constants.PROP_REVISION_AUTHOR] = self._committer.encode("utf-8")
+ if constants.PROP_REVISION_DATE in override_svn_revprops:
+ new_revprops[constants.PROP_REVISION_DATE] = svn_time_to_cstring(1000000*self._timestamp)
set_svn_revprops(self.repository.transport, self.revision_metadata.revision, new_revprops)
try:
=== modified file 'constants.py'
--- a/constants.py 2008-03-21 13:01:35 +0000
+++ b/constants.py 2008-05-31 04:01:48 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2007 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2005-2008 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'fetch.py'
--- a/fetch.py 2008-05-30 02:38:27 +0000
+++ b/fetch.py 2008-05-31 04:01:48 +0000
@@ -144,7 +144,7 @@
assert self.old_inventory.root.revision is not None
old_file_id = self.old_inventory.root.file_id
file_id = self._get_id_map().get("", old_file_id)
- self.dir_baserev[file_id] = [self.old_inventory.root.revision]
+ file_parents = [self.old_inventory.root.revision]
if self.inventory.root is not None and \
file_id == self.inventory.root.file_id:
@@ -276,9 +276,9 @@
def change_prop(self, name, value):
if self.new_id == self.editor.inventory.root.file_id:
# Replay lazy_dict, since it may be more expensive
- if type(self.revmeta.fileprops) != dict:
- self.revmeta.fileprops = {}
- self.revmeta.fileprops[name] = value
+ if type(self.editor.revmeta.fileprops) != dict:
+ self.editor.revmeta.fileprops = {}
+ self.editor.revmeta.fileprops[name] = value
if name in (constants.PROP_ENTRY_COMMITTED_DATE,
constants.PROP_ENTRY_COMMITTED_REV,
@@ -405,15 +405,15 @@
del self.editor.inventory[self.file_id]
if self.is_symlink:
- ie = self.editor.inventory.add_path(path, 'symlink', self.file_id)
+ ie = self.editor.inventory.add_path(self.path, 'symlink', self.file_id)
ie.symlink_target = lines[0][len("link "):]
ie.text_sha1 = None
ie.text_size = None
ie.executable = False
- ie.revision = self.revid
+ ie.revision = self.editor.revid
else:
- ie = self.inventory.add_path(path, 'file', self.file_id)
- ie.revision = self.revid
+ ie = self.editor.inventory.add_path(self.path, 'file', self.file_id)
+ ie.revision = self.editor.revid
ie.kind = 'file'
ie.symlink_target = None
ie.text_sha1 = osutils.sha_strings(lines)
@@ -647,7 +647,7 @@
# Report status of existing paths
reporter.set_path("", editor.revnum, True, None)
except:
- reporter.abort_report()
+ reporter.abort()
raise
else:
(parent_branch, parent_revnum, mapping) = \
@@ -665,10 +665,10 @@
# Report status of existing paths
reporter.set_path("", parent_revnum, False, None)
except:
- reporter.abort_report()
+ reporter.abort()
raise
- reporter.finish_report()
+ reporter.finish()
finally:
if conn is not None:
self.source.transport.add_connection(conn)
=== modified file 'logwalker.py'
--- a/logwalker.py 2008-05-30 02:38:27 +0000
+++ b/logwalker.py 2008-05-31 04:01:48 +0000
@@ -268,15 +268,13 @@
if orig_paths is None:
orig_paths = {}
for p in orig_paths:
- copyfrom_path = orig_paths[p].copyfrom_path
- if copyfrom_path is not None:
+ (action, copyfrom_path, copyfrom_rev) = orig_paths[p]
+
+ if copyfrom_path:
copyfrom_path = copyfrom_path.strip("/")
-
self.cachedb.execute(
"replace into changed_path (rev, path, action, copyfrom_path, copyfrom_rev) values (?, ?, ?, ?, ?)",
- (revision, p.strip("/"), orig_paths[p].action, copyfrom_path, orig_paths[p].copyfrom_rev))
- # Work around nasty memory leak in Subversion
- orig_paths[p]._parent_pool.destroy()
+ (revision, p.strip("/"), action, copyfrom_path, copyfrom_rev))
self.saved_revnum = revision
if self.saved_revnum % 1000 == 0:
=== modified file 'transport.py'
--- a/transport.py 2008-05-31 02:14:56 +0000
+++ b/transport.py 2008-05-31 04:01:48 +0000
@@ -160,14 +160,6 @@
return self._ra.do_switch(switch_rev, "", recurse, switch_url, editor)
@convert_svn_error
- def get_log(self, path, from_revnum, to_revnum, limit, discover_changed_paths,
- strict_node_history, revprops, rcvr):
- self.mutter('svn log %r:%r %r' % (from_revnum, to_revnum, path))
- return self._ra.get_log(rcvr, [self._request_path(path)],
- from_revnum, to_revnum, limit, discover_changed_paths,
- strict_node_history, revprops)
-
- @convert_svn_error
def change_rev_prop(self, revnum, name, value):
self.mutter('svn revprop -r%d --set %s=%s' % (revnum, name, value))
self._ra.change_rev_prop(revnum, name, value)
@@ -252,7 +244,6 @@
@convert_svn_error
def get_commit_editor(self, revprops, done_cb, lock_token, keep_locks):
- self._open_real_transport()
return self._ra.get_commit_editor(revprops, done_cb, lock_token,
keep_locks)
@@ -276,8 +267,7 @@
@convert_svn_error
@needs_busy
def get_log(self, paths, from_revnum, to_revnum, limit,
- discover_changed_paths, strict_node_history, revprops, rcvr,
- pool=None):
+ discover_changed_paths, strict_node_history, revprops, rcvr):
# No paths starting with slash, please
assert paths is None or all([not p.startswith("/") for p in paths])
self.mutter('svn log %r:%r %r (limit: %r)' % (from_revnum, to_revnum, paths, limit))
@@ -414,7 +404,6 @@
def iter_log(self, paths, from_revnum, to_revnum, limit, discover_changed_paths,
strict_node_history, revprops):
-
assert paths is None or isinstance(paths, list)
assert paths is None or all([isinstance(x, str) for x in paths])
assert isinstance(from_revnum, int) and isinstance(to_revnum, int)
@@ -443,8 +432,8 @@
def run(self):
assert self.conn is None, "already running"
- def rcvr(log_entry, pool):
- self.pending.append((log_entry.changed_paths, log_entry.revision, log_entry.revprops))
+ def rcvr(*args):
+ self.pending.append(args)
self.semaphore.release()
self.conn = self.transport.get_connection()
try:
@@ -478,7 +467,7 @@
return conn.get_log(newpaths,
from_revnum, to_revnum,
limit, discover_changed_paths, strict_node_history,
- revprops, rcvr, pool)
+ revprops, rcvr)
finally:
self.add_connection(conn)
@@ -563,10 +552,10 @@
finally:
self.add_connection(conn)
- def revprop_list(self, revnum, pool=None):
+ def revprop_list(self, revnum):
conn = self.get_connection()
try:
- return conn.revprop_list(revnum, pool)
+ return conn.revprop_list(revnum)
finally:
self.add_connection(conn)
More information about the bazaar-commits
mailing list