Register subversion-wc as format, but keep it non-initialiable.
authorJelmer Vernooij <jelmer@samba.org>
Fri, 14 Sep 2007 19:20:16 +0000 (21:20 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 14 Sep 2007 19:20:16 +0000 (21:20 +0200)
NEWS
__init__.py
workingtree.py

diff --git a/NEWS b/NEWS
index 0b2de6ebeefc1575dd2c1f7dbcec1d0d71064f0a..3455452038ac47b9d32ad8e4af7e1a959ba746fc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,8 @@ bzr-svn 0.4.3 2007-09-12
 
    * Track moving parents correctly in follow_path().
 
+   * Implement SvnWorkingTreeDir.needs_format_conversion().
+
 bzr-svn 0.4.2  2007-09-09
 
   BUG FIXES
index 46f2950687a287af8ae921a4399bf3b4dd6588ca..1f9bf1d0f4e2b023f6b49afdd369f674a0f15ea9 100644 (file)
@@ -118,6 +118,9 @@ BzrDirFormat.register_control_format(workingtree.SvnWorkingTreeDirFormat)
 format_registry.register("subversion", format.SvnFormat, 
                          "Subversion repository. ", 
                          native=False)
+format_registry.register("subversion-wc", workingtree.SvnWorkingTreeDirFormat, 
+                         "Subversion working copy. ", 
+                         native=False)
 
 versions_checked = False
 def lazy_check_versions():
index ed1e4ccde5e7609c576c6d3f0740b4736d66f49a..47dbed2818ba6bf5ae68627c041a219dafb2b6f6 100644 (file)
@@ -20,7 +20,7 @@ from bzrlib import urlutils
 from bzrlib.branch import PullResult
 from bzrlib.bzrdir import BzrDirFormat, BzrDir
 from bzrlib.errors import (InvalidRevisionId, NotBranchError, NoSuchFile,
-                           NoRepositoryPresent, BzrError)
+                           NoRepositoryPresent, BzrError, UninitializableFormat)
 from bzrlib.inventory import Inventory, InventoryFile, InventoryLink
 from bzrlib.lockable_files import TransportLock, LockableFiles
 from bzrlib.lockdir import LockDir
@@ -786,6 +786,11 @@ class SvnWorkingTreeDirFormat(BzrDirFormat):
     """Working Tree implementation that uses Subversion working copies."""
     _lock_class = TransportLock
 
+    def __init__(self):
+        super(SvnWorkingTreeDirFormat, self).__init__()
+        from repository import SvnRepositoryFormat
+        self.repository_format = SvnRepositoryFormat()
+
     @classmethod
     def probe_transport(klass, transport):
         format = klass()
@@ -814,7 +819,7 @@ class SvnWorkingTreeDirFormat(BzrDirFormat):
         return 'Subversion Local Checkout'
 
     def initialize_on_transport(self, transport):
-        raise NotImplementedError(self.initialize_on_transport)
+        raise UninitializableFormat(self)
 
     def get_converter(self, format=None):
         """See BzrDirFormat.get_converter()."""