Rev 1617: fix formatting, unused imports, remove deprecated Branch.append_revision(). in http://people.samba.org/bzr/jelmer/bzr-svn/trunk
Jelmer Vernooij
jelmer at samba.org
Sat Aug 23 15:55:32 BST 2008
At http://people.samba.org/bzr/jelmer/bzr-svn/trunk
------------------------------------------------------------
revno: 1617
revision-id: jelmer at samba.org-20080823145524-rsj2gu7yev8isuc8
parent: jelmer at samba.org-20080823105414-ly0rpd1kv5uetcsz
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-08-23 16:55:24 +0200
message:
fix formatting, unused imports, remove deprecated Branch.append_revision().
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
auth.py auth.py-20071209174622-w8d42k6nm5yhxvi8-1
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
cache.py cache.py-20070520185908-qbtlcet08bllgs0f-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
errors.py errors.py-20061226172623-w1sbj8ynpo0eojqp-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
format.py format.py-20070917005147-94kb7zysotf82kqw-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
parents.py parents.py-20080505192113-5rcif033d6wcam9w-1
remote.py format.py-20060406233823-b6fa009fe35dfde7
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
tags.py tags.py-20080822211316-scblu3akdvu0b64c-1
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
transport.py transport.py-20060406231150-b3472d06b3a0818d
=== modified file '__init__.py'
--- a/__init__.py 2008-08-22 16:13:03 +0000
+++ b/__init__.py 2008-08-23 14:55:24 +0000
@@ -62,7 +62,6 @@
If version is compatible version + 1, assume compatible, with deprecations
Otherwise, assume incompatible.
"""
- import bzrlib
bzrlib_version = bzrlib.version_info[:2]
if (bzrlib_version in desired or
((bzrlib_version[0], bzrlib_version[1]-1) in desired and
@@ -82,6 +81,7 @@
"""
def check_mtime(m):
+ """Check whether a C extension is out of date."""
(base, _) = os.path.splitext(m.__file__)
c_file = "%s.c" % base
if not os.path.exists(c_file):
@@ -99,8 +99,10 @@
warning("Unable to load bzr-svn extensions - did you build it?")
raise
ra_version = ra.version()
- if (ra_version[0] >= 5 and getattr(ra, 'SVN_REVISION', None) and 27729 <= ra.SVN_REVISION < 31470):
- warning('Installed Subversion has buggy svn.ra.get_log() implementation, please install newer.')
+ if (ra_version[0] >= 5 and getattr(ra, 'SVN_REVISION', None) and
+ 27729 <= ra.SVN_REVISION < 31470):
+ warning('Installed Subversion has buggy svn.ra.get_log() '
+ 'implementation, please install newer.')
mutter("bzr-svn: using Subversion %d.%d.%d (%s)" % ra_version)
@@ -159,29 +161,29 @@
"bzrlib.plugins.svn.log",
"show_subversion_properties")
-versions_checked = False
+_versions_checked = False
def lazy_check_versions():
"""Check whether all dependencies have the right versions.
:note: Only checks once, caches the result."""
- global versions_checked
- if versions_checked:
+ global _versions_checked
+ if _versions_checked:
return
- versions_checked = True
+ _versions_checked = True
check_bzrlib_version(COMPATIBLE_BZR_VERSIONS)
-optimizers_registered = False
+_optimizers_registered = False
def lazy_register_optimizers():
"""Register optimizers for fetching between Subversion and Bazaar
repositories.
:note: Only registers on the first call."""
- global optimizers_registered
- if optimizers_registered:
+ global _optimizers_registered
+ if _optimizers_registered:
return
from bzrlib.repository import InterRepository
from bzrlib.plugins.svn import commit, fetch
- optimizers_registered = True
+ _optimizers_registered = True
InterRepository.register_optimiser(fetch.InterFromSvnRepository)
InterRepository.register_optimiser(commit.InterToSvnRepository)
@@ -231,14 +233,12 @@
def run(self, from_location, to_location=None, trees=False,
standalone=False, scheme=None, all=False, prefix=None, keep=False,
incremental=False):
- from bzrlib.branch import Branch
from bzrlib.bzrdir import BzrDir
- from bzrlib.errors import BzrCommandError, NoRepositoryPresent, NotBranchError
+ from bzrlib.errors import BzrCommandError, NoRepositoryPresent
from bzrlib import urlutils
from bzrlib.plugins.svn.convert import convert_repository
from bzrlib.plugins.svn.mapping3 import repository_guess_scheme
from bzrlib.plugins.svn.repository import SvnRepository
- import os
if to_location is None:
to_location = os.path.basename(from_location.rstrip("/\\"))
@@ -262,20 +262,23 @@
from_repos = from_dir.open_repository()
except NoRepositoryPresent, e:
if prefix is not None:
- raise BzrCommandError("Path inside repository specified and --prefix specified")
+ raise BzrCommandError("Path inside repository specified "
+ "and --prefix specified")
from_repos = from_dir.find_repository()
prefix = urlutils.relative_url(from_repos.base, from_location)
prefix = prefix.encode("utf-8")
from_repos.lock_read()
try:
- (guessed_scheme, scheme) = repository_guess_scheme(from_repos, from_repos.get_latest_revnum())
+ (guessed_scheme, scheme) = repository_guess_scheme(from_repos,
+ from_repos.get_latest_revnum())
if prefix is not None:
prefix = prefix.strip("/") + "/"
if guessed_scheme.is_branch(prefix):
raise BzrCommandError("%s appears to contain a branch. "
- "For individual branches, use 'bzr branch'." % from_location)
+ "For individual branches, use 'bzr branch'." %
+ from_location)
self.outf.write("Importing branches with prefix /%s\n" %
urlutils.unescape_for_display(prefix, self.outf.encoding))
@@ -285,7 +288,8 @@
"Not a Subversion repository: %s" % from_location)
def filter_branch(branch):
- if prefix is not None and not branch.get_branch_path().startswith(prefix):
+ if (prefix is not None and
+ not branch.get_branch_path().startswith(prefix)):
return False
return True
@@ -314,7 +318,8 @@
@display_command
def run(self, from_repository=None, verbose=False):
- from bzrlib.plugins.svn.upgrade import upgrade_branch, upgrade_workingtree
+ from bzrlib.plugins.svn.upgrade import (upgrade_branch,
+ upgrade_workingtree)
from bzrlib.branch import Branch
from bzrlib.errors import NoWorkingTree, BzrCommandError
from bzrlib.repository import Repository
@@ -422,7 +427,7 @@
register_command(cmd_svn_push)
class cmd_dpush(Command):
- """Push diffs into Subversion avoiding the use of any Bazaar-specific properties.
+ """Push diffs into Subversion without any Bazaar-specific properties set.
This will afterwards rebase the local Bazaar branch on the Subversion
branch unless the --no-rebase option is used, in which case
@@ -437,11 +442,12 @@
),
Option('no-rebase', help="Don't rebase after push")]
- def run(self, location=None, remember=False, directory=None, no_rebase=False):
+ def run(self, location=None, remember=False, directory=None,
+ no_rebase=False):
from bzrlib import urlutils
from bzrlib.bzrdir import BzrDir
from bzrlib.branch import Branch
- from bzrlib.errors import NotBranchError, BzrCommandError, NoWorkingTree
+ from bzrlib.errors import BzrCommandError, NoWorkingTree
from bzrlib.workingtree import WorkingTree
from bzrlib.plugins.svn.commit import dpush
@@ -472,7 +478,7 @@
if source_branch.get_push_location() is None or remember:
source_branch.set_push_location(target_branch.base)
if not no_rebase:
- revno, old_last_revid = source_branch.last_revision_info()
+ _, old_last_revid = source_branch.last_revision_info()
new_last_revid = revid_map[old_last_revid]
if source_wt is not None:
source_wt.pull(target_branch, overwrite=True,
@@ -501,11 +507,11 @@
from bzrlib.bzrdir import BzrDir
from bzrlib.errors import BzrCommandError
from bzrlib.msgeditor import edit_commit_message
- from bzrlib.repository import Repository
from bzrlib.trace import info
from bzrlib.plugins.svn.repository import SvnRepository
from bzrlib.plugins.svn.mapping3.scheme import scheme_from_branch_list
- from bzrlib.plugins.svn.mapping3 import config_set_scheme, get_property_scheme, set_property_scheme
+ from bzrlib.plugins.svn.mapping3 import (config_set_scheme,
+ get_property_scheme, set_property_scheme)
def scheme_str(scheme):
if scheme is None:
return ""
=== modified file 'auth.py'
--- a/auth.py 2008-07-05 18:17:21 +0000
+++ b/auth.py 2008-08-23 14:55:24 +0000
@@ -115,7 +115,8 @@
def get_svn_ssl_server_trust_prompt_provider(self):
"""Return a Subversion auth provider for checking
whether a SSL server is trusted."""
- return ra.get_ssl_server_trust_prompt_provider(self.get_svn_ssl_server_trust)
+ return ra.get_ssl_server_trust_prompt_provider(
+ self.get_svn_ssl_server_trust)
def get_svn_auth_providers(self):
"""Return a list of auth providers for this authentication file.
=== modified file 'branch.py'
--- a/branch.py 2008-08-23 02:26:55 +0000
+++ b/branch.py 2008-08-23 14:55:24 +0000
@@ -19,16 +19,11 @@
from bzrlib.branch import Branch, BranchFormat, BranchCheckResult, PullResult
from bzrlib.bzrdir import BzrDir
from bzrlib.errors import (NoSuchFile, DivergedBranches, NoSuchRevision,
- NoSuchTag, NotBranchError, UnstackableBranchFormat,
- UnrelatedBranches)
-from bzrlib.inventory import (Inventory)
-from bzrlib.revision import is_null, ensure_null, NULL_REVISION
-from bzrlib.trace import mutter
+ NotBranchError, UnstackableBranchFormat)
+from bzrlib.revision import is_null, ensure_null
from bzrlib.workingtree import WorkingTree
from bzrlib.plugins.svn import core, wc
-from bzrlib.plugins.svn.auth import create_auth_baton
-from bzrlib.plugins.svn.client import Client, get_config
from bzrlib.plugins.svn.commit import push, push_ancestors
from bzrlib.plugins.svn.config import BranchConfig
from bzrlib.plugins.svn.core import SubversionException
@@ -76,7 +71,8 @@
self.mapping = self.repository.get_mapping()
self.layout = self.repository.get_layout()
self._branch_path = branch_path.strip("/")
- self.base = urlutils.join(self.repository.base, self._branch_path).rstrip("/")
+ self.base = urlutils.join(self.repository.base,
+ self._branch_path).rstrip("/")
self._revmeta_cache = None
assert isinstance(self._branch_path, str)
if not _skip_check:
@@ -142,7 +138,8 @@
if self._lock_mode == 'r' and self._cached_revnum:
return self._cached_revnum
latest_revnum = self.repository.get_latest_revnum()
- self._cached_revnum = self.repository._log.find_latest_change(self.get_branch_path(), latest_revnum)
+ self._cached_revnum = self.repository._log.find_latest_change(
+ self.get_branch_path(), latest_revnum)
if self._cached_revnum is None:
raise NotBranchError(self.base)
return self._cached_revnum
@@ -154,7 +151,8 @@
"""
return BranchCheckResult(self)
- def _create_heavyweight_checkout(self, to_location, revision_id=None, hardlink=False):
+ def _create_heavyweight_checkout(self, to_location, revision_id=None,
+ hardlink=False):
"""Create a new heavyweight checkout of this branch.
:param to_location: URL of location to create the new checkout in.
@@ -180,7 +178,7 @@
:raises NoSuchRevision: If the revision id was not found.
"""
(bp, revnum, mapping) = self.repository.lookup_revision_id(revid,
- ancestry=(self.get_branch_path(), self.get_revnum()))
+ ancestry=(self.get_branch_path(), self.get_revnum()))
assert bp.strip("/") == self.get_branch_path(revnum).strip("/"), \
"Got %r, expected %r" % (bp, self.get_branch_path(revnum))
return revnum
@@ -221,7 +219,8 @@
if lightweight:
return self._create_lightweight_checkout(to_location, revision_id)
else:
- return self._create_heavyweight_checkout(to_location, revision_id, hardlink=hardlink)
+ return self._create_heavyweight_checkout(to_location, revision_id,
+ hardlink=hardlink)
def generate_revision_id(self, revnum):
"""Generate a new revision id for a revision on this branch."""
@@ -251,7 +250,8 @@
def set_revision_history(self, rev_history):
"""See Branch.set_revision_history()."""
- if rev_history == [] or not self.repository.has_revision(rev_history[-1]):
+ if (rev_history == [] or
+ not self.repository.has_revision(rev_history[-1])):
raise NotImplementedError("set_revision_history can't add ghosts")
push(self, self.repository, rev_history[-1])
self._clear_cached_state()
@@ -470,7 +470,7 @@
self.repository.unlock()
def _clear_cached_state(self):
- super(SvnBranch,self)._clear_cached_state()
+ super(SvnBranch, self)._clear_cached_state()
self._cached_revnum = None
self._revmeta_cache = None
@@ -481,13 +481,6 @@
def set_parent(self, url):
"""See Branch.set_parent()."""
- def append_revision(self, *revision_ids):
- """See Branch.append_revision()."""
- self._clear_cached_state()
- #raise NotImplementedError(self.append_revision)
- #FIXME: Make sure the appended revision is already
- # part of the revision history
-
def get_physical_lock_status(self):
"""See Branch.get_physical_lock_status()."""
return False
=== modified file 'branchprops.py'
--- a/branchprops.py 2008-08-08 23:53:12 +0000
+++ b/branchprops.py 2008-08-23 14:55:24 +0000
@@ -17,7 +17,6 @@
"""Branch property access and caching."""
from bzrlib.errors import NoSuchRevision
-from bzrlib.trace import mutter
from bzrlib.plugins.svn import logwalker
from bzrlib.plugins.svn.core import SubversionException
=== modified file 'cache.py'
--- a/cache.py 2008-07-04 11:50:36 +0000
+++ b/cache.py 2008-08-23 14:55:24 +0000
@@ -98,6 +98,7 @@
def _create_table(self):
pass
- def mutter(self, text, *args):
+ @staticmethod
+ def mutter(text, *args):
if "cache" in debug.debug_flags:
mutter(text, *args)
=== modified file 'commit.py'
--- a/commit.py 2008-08-21 23:51:16 +0000
+++ b/commit.py 2008-08-23 14:55:24 +0000
@@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Committing and pushing to Subversion repositories."""
-from bzrlib import debug, osutils, urlutils, ui
+from bzrlib import debug, urlutils, ui
from bzrlib.branch import Branch
from bzrlib.errors import (BzrError, InvalidRevisionId, DivergedBranches,
UnrelatedBranches, AppendRevisionsOnlyViolation,
@@ -30,15 +30,14 @@
from bzrlib.plugins.svn import core, properties
from bzrlib.plugins.svn.core import SubversionException
from bzrlib.plugins.svn.delta import send_stream
-from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix, RevpropChangeFailed, ERR_FS_TXN_OUT_OF_DATE, ERR_REPOS_DISABLED_FEATURE
-from bzrlib.plugins.svn.svk import (generate_svk_feature, serialize_svk_features,
- parse_svk_features, SVN_PROP_SVK_MERGE)
+from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix, RevpropChangeFailed, ERR_FS_TXN_OUT_OF_DATE
+from bzrlib.plugins.svn.svk import (
+ generate_svk_feature, serialize_svk_features,
+ parse_svk_features, SVN_PROP_SVK_MERGE)
from bzrlib.plugins.svn.logwalker import lazy_dict
from bzrlib.plugins.svn.mapping import parse_revision_id
from bzrlib.plugins.svn.repository import SvnRepositoryFormat, SvnRepository
-import urllib
-
def _revision_id_to_svk_feature(revid):
"""Create a SVK feature identifier from a revision id.
@@ -196,7 +195,8 @@
if new_mergeinfo is not None:
self._svnprops[properties.PROP_MERGEINFO] = new_mergeinfo
- def mutter(self, text, *args):
+ @staticmethod
+ def mutter(text, *args):
if 'commit' in debug.debug_flags:
mutter(text, *args)
@@ -427,7 +427,6 @@
repository_latest_revnum = self.repository.get_latest_revnum()
lock = self.repository.transport.lock_write(".")
set_revprops = self._config.get_set_revprops()
- remaining_revprops = self._svn_revprops # Keep track of the revprops that haven't been set yet
# Store file ids
def _dir_process_file_id(old_inv, new_inv, path, file_id):
@@ -711,7 +710,6 @@
target._clear_cached_state()
finally:
pb.finished()
- (new_revno, new_revid) = target.last_revision_info()
return revid_map
finally:
source.unlock()
@@ -786,8 +784,6 @@
if 'validate' in debug.debug_flags and push_metadata:
crev = target.repository.get_revision(revision_id)
ctree = target.repository.revision_tree(revision_id)
- treedelta = ctree.changes_from(old_tree)
- assert not treedelta.has_changed(), "treedelta: %r" % treedelta
assert crev.committer == rev.committer
assert crev.timezone == rev.timezone
assert crev.timestamp == rev.timestamp
=== modified file 'convert.py'
--- a/convert.py 2008-08-23 02:31:58 +0000
+++ b/convert.py 2008-08-23 14:55:24 +0000
@@ -20,7 +20,7 @@
from bzrlib import osutils, ui, urlutils
from bzrlib.bzrdir import BzrDir, Converter
from bzrlib.errors import (BzrError, NotBranchError, NoSuchFile,
- NoRepositoryPresent, NoSuchRevision)
+ NoRepositoryPresent)
from bzrlib.repository import InterRepository
from bzrlib.revision import ensure_null
from bzrlib.transport import get_transport
@@ -250,6 +250,7 @@
"""Create a SvnConverter.
:param target_format: The format the resulting repository should be.
"""
+ super(SvnConverter, self).__init__()
self.target_format = target_format
def convert(self, to_convert, pb):
=== modified file 'errors.py'
--- a/errors.py 2008-08-09 12:13:53 +0000
+++ b/errors.py 2008-08-23 14:55:24 +0000
@@ -19,7 +19,7 @@
LockError, NotBranchError, PermissionDenied,
DependencyNotPresent, NoRepositoryPresent,
TransportError, UnexpectedEndOfContainerError,
- RedirectRequested, NoSuchRevision)
+ NoSuchRevision)
import urllib
from bzrlib.plugins.svn import core
=== modified file 'fetch.py'
--- a/fetch.py 2008-08-22 02:32:27 +0000
+++ b/fetch.py 2008-08-23 14:55:24 +0000
@@ -15,7 +15,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Fetching revisions from Subversion repositories in batches."""
-import bzrlib
from bzrlib import debug, delta, osutils, ui, urlutils
from bzrlib.errors import NoSuchRevision
from bzrlib.inventory import Inventory
@@ -29,13 +28,9 @@
from bzrlib.plugins.svn import properties
from bzrlib.plugins.svn.delta import apply_txdelta_handler
from bzrlib.plugins.svn.errors import InvalidFileName
-from bzrlib.plugins.svn.logwalker import lazy_dict
from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_PREFIX, SVN_REVPROP_BZR_SIGNATURE)
-from bzrlib.plugins.svn.properties import parse_externals_description
from bzrlib.plugins.svn.repository import SvnRepository, SvnRepositoryFormat
-from bzrlib.plugins.svn.svk import SVN_PROP_SVK_MERGE
from bzrlib.plugins.svn.transport import _url_escape_uri
-from bzrlib.plugins.svn.tree import inventory_add_external
FETCH_COMMIT_WRITE_SIZE = 500
@@ -94,14 +89,6 @@
def set_target_revision(self, revnum):
assert self.revmeta.revnum == revnum
- def _get_id_map(self):
- if self._id_map is not None:
- return self._id_map
-
- self._id_map = self.source.transform_fileid_map(self.revmeta, self.mapping)
-
- return self._id_map
-
def open_root(self, base_revnum):
return self._open_root(base_revnum)
@@ -111,9 +98,6 @@
def abort(self):
pass
- def _get_map_id(self, new_path):
- return self._get_id_map().get(new_path)
-
class DirectoryBuildEditor(object):
def __init__(self, editor, path):
@@ -470,6 +454,17 @@
assert ie.revision is not None
return DirectoryRevisionBuildEditor(self, "", old_file_id, file_id, file_parents)
+ def _get_id_map(self):
+ if self._id_map is not None:
+ return self._id_map
+
+ self._id_map = self.source.transform_fileid_map(self.revmeta, self.mapping)
+
+ return self._id_map
+
+ def _get_map_id(self, new_path):
+ return self._get_id_map().get(new_path)
+
def _get_old_id(self, parent_id, old_path):
assert isinstance(old_path, unicode)
assert isinstance(parent_id, str)
=== modified file 'fileids.py'
--- a/fileids.py 2008-08-09 02:56:27 +0000
+++ b/fileids.py 2008-08-23 14:55:24 +0000
@@ -25,7 +25,6 @@
import urllib
from bzrlib.plugins.svn import changes
-from bzrlib.plugins.svn.mapping import escape_svn_path
def get_local_changes(paths, branch, mapping, layout, generate_revid,
get_children=None):
=== modified file 'format.py'
--- a/format.py 2008-08-23 10:15:40 +0000
+++ b/format.py 2008-08-23 14:55:24 +0000
@@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Subversion BzrDir formats."""
-from bzrlib.bzrdir import BzrDirFormat, BzrDir, format_registry
+from bzrlib.bzrdir import BzrDirFormat, format_registry
from bzrlib.errors import UninitializableFormat
from bzrlib.lazy_import import lazy_import
from bzrlib.lockable_files import TransportLock
=== modified file 'logwalker.py'
--- a/logwalker.py 2008-08-22 14:56:28 +0000
+++ b/logwalker.py 2008-08-23 14:55:24 +0000
@@ -17,7 +17,6 @@
from bzrlib import urlutils
from bzrlib.errors import NoSuchRevision
-from bzrlib.trace import mutter
import bzrlib.ui as ui
from bzrlib.plugins.svn import changes, core
=== modified file 'mapping.py'
--- a/mapping.py 2008-08-05 00:14:32 +0000
+++ b/mapping.py 2008-08-23 14:55:24 +0000
@@ -15,11 +15,11 @@
"""Maps between Subversion and Bazaar semantics."""
-from bzrlib import log, osutils, registry
+from bzrlib import osutils, registry
from bzrlib.errors import InvalidRevisionId
from bzrlib.trace import mutter
-from bzrlib.plugins.svn import core, errors, properties, version_info
+from bzrlib.plugins.svn import errors, properties, version_info
import calendar
import time
import urllib
=== modified file 'parents.py'
--- a/parents.py 2008-07-09 02:26:11 +0000
+++ b/parents.py 2008-08-23 14:55:24 +0000
@@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from bzrlib import debug, errors
+from bzrlib import debug
from bzrlib.knit import make_file_factory
from bzrlib.trace import mutter
from bzrlib.revision import NULL_REVISION
=== modified file 'remote.py'
--- a/remote.py 2008-08-23 10:15:40 +0000
+++ b/remote.py 2008-08-23 14:55:24 +0000
@@ -17,15 +17,13 @@
import bzrlib
from bzrlib import urlutils
-from bzrlib.bzrdir import BzrDirFormat, BzrDir, format_registry
-from bzrlib.errors import (NotBranchError, NotLocalUrl, NoRepositoryPresent,
- NoWorkingTree, AlreadyBranchError)
+from bzrlib.bzrdir import BzrDirFormat, BzrDir
+from bzrlib.errors import (NotLocalUrl, NoWorkingTree, AlreadyBranchError)
from bzrlib.trace import warning
-from bzrlib.transport.local import LocalTransport
from bzrlib.plugins.svn import core
from bzrlib.plugins.svn.errors import NoSvnRepositoryPresent
-from bzrlib.plugins.svn.format import get_rich_root_format, SvnRemoteFormat
+from bzrlib.plugins.svn.format import SvnRemoteFormat
from bzrlib.plugins.svn.repository import SvnRepository
from bzrlib.plugins.svn.transport import bzr_to_svn_url, get_svn_ra_transport
=== modified file 'repository.py'
--- a/repository.py 2008-08-23 10:15:40 +0000
+++ b/repository.py 2008-08-23 14:55:24 +0000
@@ -15,9 +15,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Subversion repository access."""
-import bzrlib
-from bzrlib import delta, osutils, ui, urlutils, xml7
-from bzrlib.branch import Branch, BranchCheckResult
+from bzrlib import osutils, ui, urlutils, xml7
+from bzrlib.branch import BranchCheckResult
from bzrlib.errors import (InvalidRevisionId, NoSuchRevision, NotBranchError,
UninitializableFormat)
from bzrlib.graph import CachingParentsProvider
@@ -27,7 +26,7 @@
from bzrlib.revisiontree import RevisionTree
from bzrlib.revision import Revision, NULL_REVISION, ensure_null
from bzrlib.transport import Transport, get_transport
-from bzrlib.trace import info, mutter
+from bzrlib.trace import info
from itertools import chain
import os
@@ -38,12 +37,10 @@
from bzrlib.plugins.svn.changes import changes_path, find_prev_location
from bzrlib.plugins.svn.config import SvnRepositoryConfig
from bzrlib.plugins.svn.core import SubversionException
-from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_REVISION_ID, SVN_REVPROP_BZR_SIGNATURE,
- parse_revision_metadata, parse_revid_property,
- parse_merge_property, BzrSvnMapping,
- get_default_mapping, parse_revision_id,
+from bzrlib.plugins.svn.mapping import (SVN_REVPROP_BZR_SIGNATURE,
+ BzrSvnMapping,
+ get_default_mapping,
parse_svn_dateprop)
-from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
from bzrlib.plugins.svn.parents import DiskCachingParentsProvider
from bzrlib.plugins.svn.revids import CachingRevidMap, RevidMap
from bzrlib.plugins.svn.svk import (SVN_PROP_SVK_MERGE, svk_features_merged_since,
@@ -51,7 +48,6 @@
from bzrlib.plugins.svn.tree import SvnRevisionTree
from bzrlib.plugins.svn.versionedfiles import (SvnTexts, VirtualRevisionTexts,
VirtualInventoryTexts, VirtualSignatureTexts)
-import urllib
def full_paths(find_children, paths, bp, from_bp, from_rev):
for c in find_children(from_bp, from_rev):
=== modified file 'revids.py'
--- a/revids.py 2008-08-23 02:39:45 +0000
+++ b/revids.py 2008-08-23 14:55:24 +0000
@@ -16,13 +16,12 @@
"""Revision id generation and caching."""
-from bzrlib import debug
from bzrlib.errors import (InvalidRevisionId, NoSuchRevision)
from bzrlib.trace import mutter
from bzrlib.plugins.svn.cache import CacheTable
from bzrlib.plugins.svn.core import SubversionException
-from bzrlib.plugins.svn.errors import InvalidPropertyValue, ERR_FS_NO_SUCH_REVISION, ERR_FS_NOT_DIRECTORY, InvalidBzrSvnRevision
+from bzrlib.plugins.svn.errors import InvalidPropertyValue, ERR_FS_NO_SUCH_REVISION, InvalidBzrSvnRevision
from bzrlib.plugins.svn.mapping import (parse_revision_id, BzrSvnMapping,
SVN_PROP_BZR_REVISION_ID, parse_revid_property)
from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
=== modified file 'tags.py'
--- a/tags.py 2008-08-22 21:52:54 +0000
+++ b/tags.py 2008-08-23 14:55:24 +0000
@@ -17,7 +17,7 @@
from bzrlib.errors import NoSuchRevision, NoSuchTag
from bzrlib.tag import BasicTags
-from bzrlib.plugins.svn import cache, core
+from bzrlib.plugins.svn import core
class SubversionTags(BasicTags):
def __init__(self, branch):
=== modified file 'tests/test_branch.py'
--- a/tests/test_branch.py 2008-08-22 05:02:07 +0000
+++ b/tests/test_branch.py 2008-08-23 14:55:24 +0000
@@ -275,11 +275,6 @@
branch = Branch.open(repos_url)
self.assertEqual(None, branch.get_parent())
- def test_append_revision(self):
- repos_url = self.make_repository('a')
- branch = Branch.open(repos_url)
- branch.append_revision([])
-
def test_get_push_location(self):
repos_url = self.make_repository('a')
branch = Branch.open(repos_url)
=== modified file 'transport.py'
--- a/transport.py 2008-08-22 16:13:03 +0000
+++ b/transport.py 2008-08-23 14:55:24 +0000
@@ -19,18 +19,17 @@
import bzrlib
from bzrlib import debug, urlutils
from bzrlib.errors import (NoSuchFile, TransportNotPossible,
- FileExists, NotLocalUrl, InvalidURL)
+ FileExists, NotLocalUrl, InvalidURL, RedirectRequested)
from bzrlib.trace import mutter, warning
from bzrlib.transport import Transport
import bzrlib.plugins.svn
-from bzrlib.plugins.svn import core, properties, ra
+from bzrlib.plugins.svn import ra
from bzrlib.plugins.svn import properties
from bzrlib.plugins.svn.auth import create_auth_baton
from bzrlib.plugins.svn.client import get_config
from bzrlib.plugins.svn.core import SubversionException
-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, ERR_RA_DAV_RELOCATED, RedirectRequested, ERR_RA_DAV_PATH_NOT_FOUND
-from bzrlib.plugins.svn.ra import RemoteAccess
+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_DIRECTORY, ERR_RA_DAV_RELOCATED, ERR_RA_DAV_PATH_NOT_FOUND
import urlparse
import urllib
More information about the bazaar-commits
mailing list