Rev 438: Merge two trivial fixes from the 0.3 branch. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

Jelmer Vernooij jelmer at samba.org
Mon Mar 19 15:55:42 GMT 2007


At http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

------------------------------------------------------------
revno: 438
revision-id: jelmer at samba.org-20070319112336-stvy6ag2g60xhxva
parent: jelmer at samba.org-20070317214040-o4vewd607anbvfme
parent: jelmer at samba.org-20070319023001-rc2qdo3u0s2bcbvk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-03-19 12:23:36 +0100
message:
  Merge two trivial fixes from the 0.3 branch.
modified:
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  fileids.py                     fileids.py-20060714013623-u5iiyqqnko11grcf-1
  format.py                      format.py-20060406233823-b6fa009fe35dfde7
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  upgrade.py                     upgrade.py-20070106192108-0rakplee2lzah4gs-1
    ------------------------------------------------------------
    revno: 402.1.33
    merged: jelmer at samba.org-20070319023001-rc2qdo3u0s2bcbvk
    parent: jelmer at samba.org-20070319013749-bkub1tns29ynk3zu
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Mon 2007-03-19 03:30:01 +0100
    message:
      Mark as compatible with 0.16.
    ------------------------------------------------------------
    revno: 402.1.32
    merged: jelmer at samba.org-20070319013749-bkub1tns29ynk3zu
    parent: jelmer at samba.org-20070319010520-78ofoyhu3eay30pv
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Mon 2007-03-19 02:37:49 +0100
    message:
      Fix typo.
    ------------------------------------------------------------
    revno: 402.1.31
    merged: jelmer at samba.org-20070319010520-78ofoyhu3eay30pv
    parent: jelmer at samba.org-20070315160951-gv05hnso079m6gu1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Mon 2007-03-19 02:05:20 +0100
    message:
      Allow overriding of ui_factory by other plugins (in particular, bzr-gtk).
=== modified file '__init__.py'
--- a/__init__.py	2007-03-17 21:25:43 +0000
+++ b/__init__.py	2007-03-19 11:23:36 +0000
@@ -29,21 +29,24 @@
     from warnings import warn as warning
 
 __version__ = '0.4.0'
-required_bzr_version = (0,16)
+compatible_bzr_versions = [(0,15),(0,16)]
 
 def check_bzrlib_version(desired):
     """Check that bzrlib is compatible.
 
-    If version is < desired version, assume incompatible.
-    If version == desired version, assume completely compatible
-    If version == desired version + 1, assume compatible, with deprecations
+    If version is < all compatible version, assume incompatible.
+    If version is compatible version + 1, assume compatible, with deprecations
     Otherwise, assume incompatible.
     """
-    desired_plus = (desired[0], desired[1]+1)
     bzrlib_version = bzrlib.version_info[:2]
-    if bzrlib_version == desired:
+    if bzrlib_version in desired:
         return
-    if bzrlib_version < desired:
+    try:
+        from bzrlib.trace import warning
+    except ImportError:
+        # get the message out any way we can
+        from warnings import warn as warning
+    if bzrlib_version < desired[0]:
         warning('Installed bzr version %s is too old to be used with bzr-svn'
                 ' %s.' % (bzrlib.__version__, __version__))
         # Not using BzrNewError, because it may not exist.
@@ -52,7 +55,7 @@
         warning('bzr-svn is not up to date with installed bzr version %s.'
                 ' \nThere should be a newer version of bzr-svn available.' 
                 % (bzrlib.__version__))
-        if bzrlib_version != desired_plus:
+        if not (bzrlib_version[0], bzrlib_version[1]-1) in desired:
             raise Exception, 'Version mismatch'
 
 def check_subversion_version():
@@ -85,13 +88,7 @@
         raise bzrlib.errors.BzrError("incompatible sqlite library")
 
 check_bzrlib_version(required_bzr_version)
-
-def check_workingtree_format():
-    try:
-        from bzrlib.workingtree import WorkingTreeFormat4
-    except ImportError:
-        warning('this version of bzr-svn requires WorkingTreeFormat4 to be available to work properly')
-check_workingtree_format()
+check_bzrlib_version(compatible_bzr_versions)
 check_subversion_version()
 check_pysqlite_version()
 

=== modified file 'convert.py'
--- a/convert.py	2007-03-15 16:40:04 +0000
+++ b/convert.py	2007-03-19 11:23:36 +0000
@@ -29,7 +29,7 @@
 from bzrlib.trace import info, mutter
 from bzrlib.transport import get_transport
 import bzrlib.urlutils as urlutils
-from bzrlib.ui import ui_factory
+import bzrlib.ui as ui
 
 from format import SvnRemoteAccess, SvnFormat
 from repository import SvnRepository
@@ -110,7 +110,7 @@
             if all:
                 source_repos.copy_content_into(target_repos)
 
-        pb = ui_factory.nested_progress_bar()
+        pb = ui.ui_factory.nested_progress_bar()
         try:
             branches = source_repos.find_branches(pb=pb)
             existing_branches = filter(lambda (bp, revnum, exists): exists, 
@@ -118,7 +118,7 @@
         finally:
             pb.finished()
 
-        pb = ui_factory.nested_progress_bar()
+        pb = ui.ui_factory.nested_progress_bar()
                        
         try:
             i = 0

=== modified file 'fetch.py'
--- a/fetch.py	2007-03-16 22:25:24 +0000
+++ b/fetch.py	2007-03-19 11:23:36 +0000
@@ -20,7 +20,7 @@
 from bzrlib.revision import Revision
 from bzrlib.repository import InterRepository
 from bzrlib.trace import mutter
-from bzrlib.ui import ui_factory
+import bzrlib.ui as ui
 
 from copy import copy
 from cStringIO import StringIO
@@ -363,7 +363,7 @@
         transport = self.source.transport
         self.target.lock_write()
         if pb is None:
-            pb = ui_factory.nested_progress_bar()
+            pb = ui.ui_factory.nested_progress_bar()
             nested_pb = pb
         else:
             nested_pb = None

=== modified file 'fileids.py'
--- a/fileids.py	2007-03-16 00:25:16 +0000
+++ b/fileids.py	2007-03-19 11:23:36 +0000
@@ -19,7 +19,7 @@
 from bzrlib.revision import NULL_REVISION
 from bzrlib.trace import mutter
 from bzrlib.transport import get_transport
-from bzrlib.ui import ui_factory
+import bzrlib.ui as ui
 import bzrlib.urlutils as urlutils
 from warnings import warn
 
@@ -172,7 +172,7 @@
 
         todo.reverse()
         
-        pb = ui_factory.nested_progress_bar()
+        pb = ui.ui_factory.nested_progress_bar()
 
         try:
             i = 1

=== modified file 'format.py'
--- a/format.py	2007-03-15 16:40:04 +0000
+++ b/format.py	2007-03-19 11:23:36 +0000
@@ -17,7 +17,6 @@
 from bzrlib.bzrdir import BzrDirFormat, BzrDir
 from bzrlib.errors import NotBranchError, NotLocalUrl, NoRepositoryPresent
 from bzrlib.lockable_files import TransportLock
-from bzrlib.ui import ui_factory
 from bzrlib.transport.local import LocalTransport
 import bzrlib.urlutils as urlutils
 

=== modified file 'logwalker.py'
--- a/logwalker.py	2007-03-16 22:25:24 +0000
+++ b/logwalker.py	2007-03-19 11:23:36 +0000
@@ -17,7 +17,7 @@
 from bzrlib.errors import NoSuchRevision, BzrError, NotBranchError
 from bzrlib.progress import DummyProgress
 from bzrlib.trace import mutter
-from bzrlib.ui import ui_factory
+import bzrlib.ui as ui
 
 import os
 
@@ -100,7 +100,7 @@
         """
         to_revnum = max(self.last_revnum, to_revnum)
 
-        pb = ui_factory.nested_progress_bar()
+        pb = ui.ui_factory.nested_progress_bar()
 
         def rcvr(orig_paths, rev, author, date, message, pool):
             pb.update('fetching svn revision info', rev, to_revnum)

=== modified file 'repository.py'
--- a/repository.py	2007-03-16 22:25:24 +0000
+++ b/repository.py	2007-03-19 11:23:36 +0000
@@ -29,7 +29,6 @@
 from bzrlib.revision import Revision, NULL_REVISION
 from bzrlib.transport import Transport
 from bzrlib.trace import mutter
-from bzrlib.ui import ui_factory
 
 from svn.core import SubversionException, Pool
 import svn.core

=== modified file 'upgrade.py'
--- a/upgrade.py	2007-01-29 18:50:19 +0000
+++ b/upgrade.py	2007-03-19 11:23:36 +0000
@@ -18,7 +18,7 @@
 from bzrlib.config import Config
 from bzrlib.errors import BzrError, InvalidRevisionId
 from bzrlib.trace import mutter
-from bzrlib.ui import ui_factory
+import bzrlib.ui as ui
 
 from repository import (MAPPING_VERSION, parse_svn_revision_id, 
                         unescape_svn_path, generate_svn_revision_id)
@@ -90,7 +90,7 @@
     oldtree = MapTree(repository.revision_tree(oldrevid), new_id)
     oldinv = repository.get_revision_inventory(oldrevid)
     total = len(oldinv)
-    pb = ui_factory.nested_progress_bar()
+    pb = ui.ui_factory.nested_progress_bar()
     try:
         for path, ie in oldinv.iter_entries():
             pb.update('upgrading revision', i, total)
@@ -188,7 +188,7 @@
             for x in graph:
                 if revid in graph[x]:
                     yield x
-        pb = ui_factory.nested_progress_bar()
+        pb = ui.ui_factory.nested_progress_bar()
         i = 0
         try:
             for revid in graph:
@@ -231,7 +231,7 @@
             pb.finished()
 
         # Make sure all the required current version revisions are present
-        pb = ui_factory.nested_progress_bar()
+        pb = ui.ui_factory.nested_progress_bar()
         i = 0
         try:
             for revid in needed_revs:
@@ -241,7 +241,7 @@
         finally:
             pb.finished()
 
-        pb = ui_factory.nested_progress_bar()
+        pb = ui.ui_factory.nested_progress_bar()
         i = 0
         total = len(needs_upgrading)
         try:




More information about the bazaar-commits mailing list