Rev 1694: Warn that stacking is experimental when it's used. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

Jelmer Vernooij jelmer at samba.org
Mon Sep 1 14:51:13 BST 2008


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

------------------------------------------------------------
revno: 1694
revision-id: jelmer at samba.org-20080901135109-30etl53iwe91foyb
parent: jelmer at samba.org-20080901022247-3gfm3hutu2tiu8kf
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-09-01 15:51:09 +0200
message:
  Warn that stacking is experimental when it's used.
modified:
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
=== modified file 'repository.py'
--- a/repository.py	2008-09-01 02:22:47 +0000
+++ b/repository.py	2008-09-01 13:51:09 +0000
@@ -15,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """Subversion repository access."""
 
-from bzrlib import osutils, ui, urlutils, xml7
+from bzrlib import osutils, ui, urlutils, xml6
 from bzrlib.branch import BranchCheckResult
 from bzrlib.errors import (InvalidRevisionId, NoSuchRevision, NotBranchError, 
                            UninitializableFormat)
@@ -186,7 +186,7 @@
         assert self.uuid is not None
         self.base = transport.base
         assert self.base is not None
-        self._serializer = xml7.serializer_v7
+        self._serializer = xml6.serializer_v6
         self.get_config().add_location(self.base)
         self._log = logwalker.LogWalker(transport=transport)
         self.fileid_map = FileIdMap(simple_apply_changes, self)

=== modified file 'versionedfiles.py'
--- a/versionedfiles.py	2008-08-28 15:59:55 +0000
+++ b/versionedfiles.py	2008-09-01 13:51:09 +0000
@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from bzrlib import osutils, urlutils
+from bzrlib.trace import warning
 from bzrlib.versionedfile import FulltextContentFactory, VersionedFiles, VirtualVersionedFiles
 
 from bzrlib.plugins.svn.core import SubversionException
@@ -21,6 +22,8 @@
 
 from cStringIO import StringIO
 
+_warned_experimental = False
+
 class SvnTexts(VersionedFiles):
     """Subversion texts backend."""
 
@@ -34,6 +37,10 @@
         raise NotImplementedError(self.add_mpdiffs)
 
     def get_record_stream(self, keys, ordering, include_delta_closure):
+        global _warned_experimental
+        if not _warned_experimental:
+            warning("stacking support in bzr-svn is experimental.")
+            _warned_experimental = True
         # TODO: there may be valid text revisions that only exist as 
         # ghosts in the repository itself. This function will 
         # not be able to report them.




More information about the bazaar-commits mailing list