Rev 1176: Move rebase checking to __init__.py. in file:///data/jelmer/bzr-svn/dpush/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/dpush/

------------------------------------------------------------
revno: 1176
revision-id: jelmer at samba.org-20080518143426-vre0xj5w05x8z2u9
parent: jelmer at samba.org-20080518143313-ygxwi1rmj5jczw2g
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: dpush
timestamp: Sun 2008-05-18 16:34:26 +0200
message:
  Move rebase checking to __init__.py.
modified:
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  upgrade.py                     upgrade.py-20070106192108-0rakplee2lzah4gs-1
=== modified file '__init__.py'
--- a/__init__.py	2008-05-15 01:23:34 +0000
+++ b/__init__.py	2008-05-18 14:34:26 +0000
@@ -82,6 +82,25 @@
     import svn.core
     mutter("bzr-svn: using Subversion %d.%d.%d (%s)" % (svn.core.SVN_VER_MAJOR, svn.core.SVN_VER_MINOR, svn.core.SVN_VER_MICRO, svn.core.__file__))
 
+
+def check_rebase_version(min_version):
+    """Check what version of bzr-rebase is installed.
+
+    Raises an exception when the version installed is older than 
+    min_version.
+
+    :raises RebaseNotPresent: Raised if bzr-rebase is not installed or too old.
+    """
+    from bzrlib.plugins.svn.errors import RebaseNotPresent
+    try:
+        from bzrlib.plugins.rebase import version_info as rebase_version_info
+        if rebase_version_info[:2] < min_version:
+            raise RebaseNotPresent("Version %r present, at least %r required" 
+                                   % (rebase_version_info, min_version))
+    except ImportError, e:
+        raise RebaseNotPresent(e)
+
+
 check_subversion_version()
 
 register_transport_proto('svn+ssh://', 

=== modified file 'upgrade.py'
--- a/upgrade.py	2008-05-18 14:33:13 +0000
+++ b/upgrade.py	2008-05-18 14:34:26 +0000
@@ -19,7 +19,6 @@
 from bzrlib.trace import info, mutter
 import bzrlib.ui as ui
 
-from errors import RebaseNotPresent
 import itertools
 from bzrlib.plugins.svn.mapping import parse_revision_id
 
@@ -112,23 +111,6 @@
 
 MIN_REBASE_VERSION = (0, 2)
 
-def check_rebase_version(min_version):
-    """Check what version of bzr-rebase is installed.
-
-    Raises an exception when the version installed is older than 
-    min_version.
-
-    :raises RebaseNotPresent: Raised if bzr-rebase is not installed or too old.
-    """
-    try:
-        from bzrlib.plugins.rebase import version_info as rebase_version_info
-        if rebase_version_info[:2] < min_version:
-            raise RebaseNotPresent("Version %r present, at least %r required" 
-                                   % (rebase_version_info, min_version))
-    except ImportError, e:
-        raise RebaseNotPresent(e)
-
-
 def create_upgrade_plan(repository, svn_repository, new_mapping,
                         revision_id=None, allow_changes=False):
     """Generate a rebase plan for upgrading revisions.