Rev 1618: Fix more formatting issues, add pylintrc file. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk
Jelmer Vernooij
jelmer at samba.org
Sat Aug 23 16:14:30 BST 2008
At http://people.samba.org/bzr/jelmer/bzr-svn/trunk
------------------------------------------------------------
revno: 1618
revision-id: jelmer at samba.org-20080823151426-507xy9ew7vfee3qj
parent: jelmer at samba.org-20080823145524-rsj2gu7yev8isuc8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-08-23 17:14:26 +0200
message:
Fix more formatting issues, add pylintrc file.
added:
pylintrc pylintrc-20080823145756-v0g6mkeqg0j7bn1x-1
modified:
mapping3/scheme.py scheme.py-20060516195850-95181aae6b272f9e
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
tests/test_branchprops.py test_branchprops.py-20061223210444-04xf5224zcg69m3w-1
tests/test_changes.py test_changes.py-20080529111734-f7fbshmnlgnvue45-1
tests/test_checkout.py test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
tests/test_client.py test_client.py-20080603021344-lmgexez0yoyp9b1s-1
tests/test_convert.py test_convert.py-20060705203611-b1l0bapeku6foco0-1
tests/test_core.py test_core.py-20080603032119-q91zmret1lv84ay9-1
tests/test_fetch.py test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
tests/test_mapping.py test_mapping.py-20080201131338-0zd86eznn4bojtee-1
tests/test_properties.py test_properties.py-20080703215223-t5ydp87wwi7dtyas-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
tests/test_repository.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_revids.py test_revids.py-20070516230044-d7x872cqi7xb4eow-1
tests/test_transport.py test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
tests/test_tree.py test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
tests/test_upgrade.py test_upgrade.py-20070106170128-64zt3eqggg4tng1c-1
tests/test_versionedfiles.py test_versionedfiles.-20080626153242-v0c6uolklpux67a1-1
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
versionedfiles.py versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'mapping3/scheme.py'
--- a/mapping3/scheme.py 2008-08-22 20:41:03 +0000
+++ b/mapping3/scheme.py 2008-08-23 15:14:26 +0000
@@ -19,13 +19,10 @@
from bzrlib.errors import BzrError
from bzrlib.trace import mutter
-from bzrlib.errors import NotBranchError
-
from base64 import urlsafe_b64decode, urlsafe_b64encode
from bzrlib.plugins.svn.errors import InvalidSvnBranchPath
from bzrlib.plugins.svn import properties
import bz2
-import urllib
class BranchingScheme(object):
""" Divides SVN repository data up into branches. Since there
=== added file 'pylintrc'
--- a/pylintrc 1970-01-01 00:00:00 +0000
+++ b/pylintrc 2008-08-23 15:14:26 +0000
@@ -0,0 +1,299 @@
+[MASTER]
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Profiled execution.
+profile=no
+
+# Add <file or directory> to the black list. It should be a base name, not a
+# path. You may set this option multiple times.
+ignore=.bzr
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# Set the cache size for astng objects.
+cache-size=500
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+
+[MESSAGES CONTROL]
+
+# Enable only checker(s) with the given id(s). This option conflicts with the
+# disable-checker option
+#enable-checker=
+
+# Enable all checker(s) except those with the given id(s). This option
+# conflicts with the enable-checker option
+#disable-checker=
+
+# Enable all messages in the listed categories.
+#enable-msg-cat=
+
+# Disable all messages in the listed categories.
+#disable-msg-cat=
+
+# Enable the message(s) with the given id(s).
+#enable-msg=
+
+# Disable the message(s) with the given id(s).
+#disable-msg=
+
+
+[REPORTS]
+
+# set the output format. Available formats are text, parseable, colorized, msvs
+# (visual studio) and html
+output-format=text
+
+# Include message's id in output
+include-ids=no
+
+# Put messages in a separate file for each module / package specified on the
+# command line instead of printing them on stdout. Reports (if any) will be
+# written in a file name "pylint_global.[txt|html]".
+files-output=no
+
+# Tells wether to display a full report or only the messages
+reports=yes
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note).You have access to the variables errors warning, statement which
+# respectivly contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (R0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Add a comment according to your evaluation note. This is used by the global
+# evaluation report (R0004).
+comment=no
+
+# Enable the report(s) with the given id(s).
+#enable-report=
+
+# Disable the report(s) with the given id(s).
+#disable-report=
+
+
+# try to find bugs in the code using type inference
+#
+[TYPECHECK]
+
+# Tells wether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# List of classes names for which member attributes should not be checked
+# (useful for classes with attributes dynamicaly set).
+ignored-classes=SQLObject
+
+# When zope mode is activated, consider the acquired-members option to ignore
+# access to some undefined attributes.
+zope=no
+
+# List of members which are usually get through zope's acquisition mecanism and
+# so shouldn't trigger E0201 when accessed (need zope=yes to be considered).
+acquired-members=REQUEST,acl_users,aq_parent
+
+
+# checks for :
+# * doc strings
+# * modules / classes / functions / methods / arguments / variables name
+# * number of arguments, local variables, branchs, returns and statements in
+# functions, methods
+# * required module attributes
+# * dangerous default values as arguments
+# * redefinition of function / method / class
+# * uses of the global statement
+#
+[BASIC]
+
+# Required attributes for module, separated by a comma
+required-attributes=
+
+# Regular expression which should only match functions or classes name which do
+# not require a docstring
+no-docstring-rgx=__.*__
+
+# Regular expression which should only match correct module names
+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Regular expression which should only match correct module level names
+const-rgx=(([a-zA-Z_][a-zA-Z1-9_]*)|(__.*__))$
+
+# Regular expression which should only match correct class names
+class-rgx=[a-zA-Z_][a-zA-Z0-9_]+$
+
+# Regular expression which should only match correct function names
+function-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct method names
+method-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct instance attribute names
+attr-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct argument names
+argument-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct variable names
+variable-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct list comprehension /
+# generator expression variable names
+inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
+
+# Good variable names which should always be accepted, separated by a comma
+good-names=i,j,k,ex,Run,_
+
+# Bad variable names which should always be refused, separated by a comma
+bad-names=foo,bar,baz,toto,tutu,tata
+
+# List of builtins function names that should not be used, separated by a comma
+bad-functions=map,filter,apply,input
+
+
+# checks for
+# * unused variables / imports
+# * undefined variables
+# * redefinition of variable from builtins or from an outer scope
+# * use of variable before assigment
+#
+[VARIABLES]
+
+# Tells wether we should check for unused import in __init__ files.
+init-import=no
+
+# A regular expression matching names used for dummy variables (i.e. not used).
+dummy-variables-rgx=_|dummy
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+
+# checks for :
+# * methods without self as first argument
+# * overridden methods signature
+# * access only to existant members via self
+# * attributes not defined in the __init__ method
+# * supported interfaces implementation
+# * unreachable code
+#
+[CLASSES]
+
+# List of interface methods to ignore, separated by a comma. This is used for
+# instance to not check methods defines in Zope's Interface base class.
+ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,__new__,setUp
+
+
+# checks for sign of poor/misdesign:
+# * number of methods, attributes, local variables...
+# * size, complexity of functions, methods
+#
+[DESIGN]
+# Maximum number of arguments for function / method
+# Set to 50 for bzr-svn because we have no control over bzr's API
+max-args=50
+
+# Maximum number of locals for function / method body
+max-locals=15
+
+# Maximum number of return / yield for function / method body
+max-returns=6
+
+# Maximum number of branch for function / method body
+max-branchs=12
+
+# Maximum number of statements in function / method body
+max-statements=50
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+# Maximum number of public methods for a class (see R0904).
+# Set to 50 for bzr-svn because we have no control over bzr's API
+max-public-methods=50
+
+
+# checks for
+# * external modules dependencies
+# * relative / wildcard imports
+# * cyclic imports
+# * uses of deprecated modules
+#
+[IMPORTS]
+
+# Deprecated modules which should not be used, separated by a comma
+deprecated-modules=regsub,string,TERMIOS,Bastion,rexec
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report R0402 must not be disabled)
+import-graph=
+
+# Create a graph of external dependencies in the given file (report R0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of internal dependencies in the given file (report R0402 must
+# not be disabled)
+int-import-graph=
+
+
+# checks for :
+# * unauthorized constructions
+# * strict indentation
+# * line length
+# * use of <> instead of !=
+#
+[FORMAT]
+
+# Maximum number of characters on a single line.
+max-line-length=80
+
+# Maximum number of lines in a module
+max-module-lines=1000
+
+# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
+# tab).
+indent-string=' '
+
+
+# checks for:
+# * warning notes in the code like FIXME, XXX
+# * PEP 263: source code with non ascii character but no encoding declaration
+#
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,XXX,TODO
+
+
+# checks for similarities and duplicated code. This computation may be
+# memory / CPU intensive, so you should disable it if you experiments some
+# problems.
+#
+[SIMILARITIES]
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
=== modified file 'tests/test_blackbox.py'
--- a/tests/test_blackbox.py 2008-08-08 22:09:21 +0000
+++ b/tests/test_blackbox.py 2008-08-23 15:14:26 +0000
@@ -19,7 +19,6 @@
from bzrlib.repository import Repository
from bzrlib.tests.blackbox import ExternalBase
from bzrlib.tests import KnownFailure
-from bzrlib.trace import mutter
from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
from bzrlib.plugins.svn.mapping3.scheme import NoBranchingScheme
=== modified file 'tests/test_branchprops.py'
--- a/tests/test_branchprops.py 2008-06-23 02:40:47 +0000
+++ b/tests/test_branchprops.py 2008-08-23 15:14:26 +0000
@@ -16,8 +16,6 @@
"""Branch property access tests."""
-from bzrlib.errors import NoSuchRevision
-
from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
from bzrlib.plugins.svn.branchprops import PathPropertyProvider
from bzrlib.plugins.svn.logwalker import LogWalker, CachingLogWalker
=== modified file 'tests/test_changes.py'
--- a/tests/test_changes.py 2008-07-01 20:42:36 +0000
+++ b/tests/test_changes.py 2008-08-23 15:14:26 +0000
@@ -14,7 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from bzrlib.tests import TestCase
-from bzrlib.plugins.svn.changes import path_is_child, find_prev_location, changes_path
+from bzrlib.plugins.svn.changes import path_is_child, find_prev_location
class PathIsChildTests(TestCase):
def test_both_empty(self):
=== modified file 'tests/test_checkout.py'
--- a/tests/test_checkout.py 2008-06-23 02:42:42 +0000
+++ b/tests/test_checkout.py 2008-08-23 15:14:26 +0000
@@ -21,7 +21,6 @@
from bzrlib.errors import NoRepositoryPresent, UninitializableFormat
from bzrlib.tests import TestCase
-from bzrlib.plugins.svn.convert import SvnConverter
from bzrlib.plugins.svn.workingtree import SvnWorkingTreeFormat
from bzrlib.plugins.svn.format import SvnWorkingTreeDirFormat
from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
=== modified file 'tests/test_client.py'
--- a/tests/test_client.py 2008-06-22 13:35:17 +0000
+++ b/tests/test_client.py 2008-08-23 15:14:26 +0000
@@ -15,7 +15,6 @@
"""Subversion client library tests."""
-from bzrlib.tests import TestCase
from bzrlib.plugins.svn import client
from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
=== modified file 'tests/test_convert.py'
--- a/tests/test_convert.py 2008-08-22 15:47:02 +0000
+++ b/tests/test_convert.py 2008-08-23 15:14:26 +0000
@@ -22,7 +22,6 @@
from bzrlib.urlutils import local_path_to_url
from bzrlib.repository import Repository
from bzrlib.tests import TestCaseInTempDir
-from bzrlib.trace import mutter
import os, sys
=== modified file 'tests/test_core.py'
--- a/tests/test_core.py 2008-07-03 22:10:49 +0000
+++ b/tests/test_core.py 2008-08-23 15:14:26 +0000
@@ -16,7 +16,7 @@
"""Subversion core library tests."""
from bzrlib.tests import TestCase
-from bzrlib.plugins.svn import core, properties
+from bzrlib.plugins.svn import core
class TestCore(TestCase):
def setUp(self):
=== modified file 'tests/test_fetch.py'
--- a/tests/test_fetch.py 2008-07-28 22:56:42 +0000
+++ b/tests/test_fetch.py 2008-08-23 15:14:26 +0000
@@ -30,7 +30,7 @@
from bzrlib.plugins.svn.convert import load_dumpfile
from bzrlib.plugins.svn.errors import InvalidFileName
from bzrlib.plugins.svn.mapping3 import set_branching_scheme
-from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
+from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme
from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
from bzrlib.plugins.svn.transport import SvnRaTransport
=== modified file 'tests/test_mapping.py'
--- a/tests/test_mapping.py 2008-08-05 00:14:32 +0000
+++ b/tests/test_mapping.py 2008-08-23 15:14:26 +0000
@@ -18,9 +18,8 @@
import sha
from bzrlib.errors import InvalidRevisionId
-from bzrlib.tests import TestCase, adapt_tests, TestNotApplicable
+from bzrlib.tests import TestCase, TestNotApplicable
from bzrlib.revision import Revision
-from bzrlib.trace import mutter
from bzrlib.plugins.svn.errors import InvalidPropertyValue
from bzrlib.plugins.svn.mapping import (generate_revision_metadata, parse_revision_metadata,
=== modified file 'tests/test_properties.py'
--- a/tests/test_properties.py 2008-07-08 13:21:43 +0000
+++ b/tests/test_properties.py 2008-08-23 15:14:26 +0000
@@ -16,7 +16,7 @@
"""Subversion core library tests."""
from bzrlib.tests import TestCase
-from bzrlib.plugins.svn import core, properties
+from bzrlib.plugins.svn import properties
class TestProperties(TestCase):
def setUp(self):
=== modified file 'tests/test_push.py'
--- a/tests/test_push.py 2008-08-09 01:58:00 +0000
+++ b/tests/test_push.py 2008-08-23 15:14:26 +0000
@@ -16,23 +16,19 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-from bzrlib.branch import Branch, BranchReferenceFormat
-from bzrlib.bzrdir import BzrDir, BzrDirFormat
+from bzrlib.branch import Branch
+from bzrlib.bzrdir import BzrDir
from bzrlib.errors import AlreadyBranchError, BzrError, DivergedBranches
-from bzrlib.inventory import Inventory
from bzrlib.merge import Merger, Merge3Merger
from bzrlib.osutils import has_symlinks
from bzrlib.progress import DummyProgress
from bzrlib.repository import Repository
-from bzrlib.tests import KnownFailure, TestCaseWithTransport
from bzrlib.trace import mutter
-from bzrlib.workingtree import WorkingTree
import os
-from time import sleep
from bzrlib.plugins.svn import core, format, ra
-from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix
+from bzrlib.plugins.svn.errors import MissingPrefix
from bzrlib.plugins.svn.commit import push, dpush
from bzrlib.plugins.svn.mapping import SVN_PROP_BZR_REVISION_ID
from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
=== modified file 'tests/test_radir.py'
--- a/tests/test_radir.py 2008-07-04 04:26:18 +0000
+++ b/tests/test_radir.py 2008-08-23 15:14:26 +0000
@@ -19,10 +19,10 @@
from bzrlib import osutils
from bzrlib.branch import Branch
from bzrlib.bzrdir import BzrDir, format_registry
-from bzrlib.errors import (NoRepositoryPresent, NotBranchError, NotLocalUrl,
+from bzrlib.errors import (NoRepositoryPresent, NotLocalUrl,
NoWorkingTree, AlreadyBranchError)
-from bzrlib.plugins.svn import core, ra
+from bzrlib.plugins.svn import core
from bzrlib.plugins.svn.format import SvnRemoteFormat
from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
from bzrlib.plugins.svn.transport import SvnRaTransport
=== modified file 'tests/test_repository.py'
--- a/tests/test_repository.py 2008-08-23 10:54:14 +0000
+++ b/tests/test_repository.py 2008-08-23 15:14:26 +0000
@@ -22,14 +22,14 @@
from bzrlib.branch import Branch
from bzrlib.bzrdir import BzrDir, format_registry
from bzrlib.config import GlobalConfig
-from bzrlib.errors import NoSuchRevision, UninitializableFormat, BzrError
+from bzrlib.errors import NoSuchRevision, UninitializableFormat
from bzrlib.inventory import Inventory
from bzrlib.osutils import has_symlinks
from bzrlib.repository import Repository
-from bzrlib.revision import NULL_REVISION, Revision
+from bzrlib.revision import NULL_REVISION
from bzrlib.tests import TestCase, TestSkipped
-import os, sys
+import os
from bzrlib.plugins.svn import format, ra
from bzrlib.plugins.svn.mapping import (escape_svn_path, unescape_svn_path,
@@ -38,7 +38,6 @@
set_property_scheme, BzrSvnMappingv3)
from bzrlib.plugins.svn.mapping3.scheme import (TrunkBranchingScheme, NoBranchingScheme,
ListBranchingScheme, SingleBranchingScheme)
-from bzrlib.plugins.svn.transport import SvnRaTransport
from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
from bzrlib.plugins.svn.repository import SvnRepositoryFormat
=== modified file 'tests/test_revids.py'
--- a/tests/test_revids.py 2008-08-04 16:08:25 +0000
+++ b/tests/test_revids.py 2008-08-23 15:14:26 +0000
@@ -14,12 +14,10 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-from bzrlib.errors import NoSuchRevision, InvalidRevisionId
-from bzrlib.repository import Repository
+from bzrlib.errors import NoSuchRevision
from bzrlib.tests import TestCase
from bzrlib.plugins.svn.revids import RevisionIdMapCache
-from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
class TestRevidMapCache(TestCase):
def test_create(self):
=== modified file 'tests/test_transport.py'
--- a/tests/test_transport.py 2008-07-07 16:09:01 +0000
+++ b/tests/test_transport.py 2008-08-23 15:14:26 +0000
@@ -16,14 +16,13 @@
"""Subversion transport tests."""
-from bzrlib.errors import NotBranchError, NoSuchFile, FileExists, InvalidURL
+from bzrlib.errors import NoSuchFile, FileExists, InvalidURL
from bzrlib import urlutils
from bzrlib.plugins.svn import core, ra
from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
from bzrlib.plugins.svn.transport import SvnRaTransport, bzr_to_svn_url, _url_unescape_uri
-import os
from unittest import TestCase
class SvnRaTest(TestCaseWithSubversionRepository):
=== modified file 'tests/test_tree.py'
--- a/tests/test_tree.py 2008-08-09 14:18:23 +0000
+++ b/tests/test_tree.py 2008-08-23 15:14:26 +0000
@@ -19,16 +19,13 @@
from bzrlib.osutils import has_symlinks
from bzrlib.repository import Repository
from bzrlib.revision import NULL_REVISION
-from bzrlib.tests import TestCase, TestSkipped
-from bzrlib.workingtree import WorkingTree
+from bzrlib.tests import TestSkipped
from bzrlib.plugins.svn import errors
from bzrlib.plugins.svn.core import SubversionException
from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
from bzrlib.plugins.svn.tree import SvnBasisTree, inventory_add_external
-import os
-import sys
class TestBasisTree(TestCaseWithSubversionRepository):
def test_executable(self):
=== modified file 'tests/test_upgrade.py'
--- a/tests/test_upgrade.py 2008-06-27 00:02:33 +0000
+++ b/tests/test_upgrade.py 2008-08-23 15:14:26 +0000
@@ -17,13 +17,11 @@
"""Mapping upgrade tests."""
from bzrlib.bzrdir import BzrDir
-from bzrlib.errors import InvalidRevisionId
from bzrlib.repository import Repository
-from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
+from bzrlib.tests import TestCase, TestSkipped
from bzrlib.plugins.svn.errors import RebaseNotPresent
from bzrlib.plugins.svn.format import get_rich_root_format
-from bzrlib.plugins.svn.mapping import (BzrSvnMappingv2, BzrSvnMappingv1)
from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme
from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
=== modified file 'tests/test_versionedfiles.py'
--- a/tests/test_versionedfiles.py 2008-08-01 21:18:01 +0000
+++ b/tests/test_versionedfiles.py 2008-08-23 15:14:26 +0000
@@ -14,7 +14,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from bzrlib import osutils
-from bzrlib.graph import DictParentsProvider
from bzrlib.tests import TestCase
from bzrlib.plugins.svn.versionedfiles import (SvnTexts, VirtualRevisionTexts,
=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py 2008-06-22 04:51:45 +0000
+++ b/tests/test_workingtree.py 2008-08-23 15:14:26 +0000
@@ -18,7 +18,6 @@
"""Working tree tests."""
from bzrlib.branch import Branch
-from bzrlib.bzrdir import BzrDir
from bzrlib.errors import NoSuchFile, OutOfDateTree
from bzrlib.inventory import Inventory
from bzrlib.osutils import has_symlinks, supports_executable
@@ -26,12 +25,11 @@
from bzrlib.trace import mutter
from bzrlib.workingtree import WorkingTree
-from bzrlib.plugins.svn import wc
from bzrlib.plugins.svn.transport import svn_config
from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
from bzrlib.plugins.svn.workingtree import generate_ignore_list
-import os, sys
+import os
class TestWorkingTree(TestCaseWithSubversionRepository):
def test_add_duplicate(self):
=== modified file 'transport.py'
--- a/transport.py 2008-08-23 14:55:24 +0000
+++ b/transport.py 2008-08-23 15:14:26 +0000
@@ -25,7 +25,6 @@
import bzrlib.plugins.svn
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
=== modified file 'tree.py'
--- a/tree.py 2008-08-09 02:30:39 +0000
+++ b/tree.py 2008-08-23 15:14:26 +0000
@@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Access to stored Subversion basis trees."""
-from bzrlib import osutils, urlutils, ui
+from bzrlib import osutils, urlutils
from bzrlib.branch import Branch
from bzrlib.inventory import Inventory, InventoryDirectory, TreeReference
from bzrlib.revision import CURRENT_REVISION
=== modified file 'upgrade.py'
--- a/upgrade.py 2008-05-29 16:30:36 +0000
+++ b/upgrade.py 2008-08-23 15:14:26 +0000
@@ -16,8 +16,7 @@
"""Upgrading revisions made with older versions of the mapping."""
from bzrlib.errors import BzrError, InvalidRevisionId
-from bzrlib.trace import info, mutter
-import bzrlib.ui as ui
+from bzrlib.trace import info
import itertools
from bzrlib.plugins.svn.mapping import parse_revision_id
=== modified file 'versionedfiles.py'
--- a/versionedfiles.py 2008-08-09 03:00:45 +0000
+++ b/versionedfiles.py 2008-08-23 15:14:26 +0000
@@ -13,9 +13,8 @@
# 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, osutils, urlutils
-from bzrlib.trace import mutter
-from bzrlib.versionedfile import FulltextContentFactory, VersionedFiles, AbsentContentFactory, VirtualVersionedFiles
+from bzrlib import osutils, urlutils
+from bzrlib.versionedfile import FulltextContentFactory, VersionedFiles, VirtualVersionedFiles
from bzrlib.plugins.svn.core import SubversionException
from bzrlib.plugins.svn.errors import ERR_FS_NOT_FILE
=== modified file 'workingtree.py'
--- a/workingtree.py 2008-08-23 10:44:08 +0000
+++ b/workingtree.py 2008-08-23 15:14:26 +0000
@@ -20,15 +20,13 @@
from bzrlib.branch import PullResult
from bzrlib.bzrdir import BzrDirFormat, BzrDir
from bzrlib.errors import (InvalidRevisionId, NotBranchError, NoSuchFile,
- NoRepositoryPresent, BzrError, UninitializableFormat,
+ NoRepositoryPresent,
OutOfDateTree, NoWorkingTree, UnsupportedFormatError)
from bzrlib.inventory import Inventory, InventoryFile, InventoryLink
-from bzrlib.lockable_files import TransportLock, LockableFiles
+from bzrlib.lockable_files import LockableFiles
from bzrlib.lockdir import LockDir
from bzrlib.revision import NULL_REVISION
from bzrlib.trace import mutter
-from bzrlib.revisiontree import RevisionTree
-from bzrlib.transport.local import LocalTransport
from bzrlib.workingtree import WorkingTree, WorkingTreeFormat
from bzrlib.plugins.svn import core, properties
@@ -36,9 +34,8 @@
from bzrlib.plugins.svn.branch import SvnBranch
from bzrlib.plugins.svn.client import Client
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
-from bzrlib.plugins.svn.errors import LocalCommitsUnsupported, NoSvnRepositoryPresent, ERR_FS_TXN_OUT_OF_DATE, ERR_ENTRY_EXISTS, ERR_WC_PATH_NOT_FOUND, ERR_WC_NOT_DIRECTORY, NotSvnBranchPath
+from bzrlib.plugins.svn.errors import LocalCommitsUnsupported, ERR_FS_TXN_OUT_OF_DATE, ERR_ENTRY_EXISTS, ERR_WC_PATH_NOT_FOUND, ERR_WC_NOT_DIRECTORY, NotSvnBranchPath
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,
More information about the bazaar-commits
mailing list