Rev 1175: Allow checking for other rebase versions. in file:///data/jelmer/bzr-svn/dpush/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1175
revision-id: jelmer at samba.org-20080518143313-ygxwi1rmj5jczw2g
parent: jelmer at samba.org-20080518141334-ejdhcpismnz397wk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: dpush
timestamp: Sun 2008-05-18 16:33:13 +0200
message:
  Allow checking for other rebase versions.
modified:
  upgrade.py                     upgrade.py-20070106192108-0rakplee2lzah4gs-1
=== modified file 'upgrade.py'
--- a/upgrade.py	2008-05-02 18:48:10 +0000
+++ b/upgrade.py	2008-05-18 14:33:13 +0000
@@ -112,19 +112,19 @@
 
 MIN_REBASE_VERSION = (0, 2)
 
-def check_rebase_version():
+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_REBASE_VERSION.
+    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_REBASE_VERSION:
+        if rebase_version_info[:2] < min_version:
             raise RebaseNotPresent("Version %r present, at least %r required" 
-                                   % (rebase_version_info, MIN_REBASE_VERSION))
+                                   % (rebase_version_info, min_version))
     except ImportError, e:
         raise RebaseNotPresent(e)
 
@@ -143,7 +143,7 @@
     :return: Tuple with a rebase plan and map of renamed revisions.
     """
     from bzrlib.plugins.rebase.rebase import generate_transpose_plan
-    check_rebase_version()
+    check_rebase_version(MIN_REBASE_VERSION)
 
     graph = repository.get_graph()
     if revision_id is None:
@@ -187,7 +187,7 @@
     :param verbose: Whether to print list of rewrites
     :return: Dictionary of mapped revisions
     """
-    check_rebase_version()
+    check_rebase_version(MIN_REBASE_VERSION)
     from bzrlib.plugins.rebase.rebase import (
         replay_snapshot, rebase, rebase_todo)