Rev 5626: (jelmer) Remove references to Weave from VersionedFileStore. (Jelmer in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Jan 19 23:36:11 UTC 2011
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 5626 [merge]
revision-id: pqm at pqm.ubuntu.com-20110119233608-9ubpvsukhoafgqs6
parent: pqm at pqm.ubuntu.com-20110119230012-e23ge97fqrvej4b1
parent: jelmer at samba.org-20110119223640-mugs4t1nbl55tf7c
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-01-19 23:36:08 +0000
message:
(jelmer) Remove references to Weave from VersionedFileStore. (Jelmer
Vernooij)
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2011-01-10 22:20:12 +0000
+++ b/bzrlib/bzrdir.py 2011-01-19 22:36:40 +0000
@@ -66,14 +66,17 @@
)
from bzrlib.repofmt import pack_repo
from bzrlib.smart.client import _SmartClient
-from bzrlib.store.versioned import WeaveStore
+from bzrlib.store.versioned import VersionedFileStore
from bzrlib.transactions import WriteTransaction
from bzrlib.transport import (
do_catching_redirections,
get_transport,
local,
)
-from bzrlib.weave import Weave
+from bzrlib.weave import (
+ WeaveFile,
+ Weave,
+ )
""")
from bzrlib.trace import (
@@ -2252,9 +2255,11 @@
mode=self.bzrdir._get_file_mode())
def _write_all_weaves(self):
- controlweaves = WeaveStore(self.bzrdir.transport, prefixed=False)
+ controlweaves = VersionedFileStore(self.bzrdir.transport, prefixed=False,
+ versionedfile_class=WeaveFile)
weave_transport = self.bzrdir.transport.clone('weaves')
- weaves = WeaveStore(weave_transport, prefixed=False)
+ weaves = VersionedFileStore(weave_transport, prefixed=False,
+ versionedfile_class=WeaveFile)
transaction = WriteTransaction()
try:
=== modified file 'bzrlib/store/versioned/__init__.py'
--- a/bzrlib/store/versioned/__init__.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/store/versioned/__init__.py 2011-01-19 20:18:24 +0000
@@ -18,21 +18,14 @@
# files whose id differs only in case. That should probably be forbidden.
-import errno
import os
-from cStringIO import StringIO
from warnings import warn
from bzrlib import (
errors,
osutils,
)
-from bzrlib.weavefile import read_weave, write_weave_v5
-from bzrlib.weave import WeaveFile, Weave
from bzrlib.store import TransportStore
-from bzrlib.atomicfile import AtomicFile
-from bzrlib.symbol_versioning import (deprecated_method,
- )
from bzrlib.trace import mutter
import bzrlib.ui
@@ -44,7 +37,7 @@
# transport factory callable?
def __init__(self, transport, prefixed=False, precious=False,
dir_mode=None, file_mode=None,
- versionedfile_class=WeaveFile,
+ versionedfile_class=None,
versionedfile_kwargs={},
escaped=False):
super(VersionedFileStore, self).__init__(transport,
@@ -213,14 +206,14 @@
"""
from bzrlib.transactions import PassThroughTransaction
if from_transaction is None:
- warn("WeaveStore.copy_multi without a from_transaction parameter "
+ warn("VersionedFileStore.copy_multi without a from_transaction parameter "
"is deprecated. Please provide a from_transaction.",
DeprecationWarning,
stacklevel=2)
# we are reading one object - caching is irrelevant.
from_transaction = PassThroughTransaction()
if to_transaction is None:
- warn("WeaveStore.copy_multi without a to_transaction parameter "
+ warn("VersionedFileStore.copy_multi without a to_transaction parameter "
"is deprecated. Please provide a to_transaction.",
DeprecationWarning,
stacklevel=2)
@@ -246,5 +239,3 @@
def total_size(self):
count, bytes = super(VersionedFileStore, self).total_size()
return (count / len(self._versionedfile_class.get_suffixes())), bytes
-
-WeaveStore = VersionedFileStore
=== modified file 'bzrlib/tests/test_store.py'
--- a/bzrlib/tests/test_store.py 2011-01-12 01:01:53 +0000
+++ b/bzrlib/tests/test_store.py 2011-01-19 20:18:24 +0000
@@ -22,13 +22,14 @@
import bzrlib.errors as errors
from bzrlib.errors import BzrError
+from bzrlib.store import TransportStore
from bzrlib.store.text import TextStore
+from bzrlib.store.versioned import VersionedFileStore
from bzrlib.tests import TestCase, TestCaseInTempDir, TestCaseWithTransport
-import bzrlib.store as store
-import bzrlib.store.versioned
import bzrlib.transactions as transactions
import bzrlib.transport as transport
from bzrlib.transport.memory import MemoryTransport
+from bzrlib.weave import WeaveFile
class TestStores(object):
@@ -203,7 +204,7 @@
return
-class InstrumentedTransportStore(store.TransportStore):
+class InstrumentedTransportStore(TransportStore):
"""An instrumented TransportStore.
Here we replace template method worker methods with calls that record the
@@ -241,37 +242,37 @@
class TestTransportStore(TestCase):
def test__relpath_invalid(self):
- my_store = store.TransportStore(MockTransport())
+ my_store = TransportStore(MockTransport())
self.assertRaises(ValueError, my_store._relpath, '/foo')
self.assertRaises(ValueError, my_store._relpath, 'foo/')
def test_register_invalid_suffixes(self):
- my_store = store.TransportStore(MockTransport())
+ my_store = TransportStore(MockTransport())
self.assertRaises(ValueError, my_store.register_suffix, '/')
self.assertRaises(ValueError, my_store.register_suffix, '.gz/bar')
def test__relpath_unregister_suffixes(self):
- my_store = store.TransportStore(MockTransport())
+ my_store = TransportStore(MockTransport())
self.assertRaises(ValueError, my_store._relpath, 'foo', ['gz'])
self.assertRaises(ValueError, my_store._relpath, 'foo', ['dsc', 'gz'])
def test__relpath_simple(self):
- my_store = store.TransportStore(MockTransport())
+ my_store = TransportStore(MockTransport())
self.assertEqual("foo", my_store._relpath('foo'))
def test__relpath_prefixed(self):
- my_store = store.TransportStore(MockTransport(), True)
+ my_store = TransportStore(MockTransport(), True)
self.assertEqual('45/foo', my_store._relpath('foo'))
def test__relpath_simple_suffixed(self):
- my_store = store.TransportStore(MockTransport())
+ my_store = TransportStore(MockTransport())
my_store.register_suffix('bar')
my_store.register_suffix('baz')
self.assertEqual('foo.baz', my_store._relpath('foo', ['baz']))
self.assertEqual('foo.bar.baz', my_store._relpath('foo', ['bar', 'baz']))
def test__relpath_prefixed_suffixed(self):
- my_store = store.TransportStore(MockTransport(), True)
+ my_store = TransportStore(MockTransport(), True)
my_store.register_suffix('bar')
my_store.register_suffix('baz')
self.assertEqual('45/foo.baz', my_store._relpath('foo', ['baz']))
@@ -393,12 +394,12 @@
self.assertRaises(KeyError, to_store.get, 'missing', 'sig')
def test_relpath_escaped(self):
- my_store = store.TransportStore(MemoryTransport())
+ my_store = TransportStore(MemoryTransport())
self.assertEqual('%25', my_store._relpath('%'))
def test_escaped_uppercase(self):
"""Uppercase letters are escaped for safety on Windows"""
- my_store = store.TransportStore(MemoryTransport(), prefixed=True,
+ my_store = TransportStore(MemoryTransport(), prefixed=True,
escaped=True)
# a particularly perverse file-id! :-)
self.assertEquals(my_store._relpath('C:<>'), 'be/%2543%253a%253c%253e')
@@ -411,7 +412,8 @@
def setUp(self):
super(TestVersionFileStore, self).setUp()
- self.vfstore = store.versioned.VersionedFileStore(MemoryTransport())
+ self.vfstore = VersionedFileStore(MemoryTransport(),
+ versionedfile_class=WeaveFile)
self.vfstore.get_scope = self.get_scope
self._transaction = None
@@ -436,8 +438,8 @@
self.assertRaises(errors.ReadOnlyError, vf.add_lines, 'b', [], [])
def test___iter__escaped(self):
- self.vfstore = store.versioned.VersionedFileStore(MemoryTransport(),
- prefixed=True, escaped=True)
+ self.vfstore = VersionedFileStore(MemoryTransport(),
+ prefixed=True, escaped=True, versionedfile_class=WeaveFile)
self.vfstore.get_scope = self.get_scope
self._transaction = transactions.WriteTransaction()
vf = self.vfstore.get_weave_or_empty(' ', self._transaction)
More information about the bazaar-commits
mailing list