Merge 0.4.

[jelmer/subvertpy.git] / __init__.py

diff --git a/__init__.py b/__init__.py
index b0f1133718da3347d0e0e8f5a4ac122ca81e0c02..01114e40488e520f887e043cf622f7f927532b87 100644 (file)
--- a/__init__.py
+++ b/__init__.py
@@ -21,15 +21,17 @@ import bzrlib
 from bzrlib.bzrdir import BzrDirFormat, format_registry
 from bzrlib.commands import Command, register_command, display_command, Option
 from bzrlib.help_topics import topic_registry
+from bzrlib.revisionspec import SPEC_TYPES
 from bzrlib.trace import warning
 from bzrlib.transport import register_lazy_transport, register_transport_proto
 
 import format
+import revspec
 
 # versions ending in 'exp' mean experimental mappings
 # versions ending in 'dev' mean development version
 # versions ending in 'final' mean release (well tested, etc)
-version_info = (0, 4, 4, 'final', 0)
+version_info = (0, 4, 7, 'dev', 0)
 
 if version_info[3] == 'final':
     version_string = '%d.%d.%d' % version_info[:3]
@@ -37,7 +39,7 @@ else:
     version_string = '%d.%d.%d%s%d' % version_info
 __version__ = version_string
 
-COMPATIBLE_BZR_VERSIONS = [(0, 92)]
+COMPATIBLE_BZR_VERSIONS = [(0, 93), (1, 0), (1, 1)]
 
 def check_bzrlib_version(desired):
     """Check that bzrlib is compatible.
@@ -111,6 +113,7 @@ format_registry.register("subversion", format.SvnRemoteFormat,
 format_registry.register("subversion-wc", format.SvnWorkingTreeDirFormat, 
                          "Subversion working copy. ", 
                          native=False, hidden=True)
+SPEC_TYPES.append(revspec.RevisionSpec_svn)
 
 versions_checked = False
 def lazy_check_versions():
@@ -133,6 +136,7 @@ def lazy_register_optimizers():
     InterRepository.register_optimiser(fetch.InterFromSvnRepository)
     InterRepository.register_optimiser(commit.InterToSvnRepository)
 
+
 def get_scheme(schemename):
     """Parse scheme identifier and return a branching scheme."""
     from scheme import BranchingScheme
@@ -320,7 +324,7 @@ register_command(cmd_svn_push)
 class cmd_svn_branching_scheme(Command):
     """Show or change the branching scheme for a Subversion repository.
 
-    See 'bzr help svn-branching-scheme' for details.
+    See 'bzr help svn-branching-schemes' for details.
     """
     takes_args = ['location?']
     takes_options = [
@@ -355,7 +359,7 @@ class cmd_svn_branching_scheme(Command):
             if repository_wide:
                 repos.set_property_scheme(scheme)
             else:
-                repos.set_branching_scheme(scheme)
+                repos.set_branching_scheme(scheme, mandatory=True)
         elif scheme is not None:
             info(scheme_str(scheme))
 
@@ -363,6 +367,24 @@ class cmd_svn_branching_scheme(Command):
 register_command(cmd_svn_branching_scheme)
 
 
+class cmd_svn_set_revprops(Command):
+    """Migrate Bazaar metadata to Subversion revision properties.
+
+    This requires that you have permission to change the 
+    revision properties on the repository.
+
+    To change these permissions, edit the hooks/pre-revprop-change 
+    file in the Subversion repository.
+    """
+    takes_args = ['location']
+
+    def run(self, location="."):
+        raise NotImplementedError(self.run)
+
+
+register_command(cmd_svn_set_revprops)
+
+
 def test_suite():
     from unittest import TestSuite
     import tests