~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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
16
6379.6.3 by Jelmer Vernooij
Use absolute_import.
17
from __future__ import absolute_import
18
1393.1.19 by Martin Pool
- add WeaveStore.__iter__, __contains__ and copy_multi()
19
# XXX: Some consideration of the problems that might occur if there are
20
# files whose id differs only in case.  That should probably be forbidden.
21
22
1471 by Robert Collins
Bugfix to previous url escaping patch - include weave stores
23
import os
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
24
from warnings import warn
1223 by Martin Pool
- store inventories in weave
25
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
26
from bzrlib import (
27
    errors,
28
    osutils,
29
    )
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
1393.1.19 by Martin Pool
- add WeaveStore.__iter__, __contains__ and copy_multi()
31
from bzrlib.trace import mutter
1185.80.10 by John Arbash Meinel
Adding progress indicators and improved get order for 'bzr branch'
32
import bzrlib.ui
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
33
34
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
35
class VersionedFileStore(TransportStore):
36
    """Collection of many versioned files in a transport."""
1393.1.19 by Martin Pool
- add WeaveStore.__iter__, __contains__ and copy_multi()
37
1651.1.1 by Martin Pool
[merge][wip] Storage escaping
38
    # TODO: Rather than passing versionedfile_kwargs, perhaps pass in a
39
    # transport factory callable?
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
40
    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.
41
                 dir_mode=None, file_mode=None,
5582.10.23 by Jelmer Vernooij
Move bzrlib.weavefile.
42
                 versionedfile_class=None,
1651.1.1 by Martin Pool
[merge][wip] Storage escaping
43
                 versionedfile_kwargs={},
1608.2.1 by Martin Pool
[merge] Storage filename escaping
44
                 escaped=False):
45
        super(VersionedFileStore, self).__init__(transport,
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
46
                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.
47
                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.
48
        self._precious = precious
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
49
        self._versionedfile_class = versionedfile_class
1628.1.4 by Robert Collins
Change knit format to use non-delta, non-annotated revisions and signatures.
50
        self._versionedfile_kwargs = versionedfile_kwargs
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
51
        # Used for passing get_scope to versioned file constructors;
52
        self.get_scope = None
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
53
1223 by Martin Pool
- store inventories in weave
54
    def filename(self, file_id):
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
55
        """Return the path relative to the transport root."""
1608.2.1 by Martin Pool
[merge] Storage filename escaping
56
        return self._relpath(file_id)
1429 by Robert Collins
merge in niemeyers prefixed-store patch
57
1393.1.19 by Martin Pool
- add WeaveStore.__iter__, __contains__ and copy_multi()
58
    def __iter__(self):
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
59
        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.
60
        ids = set()
1479 by Robert Collins
More quoting at the transport layer bugfixes.
61
        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.
62
            for suffix in suffixes:
63
                if relpath.endswith(suffix):
1608.2.1 by Martin Pool
[merge] Storage filename escaping
64
                    # TODO: use standard remove_suffix function
65
                    escaped_id = os.path.basename(relpath[:-len(suffix)])
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
66
                    file_id = self._mapper.unmap(escaped_id)[0]
1608.2.1 by Martin Pool
[merge] Storage filename escaping
67
                    if file_id not in ids:
68
                        ids.add(file_id)
69
                        yield file_id
70
                    break # only one suffix can match
1393.1.19 by Martin Pool
- add WeaveStore.__iter__, __contains__ and copy_multi()
71
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
72
    def has_id(self, file_id):
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
73
        suffixes = self._versionedfile_class.get_suffixes()
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
74
        filename = self.filename(file_id)
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
75
        for suffix in suffixes:
76
            if not self._transport.has(filename + suffix):
77
                return False
78
        return True
1223 by Martin Pool
- store inventories in weave
79
1563.2.25 by Robert Collins
Merge in upstream.
80
    def get_empty(self, file_id, transaction):
81
        """Get an empty weave, which implies deleting the existing one first."""
82
        if self.has_id(file_id):
83
            self.delete(file_id, transaction)
84
        return self.get_weave_or_empty(file_id, transaction)
85
86
    def delete(self, file_id, transaction):
87
        """Remove file_id from the store."""
88
        suffixes = self._versionedfile_class.get_suffixes()
89
        filename = self.filename(file_id)
90
        for suffix in suffixes:
91
            self._transport.delete(filename + suffix)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
92
93
    def _get(self, file_id):
94
        return self._transport.get(self.filename(file_id))
95
96
    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.
97
        fn = self.filename(file_id)
98
        try:
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
99
            return self._transport.put_file(fn, f, mode=self._file_mode)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
100
        except errors.NoSuchFile:
1185.80.6 by John Arbash Meinel
Adding tests to make sure weave stores can retrieve the files they add.
101
            if not self._prefixed:
102
                raise
103
            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
104
            return self._transport.put_file(fn, f, mode=self._file_mode)
1223 by Martin Pool
- store inventories in weave
105
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
106
    def get_weave(self, file_id, transaction, _filename=None):
107
        """Return the VersionedFile for file_id.
108
109
        :param _filename: filename that would be returned from self.filename for
110
        file_id. This is used to reduce duplicate filename calculations when
111
        using 'get_weave_or_empty'. FOR INTERNAL USE ONLY.
112
        """
113
        if _filename is None:
114
            _filename = self.filename(file_id)
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
115
        if transaction.writeable():
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
116
            w = self._versionedfile_class(_filename, self._transport, self._file_mode,
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
117
                get_scope=self.get_scope, **self._versionedfile_kwargs)
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
118
        else:
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
119
            w = self._versionedfile_class(_filename,
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
120
                                          self._transport,
121
                                          self._file_mode,
122
                                          create=False,
1628.1.4 by Robert Collins
Change knit format to use non-delta, non-annotated revisions and signatures.
123
                                          access_mode='r',
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
124
                                          get_scope=self.get_scope,
1628.1.4 by Robert Collins
Change knit format to use non-delta, non-annotated revisions and signatures.
125
                                          **self._versionedfile_kwargs)
1363 by Martin Pool
- add quick-and-dirty cache for weaves to speed check command
126
        return w
1262 by Martin Pool
- fetch should also copy ancestry records
127
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
128
    def _make_new_versionedfile(self, file_id, transaction,
129
        known_missing=False, _filename=None):
130
        """Make a new versioned file.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
131
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
132
        :param _filename: filename that would be returned from self.filename for
133
        file_id. This is used to reduce duplicate filename calculations when
134
        using 'get_weave_or_empty'. FOR INTERNAL USE ONLY.
135
        """
136
        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
137
            self.delete(file_id, transaction)
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
138
        if _filename is None:
139
            _filename = self.filename(file_id)
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
140
        try:
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
141
            # we try without making the directory first because thats optimising
142
            # for the common case.
143
            weave = self._versionedfile_class(_filename, self._transport, self._file_mode, create=True,
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
144
                get_scope=self.get_scope, **self._versionedfile_kwargs)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
145
        except errors.NoSuchFile:
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
146
            if not self._prefixed:
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
147
                # unexpected error - NoSuchFile is expected to be raised on a
148
                # 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.
149
                raise
3350.6.1 by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
150
            dirname = osutils.dirname(_filename)
151
            self._transport.mkdir(dirname, mode=self._dir_mode)
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
152
            weave = self._versionedfile_class(_filename, self._transport,
1651.1.1 by Martin Pool
[merge][wip] Storage escaping
153
                                              self._file_mode, create=True,
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
154
                                              get_scope=self.get_scope,
1628.1.4 by Robert Collins
Change knit format to use non-delta, non-annotated revisions and signatures.
155
                                              **self._versionedfile_kwargs)
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
156
        return weave
157
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
158
    def get_weave_or_empty(self, file_id, transaction):
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
159
        """Return a weave, or an empty one if it doesn't exist."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
160
        # This is typically used from 'commit' and 'fetch/push/pull' where
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
161
        # we scan across many versioned files once. As such the small overhead
162
        # of calculating the filename before doing a cache lookup is more than
163
        # compensated for by not calculating the filename when making new
164
        # versioned files.
165
        _filename = self.filename(file_id)
1224 by Martin Pool
- new method WeaveStore.get_weave_or_empty
166
        try:
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
167
            return self.get_weave(file_id, transaction, _filename=_filename)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
168
        except errors.NoSuchFile:
1725.2.2 by Robert Collins
reduce file path escaping calls during commit.
169
            weave = self._make_new_versionedfile(file_id, transaction,
170
                known_missing=True, _filename=_filename)
171
            return weave
1224 by Martin Pool
- new method WeaveStore.get_weave_or_empty
172
1563.2.10 by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
173
    def _put_weave(self, file_id, weave, transaction):
174
        """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
175
        myweave = self._make_new_versionedfile(file_id, transaction)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
176
        myweave.insert_record_stream(weave.get_record_stream(
177
            [(version,) for version in weave.versions()],
3350.3.20 by Robert Collins
Remove more uses of versionedfile.join() and fix a bug with weave's insert_record_stream.
178
            'topological', False))
1223 by Martin Pool
- store inventories in weave
179
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
180
    def copy_all_ids(self, store_from, pb=None, from_transaction=None,
181
                     to_transaction=None):
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
182
        """Copy all the file ids from store_from into self."""
183
        if from_transaction is None:
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
184
            warn("Please pass from_transaction into "
185
                 "versioned_store.copy_all_ids.", stacklevel=2)
186
        if to_transaction is None:
187
            warn("Please pass to_transaction into "
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
188
                 "versioned_store.copy_all_ids.", stacklevel=2)
189
        if not store_from.listable():
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
190
            raise errors.UnlistableStore(store_from)
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
191
        ids = []
192
        for count, file_id in enumerate(store_from):
193
            if pb:
194
                pb.update('listing files', count, count)
195
            ids.append(file_id)
196
        if pb:
197
            pb.clear()
198
        mutter('copy_all ids: %r', ids)
199
        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
200
                        from_transaction=from_transaction,
201
                        to_transaction=to_transaction)
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
202
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
203
    def copy_multi(self, from_store, file_ids, pb=None, from_transaction=None,
204
                   to_transaction=None):
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
205
        """Copy all the versions for multiple file_ids from from_store.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
206
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
207
        :param from_transaction: required current transaction in from_store.
208
        """
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
209
        from bzrlib.transactions import PassThroughTransaction
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
210
        if from_transaction is None:
5582.10.23 by Jelmer Vernooij
Move bzrlib.weavefile.
211
            warn("VersionedFileStore.copy_multi without a from_transaction parameter "
1563.2.14 by Robert Collins
Prepare weave store to delegate copy details to the versioned file.
212
                 "is deprecated. Please provide a from_transaction.",
213
                 DeprecationWarning,
214
                 stacklevel=2)
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
215
            # we are reading one object - caching is irrelevant.
216
            from_transaction = PassThroughTransaction()
217
        if to_transaction is None:
5582.10.23 by Jelmer Vernooij
Move bzrlib.weavefile.
218
            warn("VersionedFileStore.copy_multi without a to_transaction parameter "
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
219
                 "is deprecated. Please provide a to_transaction.",
220
                 DeprecationWarning,
221
                 stacklevel=2)
6027.1.10 by Vincent Ladeuil
Fix typo in comment.
222
            # we are copying single objects, and there may be open transactions
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
223
            # so again with the passthrough
224
            to_transaction = PassThroughTransaction()
1608.2.1 by Martin Pool
[merge] Storage filename escaping
225
        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
226
        try:
227
            for count, f in enumerate(file_ids):
228
                mutter("copy weave {%s} into %s", f, self)
229
                pb.update('copy', count, len(file_ids))
230
                # if we have it in cache, its faster.
231
                # joining is fast with knits, and bearable for weaves -
232
                # indeed the new case can be optimised if needed.
233
                target = self._make_new_versionedfile(f, to_transaction)
3350.3.20 by Robert Collins
Remove more uses of versionedfile.join() and fix a bug with weave's insert_record_stream.
234
                source = from_store.get_weave(f, from_transaction)
235
                target.insert_record_stream(source.get_record_stream(
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
236
                    [(version,) for version in source.versions()],
237
                    'topological', False))
2127.1.1 by John Arbash Meinel
use try/finally to clean up a nested progress bar during weave fetching
238
        finally:
239
            pb.finished()
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
240
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
241
    def total_size(self):
242
        count, bytes =  super(VersionedFileStore, self).total_size()
243
        return (count / len(self._versionedfile_class.get_suffixes())), bytes