Rev 990: Fix more segfaults, missing imports. in file:///data/jelmer/bzr-svn/pyrex/
Jelmer Vernooij
jelmer at samba.org
Sun Mar 16 06:11:06 GMT 2008
At file:///data/jelmer/bzr-svn/pyrex/
------------------------------------------------------------
revno: 990
revision-id:jelmer at samba.org-20080316061105-i6aj14eqaagphure
parent: jelmer at samba.org-20080316055659-m017wg353pvfe9ai
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Sun 2008-03-16 07:11:05 +0100
message:
Fix more segfaults, missing imports.
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
wc.pyx wc.pyx-20080313142018-10l8l23vha2j9e6b-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'branch.py'
--- a/branch.py 2008-03-16 01:33:26 +0000
+++ b/branch.py 2008-03-16 06:11:05 +0000
@@ -26,6 +26,7 @@
import core
from core import SubversionException
+import constants
from commit import push
from errors import NotSvnBranchPath
=== modified file 'commit.py'
--- a/commit.py 2008-03-16 05:24:21 +0000
+++ b/commit.py 2008-03-16 06:11:05 +0000
@@ -16,6 +16,7 @@
"""Committing and pushing to Subversion repositories."""
from core import SubversionException, time_to_cstring
+import core
from bzrlib import debug, osutils, urlutils
from bzrlib.branch import Branch
@@ -32,6 +33,7 @@
from ra import txdelta_send_stream
from svk import (generate_svk_feature, serialize_svk_features,
parse_svk_features, SVN_PROP_SVK_MERGE)
+import constants
from mapping import parse_revision_id
from repository import (SvnRepositoryFormat, SvnRepository)
import urllib
@@ -433,7 +435,7 @@
fileids[path] = id
self.base_mapping.export_fileid_map(fileids, self._svn_revprops, self._svnprops)
- self._svn_revprops[core.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,
@@ -448,9 +450,9 @@
raise
# Try without bzr: revprops
self.editor = self.repository.transport.get_commit_editor({
- core.SVN_PROP_REVISION_LOG: self._svn_revprops[core.SVN_PROP_REVISION_LOG]},
+ constants.PROP_REVISION_LOG: self._svn_revprops[constants.PROP_REVISION_LOG]},
done, None, False)
- del self._svn_revprops[core.SVN_PROP_REVISION_LOG]
+ del self._svn_revprops[constants.PROP_REVISION_LOG]
root = self.editor.open_root(self.base_revnum)
@@ -501,8 +503,8 @@
if self.repository.get_config().get_override_svn_revprops():
set_svn_revprops(self.repository.transport,
self.revision_metadata.revision, {
- core.SVN_PROP_REVISION_AUTHOR: self._committer,
- core.SVN_PROP_REVISION_DATE: svn_time_to_cstring(1000000*self._timestamp)})
+ constants.PROP_REVISION_AUTHOR: self._committer,
+ constants.PROP_REVISION_DATE: svn_time_to_cstring(1000000*self._timestamp)})
try:
set_svn_revprops(self.repository.transport, self.revision_metadata.revision,
=== modified file 'convert.py'
--- a/convert.py 2008-03-15 20:33:59 +0000
+++ b/convert.py 2008-03-16 06:11:05 +0000
@@ -25,7 +25,7 @@
from format import get_rich_root_format
-import core, repos
+import core, repos, constants
def transport_makedirs(transport, location_url):
"""Create missing directories.
@@ -61,7 +61,7 @@
created.
"""
from cStringIO import StringIO
- r = repos.create(outputdir, '', '', None, None)
+ r = repos.create(outputdir)
if dumpfile.endswith(".gz"):
import gzip
file = gzip.GzipFile(dumpfile)
=== modified file 'logwalker.py'
--- a/logwalker.py 2008-03-15 23:17:29 +0000
+++ b/logwalker.py 2008-03-16 06:11:05 +0000
@@ -23,6 +23,7 @@
from core import SubversionException
from transport import SvnRaTransport
import core
+import constants
from cache import sqlite3
=== modified file 'repository.py'
--- a/repository.py 2008-03-16 01:33:26 +0000
+++ b/repository.py 2008-03-16 06:11:05 +0000
@@ -30,6 +30,7 @@
from core import SubversionException
import core
+import constants
import os
@@ -239,7 +240,7 @@
def done(revmetadata):
pass
editor = self.transport.get_commit_editor(
- {core.SVN_PROP_REVISION_LOG: "Updating branching scheme for Bazaar."},
+ {constants.PROP_REVISION_LOG: "Updating branching scheme for Bazaar."},
done, None, False)
root = editor.open_root(-1)
editor.change_dir_prop(root, SVN_PROP_BZR_BRANCHING_SCHEME,
=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py 2008-03-16 04:31:39 +0000
+++ b/tests/test_commit.py 2008-03-16 06:11:05 +0000
@@ -567,7 +567,7 @@
transport = SvnRaTransport(repos_url)
set_svn_revprops(transport, 1, {"svn:author": "Somebody",
- "svn:date": svn_time_to_cstring(1000000*473385600)})
+ "svn:date": time_to_cstring(1000000*473385600)})
self.assertEquals(("Somebody", "1985-01-01T00:00:00.000000Z", "My commit"),
self.client_log("dc")[1][1:])
@@ -580,7 +580,7 @@
transport = SvnRaTransport(repos_url)
self.assertRaises(RevpropChangeFailed,
- lambda: set_svn_revprops(transport, 1, {"svn:author": "Somebody", "svn:date": svn_time_to_cstring(1000000*473385600)}))
+ lambda: set_svn_revprops(transport, 1, {"svn:author": "Somebody", "svn:date": time_to_cstring(1000000*473385600)}))
class SvkTestCase(TestCase):
def test_revid_svk_map(self):
=== modified file 'wc.pyx'
--- a/wc.pyx 2008-03-16 05:56:59 +0000
+++ b/wc.pyx 2008-03-16 06:11:05 +0000
@@ -155,7 +155,15 @@
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)
+ if entry.url == NULL:
+ url = None
+ else:
+ url = entry.url
+ if entry.repos == NULL:
+ repos = None
+ else:
+ repos = entry.repos
+ ret = Entry(entry.name, entry.revision, url, 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
=== modified file 'workingtree.py'
--- a/workingtree.py 2008-03-16 02:16:20 +0000
+++ b/workingtree.py 2008-03-16 06:11:05 +0000
@@ -34,6 +34,7 @@
from branch import SvnBranch
from commit import _revision_id_to_svk_feature
+import constants
from convert import SvnConverter
from errors import LocalCommitsUnsupported, NoSvnRepositoryPresent
from mapping import (SVN_PROP_BZR_ANCESTRY, SVN_PROP_BZR_FILEIDS,
@@ -325,7 +326,7 @@
assert entry
if entry.kind == core.NODE_DIR:
- subwc = svn.wc.adm_open3(wc, self.abspath(subrelpath),
+ subwc = wc.WorkingCopy(wc, self.abspath(subrelpath),
False, 0, None)
try:
add_dir_to_inv(subrelpath, subwc, id)
More information about the bazaar-commits
mailing list