Rev 1100: Merge 0.4. in http://people.samba.org/bzr/jelmer/bzr-svn/cext
Jelmer Vernooij
jelmer at samba.org
Sun Jun 15 03:20:21 BST 2008
At http://people.samba.org/bzr/jelmer/bzr-svn/cext
------------------------------------------------------------
revno: 1100
revision-id: jelmer at samba.org-20080615022020-u3vqo7saavkglnea
parent: jelmer at samba.org-20080615014942-c9pui6qg19wl85rb
parent: jelmer at samba.org-20080615021124-dceio82c5ml5006m
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Sun 2008-06-15 04:20:20 +0200
message:
Merge 0.4.
modified:
config.py config.py-20070624185721-0j8f1ly75uo4s1lk-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
format.py format.py-20070917005147-94kb7zysotf82kqw-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
transport.py transport.py-20060406231150-b3472d06b3a0818d
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 950.3.168
revision-id: jelmer at samba.org-20080615021124-dceio82c5ml5006m
parent: jelmer at samba.org-20080615014628-vr9qbhs2nmtfujff
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-06-15 04:11:24 +0200
message:
Avoid more direct imports of python subversion bindings.
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
config.py config.py-20070624185721-0j8f1ly75uo4s1lk-1
errors.py errors.py-20061226172623-w1sbj8ynpo0eojqp-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
format.py format.py-20070917005147-94kb7zysotf82kqw-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
transport.py transport.py-20060406231150-b3472d06b3a0818d
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'config.py'
--- a/config.py 2008-06-05 17:41:24 +0000
+++ b/config.py 2008-06-15 02:20:20 +0000
@@ -18,11 +18,10 @@
from bzrlib import osutils, urlutils, trace
from bzrlib.config import IniBasedConfig, config_dir, ensure_config_dir_exists, GlobalConfig, LocationConfig, Config, STORE_BRANCH, STORE_GLOBAL, STORE_LOCATION
-from bzrlib.plugins.svn.core import SubversionException
-
import os
from bzrlib.plugins.svn import properties
+from bzrlib.plugins.svn.core import SubversionException
# Settings are stored by UUID.
# Data stored includes default branching scheme and locations the repository
=== modified file 'fetch.py'
--- a/fetch.py 2008-06-15 00:41:08 +0000
+++ b/fetch.py 2008-06-15 02:20:20 +0000
@@ -25,8 +25,8 @@
from cStringIO import StringIO
import md5
+from bzrlib.plugins.svn import properties
from bzrlib.plugins.svn.delta import apply_txdelta_handler
-from bzrlib.plugins.svn import properties
from bzrlib.plugins.svn.errors import InvalidFileName
from bzrlib.plugins.svn.logwalker import lazy_dict
from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_MERGE,
=== modified file 'format.py'
--- a/format.py 2008-06-05 18:08:34 +0000
+++ b/format.py 2008-06-15 02:20:20 +0000
@@ -51,12 +51,12 @@
@classmethod
def probe_transport(klass, transport):
from transport import get_svn_ra_transport
- from bzrlib.plugins.svn.core import SubversionException
+ from bzrlib.plugins.svn import core
format = klass()
try:
transport = get_svn_ra_transport(transport)
- except SubversionException, (_, num):
+ except core.SubversionException, (_, num):
if num in (errors.ERR_RA_ILLEGAL_URL, \
errors.ERR_RA_LOCAL_REPOS_OPEN_FAILED, \
errors.ERR_BAD_URL):
@@ -65,10 +65,10 @@
return format
def _open(self, transport):
- from bzrlib.plugins.svn.core import SubversionException
+ from bzrlib.plugins.svn import core
try:
return remote.SvnRemoteAccess(transport, self)
- except SubversionException, (_, num):
+ except core.SubversionException, (_, num):
if num == errors.ERR_RA_DAV_REQUEST_FAILED:
raise bzr_errors.NotBranchError(transport.base)
raise
=== modified file 'logwalker.py'
--- a/logwalker.py 2008-06-15 01:13:47 +0000
+++ b/logwalker.py 2008-06-15 02:20:20 +0000
@@ -20,14 +20,13 @@
from bzrlib.trace import mutter
import bzrlib.ui as ui
+from bzrlib.plugins.svn import changes, core
from bzrlib.plugins.svn.core import SubversionException
-from bzrlib.plugins.svn.transport import SvnRaTransport
-from bzrlib.plugins.svn import core
-
-from bzrlib.plugins.svn import changes, core
from bzrlib.plugins.svn.cache import CacheTable
from bzrlib.plugins.svn.errors import ERR_FS_NO_SUCH_REVISION, ERR_FS_NOT_FOUND
from bzrlib.plugins.svn.ra import DIRENT_KIND
+from bzrlib.plugins.svn.transport import SvnRaTransport
+
class lazy_dict(object):
def __init__(self, initial, create_fn, *args):
=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py 2008-06-15 00:41:08 +0000
+++ b/mapping3/__init__.py 2008-06-15 02:20:20 +0000
@@ -17,8 +17,8 @@
from bzrlib.errors import InvalidRevisionId
from bzrlib.trace import mutter
-from bzrlib.plugins.svn import core, mapping, properties
-from bzrlib.plugins.svn.core import SubversionException
+from bzrlib.plugins.svn import mapping, properties
+from bzrlib.plugins.svn.core import SubversionException, NODE_DIR
from bzrlib.plugins.svn.errors import ERR_FS_NOT_DIRECTORY, ERR_FS_NOT_FOUND, ERR_RA_DAV_PATH_NOT_FOUND
from bzrlib.plugins.svn.layout import RepositoryLayout
from bzrlib.plugins.svn.mapping3.scheme import (BranchingScheme, guess_scheme_from_branch_path,
@@ -68,7 +68,7 @@
def get_branches(self, revnum, project=""):
def check_path(path):
- return self.repository.transport.check_path(path, revnum) == core.NODE_DIR
+ return self.repository.transport.check_path(path, revnum) == NODE_DIR
def find_children(path):
try:
assert not path.startswith("/")
=== modified file 'revids.py'
--- a/revids.py 2008-06-15 00:41:08 +0000
+++ b/revids.py 2008-06-15 02:20:20 +0000
@@ -21,8 +21,8 @@
from bzrlib.trace import mutter
from bzrlib.plugins.svn import core
+from bzrlib.plugins.svn.cache import CacheTable
from bzrlib.plugins.svn.core import SubversionException
-from bzrlib.plugins.svn.cache import CacheTable
from bzrlib.plugins.svn.errors import InvalidPropertyValue, ERR_FS_NO_SUCH_REVISION, ERR_FS_NOT_DIRECTORY
from bzrlib.plugins.svn.mapping import (parse_revision_id, BzrSvnMapping,
SVN_PROP_BZR_REVISION_ID, parse_revid_property)
=== modified file 'tests/__init__.py'
--- a/tests/__init__.py 2008-06-05 18:08:34 +0000
+++ b/tests/__init__.py 2008-06-15 02:20:20 +0000
@@ -24,12 +24,12 @@
from bzrlib import osutils, urlutils
from bzrlib.bzrdir import BzrDir
-from bzrlib.plugins.svn.ra import RemoteAccess, txdelta_send_stream
from bzrlib.tests import TestCaseInTempDir, TestSkipped
from bzrlib.trace import mutter
from bzrlib.workingtree import WorkingTree
from bzrlib.plugins.svn import repos, wc, client, ra, properties
+from bzrlib.plugins.svn.ra import RemoteAccess, txdelta_send_stream
class TestCaseWithSubversionRepository(TestCaseInTempDir):
"""A test case that provides the ability to build Subversion
=== modified file 'transport.py'
--- a/transport.py 2008-06-15 01:31:59 +0000
+++ b/transport.py 2008-06-15 02:20:20 +0000
@@ -21,10 +21,10 @@
from bzrlib.trace import mutter
from bzrlib.transport import Transport
+from bzrlib.plugins.svn import core, properties, ra
+from bzrlib.plugins.svn import properties
+from bzrlib.plugins.svn.auth import create_auth_baton
from bzrlib.plugins.svn.core import SubversionException
-from bzrlib.plugins.svn.auth import create_auth_baton
-
-from bzrlib.plugins.svn import core, properties, ra
from bzrlib.plugins.svn.errors import convert_svn_error, NoSvnRepositoryPresent, ERR_BAD_URL, ERR_RA_SVN_REPOS_NOT_FOUND, ERR_FS_ALREADY_EXISTS, ERR_FS_NOT_FOUND, ERR_FS_NOT_DIRECTORY
from bzrlib.plugins.svn.ra import DIRENT_KIND
import urlparse
=== modified file 'tree.py'
--- a/tree.py 2008-06-15 01:13:47 +0000
+++ b/tree.py 2008-06-15 02:20:20 +0000
@@ -28,8 +28,8 @@
from cStringIO import StringIO
import urllib
+from bzrlib.plugins.svn import core, errors, properties, wc
from bzrlib.plugins.svn.delta import apply_txdelta_handler
-from bzrlib.plugins.svn import core, errors, properties, wc
def parse_externals_description(base_url, val):
"""Parse an svn:externals property value.
=== modified file 'workingtree.py'
--- a/workingtree.py 2008-06-15 01:13:47 +0000
+++ b/workingtree.py 2008-06-15 02:20:20 +0000
@@ -31,29 +31,25 @@
from bzrlib.transport.local import LocalTransport
from bzrlib.workingtree import WorkingTree, WorkingTreeFormat
-from bzrlib.plugins.svn import core, properties
+from bzrlib.plugins.svn import core, properties, wc
from bzrlib.plugins.svn.branch import SvnBranch
from bzrlib.plugins.svn.commit import _revision_id_to_svk_feature
from bzrlib.plugins.svn.convert import SvnConverter
+from bzrlib.plugins.svn.core import SubversionException, time_to_cstring
from bzrlib.plugins.svn.errors import NoSvnRepositoryPresent, ERR_FS_TXN_OUT_OF_DATE, ERR_ENTRY_EXISTS, ERR_WC_PATH_NOT_FOUND, ERR_WC_NOT_DIRECTORY, ERR_WC_UNSUPPORTED_FORMAT
+from bzrlib.plugins.svn.format import get_rich_root_format
from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_ANCESTRY, SVN_PROP_BZR_FILEIDS,
SVN_PROP_BZR_REVISION_ID, SVN_PROP_BZR_REVISION_INFO,
- generate_revision_metadata)
+ escape_svn_path, generate_revision_metadata)
from bzrlib.plugins.svn.remote import SvnRemoteAccess
from bzrlib.plugins.svn.repository import SvnRepository
from bzrlib.plugins.svn.svk import SVN_PROP_SVK_MERGE, parse_svk_features, serialize_svk_features
-from bzrlib.plugins.svn.mapping import escape_svn_path
from bzrlib.plugins.svn.transport import (SvnRaTransport, bzr_to_svn_url, svn_config)
from bzrlib.plugins.svn.tree import SvnBasisTree
import os
import urllib
-import core, wc
-from core import SubversionException, time_to_cstring
-
-from bzrlib.plugins.svn.format import get_rich_root_format
-
def generate_ignore_list(ignore_map):
"""Create a list of ignores, ordered by directory.
More information about the bazaar-commits
mailing list