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