Rev 5197: (Jelmer) Remove unused imports. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sat May 1 05:34:57 BST 2010
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 5197 [merge]
revision-id: pqm at pqm.ubuntu.com-20100501043455-hc1xylhnwoemafbx
parent: pqm at pqm.ubuntu.com-20100501031857-vbb4gqeyoi1wgdfn
parent: jelmer at samba.org-20100430113543-tiqqhmqa3d8no4iu
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2010-05-01 05:34:55 +0100
message:
(Jelmer) Remove unused imports.
modified:
bzrlib/_readdir_py.py readdir.py-20060609152855-rm6v321vuaqyh9tu-3
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/clean_tree.py clean_tree.py-20050827022328-5ba46e22d074695c
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/externalcommand.py externalcommand.py-20050901092254-b4fc642a55bb815b
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/identitymap.py identitymap.py-20051007040721-83e837d831a6636a
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/per_repository_chk/__init__.py __init__.py-20080925061730-e4g24t5xstp2n2vp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/textinv.py textinv.py-20050411024435-e3898231b7d1897b26c38878
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
=== modified file 'bzrlib/_readdir_py.py'
--- a/bzrlib/_readdir_py.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/_readdir_py.py 2010-04-30 11:03:59 +0000
@@ -17,7 +17,6 @@
"""Python implementation of readdir interface."""
-import os
import stat
=== modified file 'bzrlib/add.py'
--- a/bzrlib/add.py 2009-04-04 02:50:01 +0000
+++ b/bzrlib/add.py 2010-04-30 11:03:59 +0000
@@ -16,15 +16,11 @@
"""Helper functions for adding files to working trees."""
-import errno
-import os
import sys
import bzrlib.bzrdir
-import bzrlib.errors as errors
import bzrlib.osutils
from bzrlib.symbol_versioning import *
-from bzrlib.workingtree import WorkingTree
class AddAction(object):
=== modified file 'bzrlib/atomicfile.py'
--- a/bzrlib/atomicfile.py 2010-03-10 13:25:36 +0000
+++ b/bzrlib/atomicfile.py 2010-04-30 11:03:59 +0000
@@ -16,7 +16,6 @@
import os
-import sys
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
=== modified file 'bzrlib/bugtracker.py'
--- a/bzrlib/bugtracker.py 2010-02-17 17:11:16 +0000
+++ b/bzrlib/bugtracker.py 2010-04-30 11:03:59 +0000
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-from bzrlib import registry, help_topics
+from bzrlib import registry
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
from bzrlib import errors, urlutils
=== modified file 'bzrlib/check.py'
--- a/bzrlib/check.py 2010-04-23 00:44:15 +0000
+++ b/bzrlib/check.py 2010-04-30 11:35:43 +0000
@@ -46,13 +46,9 @@
indicating that the revision was found/not found.
"""
-from bzrlib import errors, osutils
-from bzrlib import repository as _mod_repository
-from bzrlib import revision
+from bzrlib import errors
from bzrlib.branch import Branch
from bzrlib.bzrdir import BzrDir
-from bzrlib.errors import BzrCheckError
-from bzrlib.repository import Repository
from bzrlib.revision import NULL_REVISION
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
from bzrlib.trace import note
=== modified file 'bzrlib/clean_tree.py'
--- a/bzrlib/clean_tree.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/clean_tree.py 2010-04-30 11:03:59 +0000
@@ -15,12 +15,10 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-import errno
import os
import shutil
-import sys
-from bzrlib.osutils import has_symlinks, isdir
+from bzrlib.osutils import isdir
from bzrlib.trace import note
from bzrlib.workingtree import WorkingTree
=== modified file 'bzrlib/commit.py'
--- a/bzrlib/commit.py 2010-04-10 09:22:04 +0000
+++ b/bzrlib/commit.py 2010-04-30 11:35:43 +0000
@@ -49,20 +49,12 @@
# TODO: Change the parameter 'rev_id' to 'revision_id' to be consistent with
# the rest of the code; add a deprecation of the old name.
-import os
-import re
-import sys
-import time
-
-from cStringIO import StringIO
-
from bzrlib import (
debug,
errors,
revision,
trace,
tree,
- xml_serializer,
)
from bzrlib.branch import Branch
from bzrlib.cleanup import OperationWithCleanups
@@ -72,20 +64,13 @@
StrictCommitFailed
)
from bzrlib.osutils import (get_user_encoding,
- kind_marker, isdir,isfile, is_inside_any,
- is_inside_or_parent_of_any,
+ is_inside_any,
minimum_path_selection,
- quotefn, sha_file, split_lines,
splitpath,
)
-from bzrlib.testament import Testament
-from bzrlib.trace import mutter, note, warning, is_quiet
+from bzrlib.trace import mutter, note, is_quiet
from bzrlib.inventory import Inventory, InventoryEntry, make_entry
from bzrlib import symbol_versioning
-from bzrlib.symbol_versioning import (deprecated_passed,
- deprecated_function,
- DEPRECATED_PARAMETER)
-from bzrlib.workingtree import WorkingTree
from bzrlib.urlutils import unescape_for_display
import bzrlib.ui
=== modified file 'bzrlib/conflicts.py'
--- a/bzrlib/conflicts.py 2010-04-02 19:12:58 +0000
+++ b/bzrlib/conflicts.py 2010-04-30 11:35:43 +0000
@@ -18,7 +18,6 @@
# point down
import os
-import re
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
=== modified file 'bzrlib/delta.py'
--- a/bzrlib/delta.py 2010-03-19 23:58:06 +0000
+++ b/bzrlib/delta.py 2010-04-30 11:35:43 +0000
@@ -15,12 +15,9 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
from bzrlib import (
- errors,
osutils,
)
-from bzrlib.inventory import InventoryEntry
-from bzrlib.trace import mutter, is_quiet
-from bzrlib.symbol_versioning import deprecated_function
+from bzrlib.trace import is_quiet
class TreeDelta(object):
=== modified file 'bzrlib/diff.py'
--- a/bzrlib/diff.py 2010-04-19 04:10:53 +0000
+++ b/bzrlib/diff.py 2010-04-30 11:35:43 +0000
@@ -17,7 +17,6 @@
import difflib
import os
import re
-import shutil
import string
import sys
=== modified file 'bzrlib/externalcommand.py'
--- a/bzrlib/externalcommand.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/externalcommand.py 2010-04-30 11:03:59 +0000
@@ -20,10 +20,8 @@
import os
-import sys
from bzrlib.commands import Command
-from bzrlib.osutils import pathjoin
class ExternalCommand(Command):
=== modified file 'bzrlib/fetch.py'
--- a/bzrlib/fetch.py 2010-03-21 21:39:33 +0000
+++ b/bzrlib/fetch.py 2010-04-30 11:35:43 +0000
@@ -35,7 +35,6 @@
import bzrlib
from bzrlib import (
errors,
- symbol_versioning,
ui,
)
from bzrlib.revision import NULL_REVISION
=== modified file 'bzrlib/help.py'
--- a/bzrlib/help.py 2010-02-17 17:11:16 +0000
+++ b/bzrlib/help.py 2010-04-30 11:03:59 +0000
@@ -30,7 +30,6 @@
help_topics,
osutils,
plugin,
- symbol_versioning,
)
=== modified file 'bzrlib/hooks.py'
--- a/bzrlib/hooks.py 2010-03-12 19:59:50 +0000
+++ b/bzrlib/hooks.py 2010-04-30 11:03:59 +0000
@@ -18,7 +18,6 @@
"""Support for plugin hooking logic."""
from bzrlib import registry
from bzrlib.lazy_import import lazy_import
-from bzrlib.symbol_versioning import deprecated_method
lazy_import(globals(), """
import textwrap
=== modified file 'bzrlib/identitymap.py'
--- a/bzrlib/identitymap.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/identitymap.py 2010-04-30 11:03:59 +0000
@@ -20,7 +20,6 @@
from bzrlib import (
errors,
- osutils,
)
=== modified file 'bzrlib/info.py'
--- a/bzrlib/info.py 2010-04-21 09:57:18 +0000
+++ b/bzrlib/info.py 2010-04-30 11:35:43 +0000
@@ -17,13 +17,11 @@
__all__ = ['show_bzrdir_info']
from cStringIO import StringIO
-import os
import time
import sys
from bzrlib import (
bzrdir,
- diff,
errors,
hooks as _mod_hooks,
osutils,
=== modified file 'bzrlib/lockable_files.py'
--- a/bzrlib/lockable_files.py 2009-10-15 02:11:18 +0000
+++ b/bzrlib/lockable_files.py 2010-04-30 11:03:59 +0000
@@ -14,8 +14,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-from cStringIO import StringIO
-
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
import codecs
@@ -34,10 +32,6 @@
from bzrlib.decorators import (
only_raises,
)
-from bzrlib.symbol_versioning import (
- deprecated_in,
- deprecated_method,
- )
# XXX: The tracking here of lock counts and whether the lock is held is
=== modified file 'bzrlib/memorytree.py'
--- a/bzrlib/memorytree.py 2009-04-09 20:23:07 +0000
+++ b/bzrlib/memorytree.py 2010-04-30 11:03:59 +0000
@@ -25,10 +25,9 @@
from bzrlib import (
errors,
mutabletree,
- osutils,
revision as _mod_revision,
)
-from bzrlib.decorators import needs_read_lock, needs_write_lock
+from bzrlib.decorators import needs_read_lock
from bzrlib.osutils import sha_file
from bzrlib.mutabletree import needs_tree_write_lock
from bzrlib.transport.memory import MemoryTransport
=== modified file 'bzrlib/missing.py'
--- a/bzrlib/missing.py 2009-08-17 18:52:01 +0000
+++ b/bzrlib/missing.py 2010-04-30 11:03:59 +0000
@@ -18,8 +18,6 @@
from bzrlib import (
log,
- repository as _mod_repository,
- tsort,
)
import bzrlib.revision as _mod_revision
=== modified file 'bzrlib/msgeditor.py'
--- a/bzrlib/msgeditor.py 2010-04-07 22:22:27 +0000
+++ b/bzrlib/msgeditor.py 2010-04-30 11:35:43 +0000
@@ -18,7 +18,6 @@
"""Commit message editor support."""
import codecs
-import errno
import os
from subprocess import call
import sys
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py 2010-04-27 07:52:08 +0000
+++ b/bzrlib/osutils.py 2010-04-30 11:35:43 +0000
@@ -17,12 +17,10 @@
import os
import re
import stat
-from stat import (S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE,
- S_ISCHR, S_ISBLK, S_ISFIFO, S_ISSOCK)
+from stat import S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE
import sys
import time
import codecs
-import warnings
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
=== modified file 'bzrlib/plugins/launchpad/lp_directory.py'
--- a/bzrlib/plugins/launchpad/lp_directory.py 2010-02-17 17:11:16 +0000
+++ b/bzrlib/plugins/launchpad/lp_directory.py 2010-03-30 11:05:14 +0000
@@ -17,14 +17,13 @@
"""Directory lookup that uses Launchpad."""
-from urlparse import urlsplit, urlunsplit
+from urlparse import urlsplit
import xmlrpclib
from bzrlib import (
debug,
errors,
trace,
- urlutils,
)
from bzrlib.transport import (
get_transport,
=== modified file 'bzrlib/progress.py'
--- a/bzrlib/progress.py 2010-02-25 06:42:33 +0000
+++ b/bzrlib/progress.py 2010-04-30 11:03:59 +0000
@@ -27,12 +27,7 @@
import os
-from bzrlib import (
- errors,
- )
-from bzrlib.trace import mutter
from bzrlib.symbol_versioning import (
- deprecated_function,
deprecated_in,
deprecated_method,
)
=== modified file 'bzrlib/push.py'
--- a/bzrlib/push.py 2010-02-16 16:08:40 +0000
+++ b/bzrlib/push.py 2010-04-30 11:03:59 +0000
@@ -17,8 +17,6 @@
"""UI helper for the push command."""
from bzrlib import (
- builtins,
- branch,
bzrdir,
errors,
revision as _mod_revision,
=== modified file 'bzrlib/reconcile.py'
--- a/bzrlib/reconcile.py 2010-04-23 00:44:15 +0000
+++ b/bzrlib/reconcile.py 2010-04-30 11:35:43 +0000
@@ -30,7 +30,6 @@
cleanup,
errors,
ui,
- repository,
)
from bzrlib.trace import mutter
from bzrlib.tsort import topo_sort
=== modified file 'bzrlib/revisiontree.py'
--- a/bzrlib/revisiontree.py 2010-02-17 17:11:16 +0000
+++ b/bzrlib/revisiontree.py 2010-04-30 11:03:59 +0000
@@ -20,9 +20,7 @@
from bzrlib import (
errors,
- osutils,
revision,
- symbol_versioning,
tree,
)
=== modified file 'bzrlib/shelf.py'
--- a/bzrlib/shelf.py 2009-09-11 07:55:48 +0000
+++ b/bzrlib/shelf.py 2010-04-30 11:03:59 +0000
@@ -23,11 +23,8 @@
errors,
merge,
merge3,
- osutils,
pack,
transform,
- ui,
- workingtree,
)
=== modified file 'bzrlib/status.py'
--- a/bzrlib/status.py 2010-04-15 20:22:04 +0000
+++ b/bzrlib/status.py 2010-04-30 11:35:43 +0000
@@ -20,14 +20,10 @@
delta as _mod_delta,
log,
osutils,
- tree,
tsort,
revision as _mod_revision,
)
import bzrlib.errors as errors
-from bzrlib.osutils import is_inside_any
-from bzrlib.symbol_versioning import (deprecated_function,
- )
from bzrlib.trace import mutter, warning
# TODO: when showing single-line logs, truncate to the width of the terminal
=== modified file 'bzrlib/tests/per_repository_chk/__init__.py'
--- a/bzrlib/tests/per_repository_chk/__init__.py 2009-09-08 06:25:26 +0000
+++ b/bzrlib/tests/per_repository_chk/__init__.py 2010-03-31 16:29:25 +0000
@@ -27,7 +27,6 @@
repository,
remote,
)
-from bzrlib.bzrdir import BzrDir
from bzrlib.repofmt.pack_repo import (
RepositoryFormatKnitPack5,
)
@@ -36,7 +35,6 @@
)
from bzrlib.tests import (
multiply_tests,
- TestSuite,
)
from bzrlib.tests.per_repository import (
all_repository_format_scenarios,
=== modified file 'bzrlib/tests/test_repository.py'
--- a/bzrlib/tests/test_repository.py 2010-02-09 21:03:24 +0000
+++ b/bzrlib/tests/test_repository.py 2010-03-31 16:29:25 +0000
@@ -23,12 +23,10 @@
"""
from stat import S_ISDIR
-from StringIO import StringIO
import sys
import bzrlib
-from bzrlib.errors import (NotBranchError,
- NoSuchFile,
+from bzrlib.errors import (NoSuchFile,
UnknownFormatError,
UnsupportedFormatError,
)
@@ -36,31 +34,23 @@
graph,
tests,
)
-from bzrlib.branchbuilder import BranchBuilder
from bzrlib.btree_index import BTreeBuilder, BTreeGraphIndex
-from bzrlib.index import GraphIndex, InMemoryGraphIndex
+from bzrlib.index import GraphIndex
from bzrlib.repository import RepositoryFormat
-from bzrlib.smart import server
from bzrlib.tests import (
TestCase,
TestCaseWithTransport,
- TestSkipped,
- test_knit,
)
from bzrlib.transport import (
- fakenfs,
get_transport,
)
from bzrlib import (
- bencode,
bzrdir,
errors,
inventory,
osutils,
- progress,
repository,
revision as _mod_revision,
- symbol_versioning,
upgrade,
versionedfile,
workingtree,
=== modified file 'bzrlib/textinv.py'
--- a/bzrlib/textinv.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/textinv.py 2010-04-30 11:03:59 +0000
@@ -16,7 +16,7 @@
from bzrlib.errors import BzrError
-from bzrlib.inventory import InventoryEntry, Inventory
+from bzrlib.inventory import Inventory
START_MARK = "# bzr inventory format 3\n"
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py 2010-04-28 07:53:34 +0000
+++ b/bzrlib/transform.py 2010-04-30 11:35:43 +0000
@@ -35,7 +35,7 @@
)
""")
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
- ReusingTransform, NotVersionedError, CantMoveRoot,
+ ReusingTransform, CantMoveRoot,
ExistingLimbo, ImmortalLimbo, NoFinalPath,
UnableCreateSymlink)
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
=== modified file 'bzrlib/transport/chroot.py'
--- a/bzrlib/transport/chroot.py 2010-02-23 07:43:11 +0000
+++ b/bzrlib/transport/chroot.py 2010-04-07 12:19:40 +0000
@@ -19,12 +19,8 @@
"""
from bzrlib.transport import (
- get_transport,
pathfilter,
register_transport,
- Server,
- Transport,
- unregister_transport,
)
=== modified file 'bzrlib/tree.py'
--- a/bzrlib/tree.py 2010-02-17 05:12:01 +0000
+++ b/bzrlib/tree.py 2010-04-30 11:03:59 +0000
@@ -36,7 +36,6 @@
from bzrlib.inventory import InventoryFile
from bzrlib.inter import InterObject
from bzrlib.osutils import fingerprint_file
-import bzrlib.revision
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
from bzrlib.trace import note
=== modified file 'bzrlib/uncommit.py'
--- a/bzrlib/uncommit.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/uncommit.py 2010-04-30 11:03:59 +0000
@@ -18,8 +18,6 @@
# TODO: make the guts of this methods on tree, branch.
-import os
-
from bzrlib import (
errors,
revision as _mod_revision,
=== modified file 'bzrlib/version.py'
--- a/bzrlib/version.py 2010-02-23 07:43:11 +0000
+++ b/bzrlib/version.py 2010-04-30 11:03:59 +0000
@@ -27,7 +27,6 @@
osutils,
trace,
)
-from bzrlib.branch import Branch
def show_version(show_config=True, show_copyright=True, to_file=None):
=== modified file 'bzrlib/versionedfile.py'
--- a/bzrlib/versionedfile.py 2010-02-17 17:11:16 +0000
+++ b/bzrlib/versionedfile.py 2010-04-30 11:03:59 +0000
@@ -45,7 +45,6 @@
from bzrlib.graph import DictParentsProvider, Graph, StackedParentsProvider
from bzrlib.transport.memory import MemoryTransport
""")
-from bzrlib.inter import InterObject
from bzrlib.registry import Registry
from bzrlib.symbol_versioning import *
from bzrlib.textmerge import TextMerge
=== modified file 'bzrlib/weave.py'
--- a/bzrlib/weave.py 2009-06-10 03:56:49 +0000
+++ b/bzrlib/weave.py 2010-04-30 11:03:59 +0000
@@ -69,8 +69,6 @@
from copy import copy
from cStringIO import StringIO
import os
-import time
-import warnings
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
@@ -79,14 +77,11 @@
from bzrlib import (
errors,
osutils,
- progress,
)
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
RevisionAlreadyPresent,
RevisionNotPresent,
UnavailableRepresentation,
- WeaveRevisionAlreadyPresent,
- WeaveRevisionNotPresent,
)
from bzrlib.osutils import dirname, sha, sha_strings, split_lines
import bzrlib.patiencediff
=== modified file 'bzrlib/win32utils.py'
--- a/bzrlib/win32utils.py 2010-02-23 07:43:11 +0000
+++ b/bzrlib/win32utils.py 2010-04-30 11:03:59 +0000
@@ -21,7 +21,6 @@
import glob
import os
-import re
import struct
import sys
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py 2010-04-27 04:30:01 +0000
+++ b/bzrlib/workingtree.py 2010-04-30 11:35:43 +0000
@@ -95,7 +95,6 @@
from bzrlib.filters import filtered_input_file
from bzrlib.trace import mutter, note
from bzrlib.transport.local import LocalTransport
-from bzrlib.progress import ProgressPhase
from bzrlib.revision import CURRENT_REVISION
from bzrlib.rio import RioReader, rio_file, Stanza
from bzrlib.symbol_versioning import (
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2010-03-10 09:31:25 +0000
+++ b/bzrlib/workingtree_4.py 2010-04-30 11:03:59 +0000
@@ -53,7 +53,6 @@
from bzrlib.decorators import needs_read_lock, needs_write_lock
from bzrlib.filters import filtered_input_file, internal_size_sha_file_byname
from bzrlib.inventory import Inventory, ROOT_ID, entry_factory
-import bzrlib.mutabletree
from bzrlib.mutabletree import needs_tree_write_lock
from bzrlib.osutils import (
file_kind,
=== modified file 'bzrlib/xml4.py'
--- a/bzrlib/xml4.py 2010-02-17 17:11:16 +0000
+++ b/bzrlib/xml4.py 2010-04-30 11:03:59 +0000
@@ -16,12 +16,11 @@
from bzrlib.xml_serializer import (
Element,
- ElementTree,
SubElement,
XMLSerializer,
escape_invalid_chars,
)
-from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
+from bzrlib.inventory import ROOT_ID, Inventory
import bzrlib.inventory as inventory
from bzrlib.revision import Revision
from bzrlib.errors import BzrError
=== modified file 'bzrlib/xml8.py'
--- a/bzrlib/xml8.py 2010-02-17 17:11:16 +0000
+++ b/bzrlib/xml8.py 2010-04-30 11:03:59 +0000
@@ -30,7 +30,7 @@
XMLSerializer,
escape_invalid_chars,
)
-from bzrlib.inventory import ROOT_ID, Inventory, InventoryEntry
+from bzrlib.inventory import InventoryEntry
from bzrlib.revision import Revision
from bzrlib.errors import BzrError
=== modified file 'bzrlib/xml_serializer.py'
--- a/bzrlib/xml_serializer.py 2010-02-17 17:11:16 +0000
+++ b/bzrlib/xml_serializer.py 2010-04-30 11:03:59 +0000
@@ -23,7 +23,7 @@
# ElementTree bits
from bzrlib.serializer import Serializer
-from bzrlib.trace import mutter, warning
+from bzrlib.trace import mutter
try:
try:
More information about the bazaar-commits
mailing list