~bzr-pqm/bzr/bzr.dev

1608.2.1 by Martin Pool
[merge] Storage filename escaping
1
# Copyright (C) 2005, 2006 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1393.1.19 by Martin Pool
- add WeaveStore.__iter__, __contains__ and copy_multi()
17
# XXX: Some consideration of the problems that might occur if there are
18
# files whose id differs only in case.  That should probably be forbidden.
19
20
1471 by Robert Collins
Bugfix to previous url escaping patch - include weave stores
21
import errno
22
import os
1393.1.19 by Martin Pool
- add WeaveStore.__iter__, __contains__ and copy_multi()
23
from cStringIO import StringIO
1471 by Robert Collins
Bugfix to previous url escaping patch - include weave stores
24
import urllib
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
25
from warnings import warn
1223 by Martin Pool
- store inventories in weave
26
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
27
from bzrlib import errors
1223 by Martin Pool
- store inventories in weave
28
from bzrlib.weavefile import read_weave, write_weave_v5
1608.2.1 by Martin Pool
[merge] Storage filename escaping
29
from bzrlib.weave import WeaveFile, Weave
1185.80.6 by John Arbash Meinel
Adding tests to make sure weave stores can retrieve the files they add.
30
from bzrlib.store import TransportStore
1223 by Martin Pool
- store inventories in weave
31
from bzrlib.atomicfile import AtomicFile
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
32
from bzrlib.symbol_versioning import (deprecated_method,
33
        zero_eight)
1393.1.19 by Martin Pool
- add WeaveStore.__iter__, __contains__ and copy_multi()
34
from bzrlib.trace import mutter
1185.80.10 by John Arbash Meinel
Adding progress indicators and improved get order for 'bzr branch'
35
import bzrlib.ui
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
36
37
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
38
class VersionedFileStore(TransportStore):
39
    """Collection of many versioned files in a transport."""
1393.1.19 by Martin Pool
- add WeaveStore.__iter__, __contains__ and copy_multi()
40
1651.1.1 by Martin Pool
[merge][wip] Storage escaping
41
    # TODO: Rather than passing versionedfile_kwargs, perhaps pass in a
42
    # transport factory callable?
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
43
    def __init__(self, transport, prefixed=False, precious=False,
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
44
                 dir_mode=None, file_mode=None,
1608.2.1 by Martin Pool
[merge] Storage filename escaping
45
                 versionedfile_class=WeaveFile,
1651.1.1 by Martin Pool
[merge][wip] Storage escaping
46
                 versionedfile_kwargs={},
1608.2.1 by Martin Pool
[merge] Storage filename escaping
47
                 escaped=False):
48
        super(VersionedFileStore, self).__init__(transport,
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
49
                dir_mode=dir_mode, file_mode=file_mode,
1185.80.1 by John Arbash Meinel
Text store and weave store both allow escaping fileid paths.
50
                prefixed=prefixed, compressed=False, escaped=escaped)
1417.1.10 by Robert Collins
add a cache bound to Transactions, and a precious facility, so that we keep inventory.weave in memory, but can discard weaves for other such files.
51
        self._precious = precious
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
52
        self._versionedfile_class = versionedfile_class
1628.1.4 by Robert Collins
Change knit format to use non-delta, non-annotated revisions and signatures.
53
        self._versionedfile_kwargs = versionedfile_kwargs
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
54
1563.2.25 by Robert Collins
Merge in upstream.
55
    def _clear_cache_id(self, file_id, transaction):
56
        """WARNING may lead to inconsistent object references for file_id.
57
58
        Remove file_id from the transaction map. 
59
60
        NOT in the transaction api because theres no reliable way to clear
61
        callers. So its here for very specialised use rather than having an
62
        'api' that isn't.
63
        """
64
        weave = transaction.map.find_weave(file_id)
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
65
        if weave is not None:
1563.2.25 by Robert Collins
Merge in upstream.
66
            mutter("old data in transaction in %s for %s", self, file_id)
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
67
            # FIXME abstraction violation - transaction now has stale data.
68
            transaction.map.remove_object(weave)
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
69
1223 by Martin Pool
- store inventories in weave
70
    def filename(self, file_id):
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
71
        """Return the path relative to the transport root."""
1608.2.1 by Martin Pool
[merge] Storage filename escaping
72
        return self._relpath(file_id)
1429 by Robert Collins
merge in niemeyers prefixed-store patch
73
1393.1.19 by Martin Pool
- add WeaveStore.__iter__, __contains__ and copy_multi()
74
    def __iter__(self):
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
75
        suffixes = self._versionedfile_class.get_suffixes()
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
76
        ids = set()
1479 by Robert Collins
More quoting at the transport layer bugfixes.
77
        for relpath in self._iter_files_recursive():
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
78
            for suffix in suffixes:
79
                if relpath.endswith(suffix):
1608.2.1 by Martin Pool
[merge] Storage filename escaping
80
                    # TODO: use standard remove_suffix function
81
                    escaped_id = os.path.basename(relpath[:-len(suffix)])
82
                    file_id = self._unescape(escaped_id)
83
                    if file_id not in ids:
84
                        ids.add(file_id)
85
                        yield file_id
86
                    break # only one suffix can match
1393.1.19 by Martin Pool
- add WeaveStore.__iter__, __contains__ and copy_multi()
87
1442.1.45 by Robert Collins
replace __contains__ calls in stores with has_id
88
    def has_id(self, fileid):
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
89
        suffixes = self._versionedfile_class.get_suffixes()
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
90
        filename = self.filename(fileid)
91
        for suffix in suffixes:
92
            if not self._transport.has(filename + suffix):
93
                return False
94
        return True
1223 by Martin Pool
- store inventories in weave
95
1563.2.25 by Robert Collins
Merge in upstream.
96
    def get_empty(self, file_id, transaction):
97
        """Get an empty weave, which implies deleting the existing one first."""
98
        if self.has_id(file_id):
99
            self.delete(file_id, transaction)
100
        return self.get_weave_or_empty(file_id, transaction)
101
102
    def delete(self, file_id, transaction):
103
        """Remove file_id from the store."""
104
        suffixes = self._versionedfile_class.get_suffixes()
105
        filename = self.filename(file_id)
106
        for suffix in suffixes:
107
            self._transport.delete(filename + suffix)
108
        self._clear_cache_id(file_id, transaction)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
109
110
    def _get(self, file_id):
111
        return self._transport.get(self.filename(file_id))
112
113
    def _put(self, file_id, f):
1185.80.6 by John Arbash Meinel
Adding tests to make sure weave stores can retrieve the files they add.
114
        fn = self.filename(file_id)
115
        try:
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
116
            return self._transport.put_file(fn, f, mode=self._file_mode)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
117
        except errors.NoSuchFile:
1185.80.6 by John Arbash Meinel
Adding tests to make sure weave stores can retrieve the files they add.
118
            if not self._prefixed:
119
                raise
120
            self._transport.mkdir(os.path.dirname(fn), mode=self._dir_mode)
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
121
            return self._transport.put_file(fn, f, mode=self._file_mode)
1223 by Martin Pool
- store inventories in weave
122
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
123
    def get_weave(self, file_id, transaction, _filename=None):
124
        """Return the VersionedFile for file_id.
125
126
        :param _filename: filename that would be returned from self.filename for
127
        file_id. This is used to reduce duplicate filename calculations when
128
        using 'get_weave_or_empty'. FOR INTERNAL USE ONLY.
129
        """
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
130
        weave = transaction.map.find_weave(file_id)
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
131
        if weave is not None:
1594.3.2 by Robert Collins
make trivial ranges work for HTTP really.
132
            #mutter("cache hit in %s for %s", self, file_id)
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
133
            return weave
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
134
        if _filename is None:
135
            _filename = self.filename(file_id)
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
136
        if transaction.writeable():
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
137
            w = self._versionedfile_class(_filename, self._transport, self._file_mode,
1628.1.4 by Robert Collins
Change knit format to use non-delta, non-annotated revisions and signatures.
138
                                          **self._versionedfile_kwargs)
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
139
            transaction.map.add_weave(file_id, w)
140
            transaction.register_dirty(w)
141
        else:
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
142
            w = self._versionedfile_class(_filename,
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
143
                                          self._transport,
144
                                          self._file_mode,
145
                                          create=False,
1628.1.4 by Robert Collins
Change knit format to use non-delta, non-annotated revisions and signatures.
146
                                          access_mode='r',
147
                                          **self._versionedfile_kwargs)
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
148
            transaction.map.add_weave(file_id, w)
149
            transaction.register_clean(w, precious=self._precious)
1363 by Martin Pool
- add quick-and-dirty cache for weaves to speed check command
150
        return w
1262 by Martin Pool
- fetch should also copy ancestry records
151
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
152
    @deprecated_method(zero_eight)
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
153
    def get_lines(self, file_id, rev_id, transaction):
1262 by Martin Pool
- fetch should also copy ancestry records
154
        """Return text from a particular version of a weave.
155
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
156
        Returned as a list of lines.
157
        """
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
158
        w = self.get_weave(file_id, transaction)
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
159
        return w.get_lines(rev_id)
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
160
    
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
161
    def _make_new_versionedfile(self, file_id, transaction,
162
        known_missing=False, _filename=None):
163
        """Make a new versioned file.
164
        
165
        :param _filename: filename that would be returned from self.filename for
166
        file_id. This is used to reduce duplicate filename calculations when
167
        using 'get_weave_or_empty'. FOR INTERNAL USE ONLY.
168
        """
169
        if not known_missing and self.has_id(file_id):
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
170
            self.delete(file_id, transaction)
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
171
        if _filename is None:
172
            _filename = self.filename(file_id)
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
173
        try:
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
174
            # we try without making the directory first because thats optimising
175
            # for the common case.
176
            weave = self._versionedfile_class(_filename, self._transport, self._file_mode, create=True,
1628.1.4 by Robert Collins
Change knit format to use non-delta, non-annotated revisions and signatures.
177
                                              **self._versionedfile_kwargs)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
178
        except errors.NoSuchFile:
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
179
            if not self._prefixed:
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
180
                # unexpected error - NoSuchFile is expected to be raised on a
181
                # missing dir only and that only occurs when we are prefixed.
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
182
                raise
1608.2.1 by Martin Pool
[merge] Storage filename escaping
183
            self._transport.mkdir(self.hash_prefix(file_id), mode=self._dir_mode)
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
184
            weave = self._versionedfile_class(_filename, self._transport, 
1651.1.1 by Martin Pool
[merge][wip] Storage escaping
185
                                              self._file_mode, create=True,
1628.1.4 by Robert Collins
Change knit format to use non-delta, non-annotated revisions and signatures.
186
                                              **self._versionedfile_kwargs)
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
187
        return weave
188
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
189
    def get_weave_or_empty(self, file_id, transaction):
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
190
        """Return a weave, or an empty one if it doesn't exist."""
191
        # This is typically used from 'commit' and 'fetch/push/pull' where 
192
        # we scan across many versioned files once. As such the small overhead
193
        # of calculating the filename before doing a cache lookup is more than
194
        # compensated for by not calculating the filename when making new
195
        # versioned files.
196
        _filename = self.filename(file_id)
1224 by Martin Pool
- new method WeaveStore.get_weave_or_empty
197
        try:
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
198
            return self.get_weave(file_id, transaction, _filename=_filename)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
199
        except errors.NoSuchFile:
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
200
            weave = self._make_new_versionedfile(file_id, transaction,
201
                known_missing=True, _filename=_filename)
202
            transaction.map.add_weave(file_id, weave)
203
            # has to be dirty - its able to mutate on its own.
204
            transaction.register_dirty(weave)
205
            return weave
1224 by Martin Pool
- new method WeaveStore.get_weave_or_empty
206
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
207
    @deprecated_method(zero_eight)
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
208
    def put_weave(self, file_id, weave, transaction):
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
209
        """This is a deprecated API: It writes an entire collection of ids out.
210
        
211
        This became inappropriate when we made a versioned file api which
212
        tracks the state of the collection of versions for a single id.
213
        
214
        Its maintained for backwards compatability but will only work on
215
        weave stores - pre 0.8 repositories.
216
        """
1664.1.1 by Robert Collins
Bugfix: deprecated put_weave method was broken.
217
        self._put_weave(file_id, weave, transaction)
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
218
219
    def _put_weave(self, file_id, weave, transaction):
220
        """Preserved here for upgrades-to-weaves to use."""
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
221
        myweave = self._make_new_versionedfile(file_id, transaction)
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
222
        myweave.join(weave)
1223 by Martin Pool
- store inventories in weave
223
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
224
    @deprecated_method(zero_eight)
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
225
    def add_text(self, file_id, rev_id, new_lines, parents, transaction):
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
226
        """This method was a shorthand for 
227
228
        vfile = self.get_weave_or_empty(file_id, transaction)
229
        vfile.add_lines(rev_id, parents, new_lines)
230
        """
231
        vfile = self.get_weave_or_empty(file_id, transaction)
232
        vfile.add_lines(rev_id, parents, new_lines)
1223 by Martin Pool
- store inventories in weave
233
        
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
234
    @deprecated_method(zero_eight)
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
235
    def add_identical_text(self, file_id, old_rev_id, new_rev_id, parents,
236
                           transaction):
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
237
        """This method was a shorthand for
238
239
        vfile = self.get_weave_or_empty(file_id, transaction)
240
        vfile.clone_text(new_rev_id, old_rev_id, parents)
241
        """
242
        vfile = self.get_weave_or_empty(file_id, transaction)
243
        vfile.clone_text(new_rev_id, old_rev_id, parents)
1563.2.25 by Robert Collins
Merge in upstream.
244
 
245
    def copy(self, source, result_id, transaction):
246
        """Copy the source versioned file to result_id in this store."""
247
        self._clear_cache_id(result_id, transaction)
248
        source.copy_to(self.filename(result_id), self._transport)
249
 
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
250
    def copy_all_ids(self, store_from, pb=None, from_transaction=None,
251
                     to_transaction=None):
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
252
        """Copy all the file ids from store_from into self."""
253
        if from_transaction is None:
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
254
            warn("Please pass from_transaction into "
255
                 "versioned_store.copy_all_ids.", stacklevel=2)
256
        if to_transaction is None:
257
            warn("Please pass to_transaction into "
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
258
                 "versioned_store.copy_all_ids.", stacklevel=2)
259
        if not store_from.listable():
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
260
            raise errors.UnlistableStore(store_from)
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
261
        ids = []
262
        for count, file_id in enumerate(store_from):
263
            if pb:
264
                pb.update('listing files', count, count)
265
            ids.append(file_id)
266
        if pb:
267
            pb.clear()
268
        mutter('copy_all ids: %r', ids)
269
        self.copy_multi(store_from, ids, pb=pb,
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
270
                        from_transaction=from_transaction,
271
                        to_transaction=to_transaction)
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
272
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
273
    def copy_multi(self, from_store, file_ids, pb=None, from_transaction=None,
274
                   to_transaction=None):
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
275
        """Copy all the versions for multiple file_ids from from_store.
276
        
277
        :param from_transaction: required current transaction in from_store.
278
        """
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
279
        from bzrlib.transactions import PassThroughTransaction
1393.1.19 by Martin Pool
- add WeaveStore.__iter__, __contains__ and copy_multi()
280
        assert isinstance(from_store, WeaveStore)
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
281
        if from_transaction is None:
282
            warn("WeaveStore.copy_multi without a from_transaction parameter "
283
                 "is deprecated. Please provide a from_transaction.",
284
                 DeprecationWarning,
285
                 stacklevel=2)
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
286
            # we are reading one object - caching is irrelevant.
287
            from_transaction = PassThroughTransaction()
288
        if to_transaction is None:
289
            warn("WeaveStore.copy_multi without a to_transaction parameter "
290
                 "is deprecated. Please provide a to_transaction.",
291
                 DeprecationWarning,
292
                 stacklevel=2)
293
            # we are copying single objects, and there may be open tranasactions
294
            # so again with the passthrough
295
            to_transaction = PassThroughTransaction()
1608.2.1 by Martin Pool
[merge] Storage filename escaping
296
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
2127.1.1 by John Arbash Meinel
use try/finally to clean up a nested progress bar during weave fetching
297
        try:
298
            for count, f in enumerate(file_ids):
299
                mutter("copy weave {%s} into %s", f, self)
300
                pb.update('copy', count, len(file_ids))
301
                # if we have it in cache, its faster.
302
                # joining is fast with knits, and bearable for weaves -
303
                # indeed the new case can be optimised if needed.
304
                target = self._make_new_versionedfile(f, to_transaction)
305
                target.join(from_store.get_weave(f, from_transaction))
306
        finally:
307
            pb.finished()
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
308
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
309
    def total_size(self):
310
        count, bytes =  super(VersionedFileStore, self).total_size()
311
        return (count / len(self._versionedfile_class.get_suffixes())), bytes
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
312
313
WeaveStore = VersionedFileStore