Rev 3244: (Michael Hudson) clean up option.py and branch.py imports in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Feb 28 22:10:17 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3244
revision-id:pqm at pqm.ubuntu.com-20080228221007-0r6qkug2m0np2s31
parent: pqm at pqm.ubuntu.com-20080228195416-virz04ciql01hw4y
parent: michael.hudson at canonical.com-20080226234535-8nsggshqg9jelwpl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-02-28 22:10:07 +0000
message:
(Michael Hudson) clean up option.py and branch.py imports
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
------------------------------------------------------------
revno: 3236.1.2
revision-id:michael.hudson at canonical.com-20080226234535-8nsggshqg9jelwpl
parent: michael.hudson at canonical.com-20080226234524-dkb3xnwnaj912yco
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: remove-pointless-lazy-imports
timestamp: Wed 2008-02-27 12:45:35 +1300
message:
clean up branch.py imports
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
------------------------------------------------------------
revno: 3236.1.1
revision-id:michael.hudson at canonical.com-20080226234524-dkb3xnwnaj912yco
parent: pqm at pqm.ubuntu.com-20080225092119-bk1won32t9nw4h6u
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: remove-pointless-lazy-imports
timestamp: Wed 2008-02-27 12:45:24 +1300
message:
clean up option.py imports
modified:
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py 2008-02-24 16:42:13 +0000
+++ b/bzrlib/branch.py 2008-02-26 23:45:35 +0000
@@ -15,13 +15,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-from cStringIO import StringIO
-
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
-from warnings import warn
-
-import bzrlib
from bzrlib import (
bzrdir,
cache_utf8,
@@ -30,16 +25,13 @@
errors,
lockdir,
lockable_files,
- osutils,
revision as _mod_revision,
transport,
- tree,
tsort,
ui,
urlutils,
)
-from bzrlib.config import BranchConfig, TreeConfig
-from bzrlib.lockable_files import LockableFiles, TransportLock
+from bzrlib.config import BranchConfig
from bzrlib.tag import (
BasicTags,
DisabledTags,
@@ -47,20 +39,9 @@
""")
from bzrlib.decorators import needs_read_lock, needs_write_lock
-from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches,
- HistoryMissing, InvalidRevisionId,
- InvalidRevisionNumber, LockError, NoSuchFile,
- NoSuchRevision, NotVersionedError,
- NotBranchError, UninitializableFormat,
- UnlistableStore, UnlistableBranch,
- )
from bzrlib.hooks import Hooks
-from bzrlib.symbol_versioning import (deprecated_function,
- deprecated_method,
- DEPRECATED_PARAMETER,
- deprecated_passed,
- zero_eight, zero_nine, zero_sixteen,
- zero_ninetyone,
+from bzrlib.symbol_versioning import (deprecated_method,
+ zero_sixteen,
)
from bzrlib.trace import mutter, mutter_callsite, note, is_quiet
@@ -338,7 +319,7 @@
assert isinstance(revno, int)
rh = self.revision_history()
if not (1 <= revno <= len(rh)):
- raise InvalidRevisionNumber(revno)
+ raise errors.InvalidRevisionNumber(revno)
return self.repository.get_revision_delta(rh[revno-1])
@deprecated_method(zero_sixteen)
@@ -464,7 +445,7 @@
common_index = min(self_len, other_len) -1
if common_index >= 0 and \
self_history[common_index] != other_history[common_index]:
- raise DivergedBranches(self, other)
+ raise errors.DivergedBranches(self, other)
if stop_revision is None:
stop_revision = other_len
@@ -643,7 +624,7 @@
Zero (the NULL revision) is considered invalid
"""
if revno < 1 or revno > self.revno():
- raise InvalidRevisionNumber(revno)
+ raise errors.InvalidRevisionNumber(revno)
@needs_read_lock
def clone(self, to_bzrdir, revision_id=None):
@@ -851,8 +832,8 @@
transport = a_bzrdir.get_branch_transport(None)
format_string = transport.get("format").read()
return klass._formats[format_string]
- except NoSuchFile:
- raise NotBranchError(path=transport.base)
+ except errors.NoSuchFile:
+ raise errors.NotBranchError(path=transport.base)
except KeyError:
raise errors.UnknownFormatError(format=format_string)
@@ -1140,8 +1121,8 @@
_control_files=control_files,
a_bzrdir=a_bzrdir,
_repository=a_bzrdir.find_repository())
- except NoSuchFile:
- raise NotBranchError(path=transport.base)
+ except errors.NoSuchFile:
+ raise errors.NotBranchError(path=transport.base)
class BzrBranchFormat6(BzrBranchFormat5):
@@ -1548,7 +1529,7 @@
for l in _locs:
try:
return self.control_files.get(l).read().strip('\n')
- except NoSuchFile:
+ except errors.NoSuchFile:
pass
return None
@@ -1632,7 +1613,7 @@
result.old_revno, result.old_revid = target.last_revision_info()
try:
target.update_revisions(self, stop_revision)
- except DivergedBranches:
+ except errors.DivergedBranches:
if not overwrite:
raise
if overwrite:
@@ -1771,7 +1752,7 @@
else:
try:
self.control_files._transport.delete('bound')
- except NoSuchFile:
+ except errors.NoSuchFile:
return False
return True
@@ -2088,6 +2069,6 @@
new_branch.control_files._transport.delete('revision-history')
try:
branch.set_parent(None)
- except NoSuchFile:
+ except errors.NoSuchFile:
pass
branch.set_bound_location(None)
=== modified file 'bzrlib/option.py'
--- a/bzrlib/option.py 2007-12-28 20:10:14 +0000
+++ b/bzrlib/option.py 2008-02-26 23:45:24 +0000
@@ -17,22 +17,21 @@
# TODO: For things like --diff-prefix, we want a way to customize the display
# of the option argument.
+import optparse
import re
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
-import optparse
-
from bzrlib import (
errors,
+ revisionspec,
+ )
+""")
+
+from bzrlib import (
log,
registry,
- revisionspec,
- symbol_versioning,
)
-""")
-from bzrlib.trace import warning
-
def _parse_revision_str(revstr):
"""This handles a revision string -> revno.
More information about the bazaar-commits
mailing list